flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-17 19:05:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup audio context

Browse Source 
Remove unused methods
Make methods only used in CContextAudio private
This commit is contained in:
Roland Rossgotterer
2019-09-16 13:46:56 +02:00
parent 3937423075
commit 7030302e73
6 changed files with 5 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/blackcore/context/contextaudio.h
View File

@@ -103,27 +103,12 @@ namespace BlackCore
void changedSelectedAudioDevices(const BlackMisc::Audio::CAudioDeviceInfoList &devices); void changedSelectedAudioDevices(const BlackMisc::Audio::CAudioDeviceInfoList &devices);
public slots: public slots:
//! Get voice rooms for COM1, COM2:
virtual BlackMisc::Audio::CVoiceRoomList getComVoiceRoomsWithAudioStatus() const = 0;
//! Can talk in any voice room
virtual bool canTalk() const = 0;
//! Get voice rooms for COM1, COM2, but without latest audio status
virtual BlackMisc::Audio::CVoiceRoomList getComVoiceRooms() const = 0;
//! Get voice room per com unit
virtual BlackMisc::Audio::CVoiceRoom getVoiceRoom(BlackMisc::Aviation::CComSystem::ComUnit comUnit, bool withAudioStatus) const = 0;
//! Set voice rooms //! Set voice rooms
virtual void setComVoiceRooms(const BlackMisc::Audio::CVoiceRoomList &voiceRooms) = 0; virtual void setComVoiceRooms(const BlackMisc::Audio::CVoiceRoomList &voiceRooms) = 0;
//! Leave all voice rooms //! Leave all voice rooms
virtual void leaveAllVoiceRooms() = 0; virtual void leaveAllVoiceRooms() = 0;
//! Room user callsigns
virtual BlackMisc::Aviation::CCallsignSet getRoomCallsigns(BlackMisc::Aviation::CComSystem::ComUnit comUnit) const = 0;
//! Room users //! Room users
virtual BlackMisc::Network::CUserList getRoomUsers(BlackMisc::Aviation::CComSystem::ComUnit comUnit) const = 0; virtual BlackMisc::Network::CUserList getRoomUsers(BlackMisc::Aviation::CComSystem::ComUnit comUnit) const = 0;

38
src/blackcore/context/contextaudioempty.h
View File

