Remove unnecessary updating of voice room callsigns

The voice room callsign will be set from the current context values right
before a new connection is made. Therefore all updates in between are not
necessary and can be removed.

ref T354

src/blackcore/context/contextaudio.h

@@ -119,9 +119,6 @@ namespace BlackCore
             //! Set voice rooms
             virtual void setComVoiceRooms(const BlackMisc::Audio::CVoiceRoomList &voiceRooms) = 0;
 
-            //! Own callsign as displayed in voice room
-            virtual void setOwnCallsignForRooms(const BlackMisc::Aviation::CCallsign &callsign) = 0;
-
             //! Leave all voice rooms
             virtual void leaveAllVoiceRooms() = 0;
 

src/blackcore/context/contextaudioempty.h

@@ -59,13 +59,6 @@ namespace BlackCore
                 logEmptyContextWarning(Q_FUNC_INFO);
             }
 
-            //! \copydoc IContextAudio::setOwnCallsignForRooms
-            virtual void setOwnCallsignForRooms(const BlackMisc::Aviation::CCallsign &callsign) override
-            {
-                Q_UNUSED(callsign);
-                logEmptyContextWarning(Q_FUNC_INFO);
-            }
-
             //! \copydoc IContextAudio::getRoomCallsigns()
             virtual BlackMisc::Aviation::CCallsignSet getRoomCallsigns(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue) const override
             {

src/blackcore/context/contextaudioimpl.cpp

@@ -51,16 +51,11 @@ namespace BlackCore
             IContextAudio(mode, runtime),
             m_voice(new CVoiceVatlib())
         {
-            // own aircraft may or may not be available
-            const CCallsign ownCallsign = (this->getIContextOwnAircraft()) ? getIContextOwnAircraft()->getOwnAircraft().getCallsign() : CCallsign();
-
             m_channel1 = m_voice->createVoiceChannel();
-            m_channel1->setOwnAircraftCallsign(ownCallsign);
             connect(m_channel1.data(), &IVoiceChannel::connectionStatusChanged, this, &CContextAudio::ps_connectionStatusChanged);
             connect(m_channel1.data(), &IVoiceChannel::userJoinedRoom, this, &CContextAudio::ps_userJoinedRoom);
             connect(m_channel1.data(), &IVoiceChannel::userLeftRoom, this, &CContextAudio::ps_userLeftRoom);
             m_channel2 = m_voice->createVoiceChannel();
-            m_channel2->setOwnAircraftCallsign(ownCallsign);
             connect(m_channel2.data(), &IVoiceChannel::connectionStatusChanged, this, &CContextAudio::ps_connectionStatusChanged);
             connect(m_channel2.data(), &IVoiceChannel::userJoinedRoom, this, &CContextAudio::ps_userJoinedRoom);
             connect(m_channel2.data(), &IVoiceChannel::userLeftRoom, this, &CContextAudio::ps_userLeftRoom);
@@ -401,14 +396,6 @@ namespace BlackCore
             Q_UNUSED(changed);
         }
 
-        void CContextAudio::setOwnCallsignForRooms(const CCallsign &callsign)
-        {
-            if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << callsign; }
-
-            if (m_channel1) { m_channel1->setOwnAircraftCallsign(callsign); }
-            if (m_channel2) { m_channel2->setOwnAircraftCallsign(callsign); }
-        }
-
         CCallsignSet CContextAudio::getRoomCallsigns(BlackMisc::Aviation::CComSystem::ComUnit comUnitValue) const
         {
             Q_ASSERT(m_voice);
@@ -553,12 +540,6 @@ namespace BlackCore
                 CLogMessage(this).warning("Voice channel disconnecting error");
             // intentional fall-through
             case IVoiceChannel::Disconnected:
-                if (this->getIContextOwnAircraft())
-                {
-                    // good chance to update aircraft
-                    m_channel1->setOwnAircraftCallsign(this->getIContextOwnAircraft()->getOwnAircraft().getCallsign());
-                    m_channel2->setOwnAircraftCallsign(this->getIContextOwnAircraft()->getOwnAircraft().getCallsign());
-                }
                 emit this->changedVoiceRooms(getComVoiceRooms(), false);
                 break;
             default:

src/blackcore/context/contextaudioimpl.h

@@ -78,7 +78,6 @@ namespace BlackCore
             virtual BlackMisc::Audio::CVoiceRoomList getComVoiceRoomsWithAudioStatus() 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 setOwnCallsignForRooms(const BlackMisc::Aviation::CCallsign &callsign) 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;

src/blackcore/context/contextaudioproxy.cpp

@@ -117,11 +117,6 @@ namespace BlackCore
             this->m_dBusInterface->callDBus(QLatin1String("setComVoiceRooms"), voiceRooms);
         }
 
-        void CContextAudioProxy::setOwnCallsignForRooms(const CCallsign &callsign)
-        {
-            this->m_dBusInterface->callDBus(QLatin1String("setOwnCallsignForRooms"), callsign);
-        }
-
         void CContextAudioProxy::playSelcalTone(const CSelcal &selcal) const
         {
             this->m_dBusInterface->callDBus(QLatin1String("playSelcalTone"), selcal);

src/blackcore/context/contextaudioproxy.h

@@ -66,7 +66,6 @@ namespace BlackCore
             virtual BlackMisc::Audio::CVoiceRoomList getComVoiceRoomsWithAudioStatus() 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 setOwnCallsignForRooms(const BlackMisc::Aviation::CCallsign &callsign) 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;

src/blackcore/corefacade.cpp

@@ -263,8 +263,6 @@ namespace BlackCore
             Q_ASSERT(m_contextOwnAircraft);
             c = connect(m_contextApplication, &IContextApplication::fakedSetComVoiceRoom, this->getCContextAudio(),  &CContextAudio::setComVoiceRooms);
             Q_ASSERT(c);
-            c = connect(m_contextOwnAircraft, &IContextOwnAircraft::changedCallsign, this->getCContextAudio(), &IContextAudio::setOwnCallsignForRooms);
-            Q_ASSERT(c);
             times.insert("Post setup, connects audio", time.restart());
         }
     }