From 7030302e731b6e529053e15264f6f53e1a3cacbd Mon Sep 17 00:00:00 2001 From: Roland Rossgotterer Date: Mon, 16 Sep 2019 13:46:56 +0200 Subject: [PATCH] Cleanup audio context Remove unused methods Make methods only used in CContextAudio private --- src/blackcore/context/contextaudio.h | 15 -------- src/blackcore/context/contextaudioempty.h | 38 --------------------- src/blackcore/context/contextaudioimpl.cpp | 9 ----- src/blackcore/context/contextaudioimpl.h | 10 +++--- src/blackcore/context/contextaudioproxy.cpp | 25 -------------- src/blackcore/context/contextaudioproxy.h | 5 --- 6 files changed, 5 insertions(+), 97 deletions(-) diff --git a/src/blackcore/context/contextaudio.h b/src/blackcore/context/contextaudio.h index 8ee3eed40..e7e459d26 100644 --- a/src/blackcore/context/contextaudio.h +++ b/src/blackcore/context/contextaudio.h @@ -103,27 +103,12 @@ namespace BlackCore void changedSelectedAudioDevices(const BlackMisc::Audio::CAudioDeviceInfoList &devices); 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 virtual void setComVoiceRooms(const BlackMisc::Audio::CVoiceRoomList &voiceRooms) = 0; //! Leave all voice rooms virtual void leaveAllVoiceRooms() = 0; - //! Room user callsigns - virtual BlackMisc::Aviation::CCallsignSet getRoomCallsigns(BlackMisc::Aviation::CComSystem::ComUnit comUnit) const = 0; - //! Room users virtual BlackMisc::Network::CUserList getRoomUsers(BlackMisc::Aviation::CComSystem::ComUnit comUnit) const = 0; diff --git a/src/blackcore/context/contextaudioempty.h b/src/blackcore/context/contextaudioempty.h index 0ef1231b4..0a49172ed 100644 --- a/src/blackcore/context/contextaudioempty.h +++ b/src/blackcore/context/contextaudioempty.h @@ -32,36 +32,6 @@ namespace BlackCore CContextAudioEmpty(CCoreFacade *runtime) : IContextAudio(CCoreFacadeConfig::NotUsed, runtime) {} 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 virtual void setComVoiceRooms(const BlackMisc::Audio::CVoiceRoomList &newRooms) override { @@ -69,14 +39,6 @@ namespace BlackCore 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() virtual BlackMisc::Network::CUserList getRoomUsers(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue) const override { diff --git a/src/blackcore/context/contextaudioimpl.cpp b/src/blackcore/context/contextaudioimpl.cpp index 4f6443673..36c4113d5 100644 --- a/src/blackcore/context/contextaudioimpl.cpp +++ b/src/blackcore/context/contextaudioimpl.cpp @@ -162,15 +162,6 @@ namespace BlackCore 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 { Q_ASSERT(m_voice); diff --git a/src/blackcore/context/contextaudioimpl.h b/src/blackcore/context/contextaudioimpl.h index a3a1aa66a..9ab2b9208 100644 --- a/src/blackcore/context/contextaudioimpl.h +++ b/src/blackcore/context/contextaudioimpl.h @@ -81,12 +81,7 @@ namespace BlackCore // Interface implementations //! \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 BlackMisc::Aviation::CCallsignSet getRoomCallsigns(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue) const override; virtual BlackMisc::Network::CUserList getRoomUsers(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue) const override; virtual void leaveAllVoiceRooms() override; virtual BlackMisc::CIdentifier audioRunsWhere() const override; @@ -133,6 +128,11 @@ namespace BlackCore 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 initInputDevice(); void initOutputDevice(); diff --git a/src/blackcore/context/contextaudioproxy.cpp b/src/blackcore/context/contextaudioproxy.cpp index f215b2c7b..65359f750 100644 --- a/src/blackcore/context/contextaudioproxy.cpp +++ b/src/blackcore/context/contextaudioproxy.cpp @@ -70,11 +70,6 @@ namespace BlackCore this->m_dBusInterface->callDBus(QLatin1String("leaveAllVoiceRooms")); } - BlackMisc::Aviation::CCallsignSet CContextAudioProxy::getRoomCallsigns(CComSystem::ComUnit comUnitValue) const - { - return this->m_dBusInterface->callDBusRet(QLatin1String("getRoomCallsigns"), comUnitValue); - } - BlackMisc::Network::CUserList CContextAudioProxy::getRoomUsers(CComSystem::ComUnit comUnitValue) const { return this->m_dBusInterface->callDBusRet(QLatin1String("getRoomUsers"), comUnitValue); @@ -100,26 +95,6 @@ namespace BlackCore this->m_dBusInterface->callDBus(QLatin1String("setCurrentAudioDevice"), audioDevice); } - CVoiceRoomList CContextAudioProxy::getComVoiceRoomsWithAudioStatus() const - { - return this->m_dBusInterface->callDBusRet(QLatin1String("getComVoiceRoomsWithAudioStatus")); - } - - bool CContextAudioProxy::canTalk() const - { - return this->m_dBusInterface->callDBusRet(QLatin1String("canTalk")); - } - - CVoiceRoomList CContextAudioProxy::getComVoiceRooms() const - { - return this->m_dBusInterface->callDBusRet(QLatin1String("getComVoiceRooms")); - } - - CVoiceRoom CContextAudioProxy::getVoiceRoom(CComSystem::ComUnit comUnitValue, bool withAudioStatus) const - { - return this->m_dBusInterface->callDBusRet(QLatin1String("getVoiceRoom"), comUnitValue, withAudioStatus); - } - void CContextAudioProxy::setComVoiceRooms(const CVoiceRoomList &voiceRooms) { this->m_dBusInterface->callDBus(QLatin1String("setComVoiceRooms"), voiceRooms); diff --git a/src/blackcore/context/contextaudioproxy.h b/src/blackcore/context/contextaudioproxy.h index bb4ce4fe0..b198fff69 100644 --- a/src/blackcore/context/contextaudioproxy.h +++ b/src/blackcore/context/contextaudioproxy.h @@ -63,12 +63,7 @@ namespace BlackCore // interface overrides //! \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 BlackMisc::Aviation::CCallsignSet getRoomCallsigns(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue) const override; virtual BlackMisc::Network::CUserList getRoomUsers(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue) const override; virtual void leaveAllVoiceRooms() override; virtual BlackMisc::CIdentifier audioRunsWhere() const override;