@@ -32,36 +32,6 @@ namespace BlackCore
CContextAudioEmpty(CCoreFacade *runtime) : IContextAudio(CCoreFacadeConfig::NotUsed, runtime) {} CContextAudioEmpty(CCoreFacade *runtime) : IContextAudio(CCoreFacadeConfig::NotUsed, runtime) {}
public slots: public slots:
//! \copydoc IContextAudio::getComVoiceRooms
virtual BlackMisc::Audio::CVoiceRoomList getComVoiceRooms() const override
{
logEmptyContextWarning(Q_FUNC_INFO);
return BlackMisc::Audio::CVoiceRoomList();
}
//! \copydoc IContextAudio::getComVoiceRoomsWithAudioStatus
virtual BlackMisc::Audio::CVoiceRoomList getComVoiceRoomsWithAudioStatus() const override
{
logEmptyContextWarning(Q_FUNC_INFO);
return BlackMisc::Audio::CVoiceRoomList();
}
//! \copydoc IContextAudio::canTalk
virtual bool canTalk() const override
{
logEmptyContextWarning(Q_FUNC_INFO);
return false;
}
//! \copydoc IContextAudio::getVoiceRoom
virtual BlackMisc::Audio::CVoiceRoom getVoiceRoom(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue, bool withAudioStatus) const override
{
Q_UNUSED(comUnitValue);
Q_UNUSED(withAudioStatus);
logEmptyContextWarning(Q_FUNC_INFO);
return BlackMisc::Audio::CVoiceRoom();
}
//! \copydoc IContextAudio::setComVoiceRooms //! \copydoc IContextAudio::setComVoiceRooms
virtual void setComVoiceRooms(const BlackMisc::Audio::CVoiceRoomList &newRooms) override virtual void setComVoiceRooms(const BlackMisc::Audio::CVoiceRoomList &newRooms) override
{ {
@@ -69,14 +39,6 @@ namespace BlackCore
logEmptyContextWarning(Q_FUNC_INFO); logEmptyContextWarning(Q_FUNC_INFO);
} }
//! \copydoc IContextAudio::getRoomCallsigns()
virtual BlackMisc::Aviation::CCallsignSet getRoomCallsigns(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue) const override
{
Q_UNUSED(comUnitValue);
logEmptyContextWarning(Q_FUNC_INFO);
return BlackMisc::Aviation::CCallsignSet();
}
//! \copydoc IContextAudio::getRoomUsers() //! \copydoc IContextAudio::getRoomUsers()
virtual BlackMisc::Network::CUserList getRoomUsers(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue) const override virtual BlackMisc::Network::CUserList getRoomUsers(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue) const override
{ {

9
src/blackcore/context/contextaudioimpl.cpp
View File

@@ -162,15 +162,6 @@ namespace BlackCore
return this->getComVoiceRooms(); return this->getComVoiceRooms();
} }
CVoiceRoom CContextAudio::getVoiceRoom(CComSystem::ComUnit comUnitValue, bool withAudioStatus) const
{
Q_ASSERT(m_voice);
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << withAudioStatus; }
const auto voiceChannel = m_voiceChannelMapping.value(comUnitValue);
return voiceChannel ? voiceChannel->getVoiceRoom() : CVoiceRoom();
}
CVoiceRoomList CContextAudio::getComVoiceRooms() const CVoiceRoomList CContextAudio::getComVoiceRooms() const
{ {
Q_ASSERT(m_voice); Q_ASSERT(m_voice);

10
src/blackcore/context/contextaudioimpl.h
View File

@@ -81,12 +81,7 @@ namespace BlackCore
// Interface implementations // Interface implementations
//! \publicsection //! \publicsection
//! @{ //! @{
virtual BlackMisc::Audio::CVoiceRoomList getComVoiceRooms() const override;
virtual BlackMisc::Audio::CVoiceRoomList getComVoiceRoomsWithAudioStatus() const override;
virtual bool canTalk() const override;
virtual BlackMisc::Audio::CVoiceRoom getVoiceRoom(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue, bool withAudioStatus) const override;
virtual void setComVoiceRooms(const BlackMisc::Audio::CVoiceRoomList &newRooms) override; virtual void setComVoiceRooms(const BlackMisc::Audio::CVoiceRoomList &newRooms) override;
virtual BlackMisc::Aviation::CCallsignSet getRoomCallsigns(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue) const override;
virtual BlackMisc::Network::CUserList getRoomUsers(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue) const override; virtual BlackMisc::Network::CUserList getRoomUsers(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue) const override;
virtual void leaveAllVoiceRooms() override; virtual void leaveAllVoiceRooms() override;
virtual BlackMisc::CIdentifier audioRunsWhere() const override; virtual BlackMisc::CIdentifier audioRunsWhere() const override;
@@ -133,6 +128,11 @@ namespace BlackCore
COMUnspecified COMUnspecified
}; };
BlackMisc::Audio::CVoiceRoomList getComVoiceRooms() const;
BlackMisc::Audio::CVoiceRoomList getComVoiceRoomsWithAudioStatus() const;
bool canTalk() const;
BlackMisc::Aviation::CCallsignSet getRoomCallsigns(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue) const;
void initVoiceChannels(); void initVoiceChannels();
void initInputDevice(); void initInputDevice();
void initOutputDevice(); void initOutputDevice();

25
src/blackcore/context/contextaudioproxy.cpp
View File

@@ -70,11 +70,6 @@ namespace BlackCore
this->m_dBusInterface->callDBus(QLatin1String("leaveAllVoiceRooms")); this->m_dBusInterface->callDBus(QLatin1String("leaveAllVoiceRooms"));
} }
BlackMisc::Aviation::CCallsignSet CContextAudioProxy::getRoomCallsigns(CComSystem::ComUnit comUnitValue) const
{
return this->m_dBusInterface->callDBusRet<BlackMisc::Aviation::CCallsignSet>(QLatin1String("getRoomCallsigns"), comUnitValue);
}
BlackMisc::Network::CUserList CContextAudioProxy::getRoomUsers(CComSystem::ComUnit comUnitValue) const BlackMisc::Network::CUserList CContextAudioProxy::getRoomUsers(CComSystem::ComUnit comUnitValue) const
{ {
return this->m_dBusInterface->callDBusRet<CUserList>(QLatin1String("getRoomUsers"), comUnitValue); return this->m_dBusInterface->callDBusRet<CUserList>(QLatin1String("getRoomUsers"), comUnitValue);
@@ -100,26 +95,6 @@ namespace BlackCore
this->m_dBusInterface->callDBus(QLatin1String("setCurrentAudioDevice"), audioDevice); this->m_dBusInterface->callDBus(QLatin1String("setCurrentAudioDevice"), audioDevice);
} }
CVoiceRoomList CContextAudioProxy::getComVoiceRoomsWithAudioStatus() const
{
return this->m_dBusInterface->callDBusRet<CVoiceRoomList>(QLatin1String("getComVoiceRoomsWithAudioStatus"));
}
bool CContextAudioProxy::canTalk() const
{
return this->m_dBusInterface->callDBusRet<bool>(QLatin1String("canTalk"));
}
CVoiceRoomList CContextAudioProxy::getComVoiceRooms() const
{
return this->m_dBusInterface->callDBusRet<CVoiceRoomList>(QLatin1String("getComVoiceRooms"));
}
CVoiceRoom CContextAudioProxy::getVoiceRoom(CComSystem::ComUnit comUnitValue, bool withAudioStatus) const
{
return this->m_dBusInterface->callDBusRet<CVoiceRoom>(QLatin1String("getVoiceRoom"), comUnitValue, withAudioStatus);
}
void CContextAudioProxy::setComVoiceRooms(const CVoiceRoomList &voiceRooms) void CContextAudioProxy::setComVoiceRooms(const CVoiceRoomList &voiceRooms)
{ {
this->m_dBusInterface->callDBus(QLatin1String("setComVoiceRooms"), voiceRooms); this->m_dBusInterface->callDBus(QLatin1String("setComVoiceRooms"), voiceRooms);

5
src/blackcore/context/contextaudioproxy.h
View File

@@ -63,12 +63,7 @@ namespace BlackCore
// interface overrides // interface overrides
//! \publicsection //! \publicsection
//! @{ //! @{
virtual BlackMisc::Audio::CVoiceRoomList getComVoiceRooms() const override;
virtual BlackMisc::Audio::CVoiceRoomList getComVoiceRoomsWithAudioStatus() const override;
virtual bool canTalk() const override;
virtual BlackMisc::Audio::CVoiceRoom getVoiceRoom(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue, bool withAudioStatus) const override;
virtual void setComVoiceRooms(const BlackMisc::Audio::CVoiceRoomList &voiceRooms) override; virtual void setComVoiceRooms(const BlackMisc::Audio::CVoiceRoomList &voiceRooms) override;
virtual BlackMisc::Aviation::CCallsignSet getRoomCallsigns(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue) const override;
virtual BlackMisc::Network::CUserList getRoomUsers(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue) const override; virtual BlackMisc::Network::CUserList getRoomUsers(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue) const override;
virtual void leaveAllVoiceRooms() override; virtual void leaveAllVoiceRooms() override;
virtual BlackMisc::CIdentifier audioRunsWhere() const override; virtual BlackMisc::CIdentifier audioRunsWhere() const override;