From 1e16203d04506621e9d61947cf2f8680c4af2d8a Mon Sep 17 00:00:00 2001
From: Roland Winklmeier <Roland.M.Winklmeier@gmail.com>
Date: Thu, 6 Sep 2018 11:20:18 +0200
Subject: [PATCH] Check which voice channel is allocated to COM1

ref T328
---
 src/blackcore/context/contextaudioimpl.cpp | 27 ++++++++++++++++------
 src/blackcore/context/contextaudioimpl.h   |  2 ++
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/blackcore/context/contextaudioimpl.cpp b/src/blackcore/context/contextaudioimpl.cpp
index 9a0bdca7c..d64c04760 100644
--- a/src/blackcore/context/contextaudioimpl.cpp
+++ b/src/blackcore/context/contextaudioimpl.cpp
@@ -9,7 +9,6 @@
 
 
 #include "blackcore/audiodevice.h"
-#include "blackcore/audiomixer.h"
 #include "blackcore/context/contextaudioimpl.h"
 #include "blackcore/context/contextnetwork.h"
 #include "blackcore/context/contextownaircraft.h"
@@ -88,6 +87,9 @@ namespace BlackCore
             m_unusedVoiceChannels.push_back(m_channel1);
             m_unusedVoiceChannels.push_back(m_channel2);
 
+            m_voiceChannelOutputPortMapping[m_channel1] = IAudioMixer::OutputVoiceChannel1;
+            m_voiceChannelOutputPortMapping[m_channel2] = IAudioMixer::OutputVoiceChannel2;
+
             m_selcalPlayer = new CSelcalPlayer(QAudioDeviceInfo::defaultOutputDevice(), this);
 
             changeDeviceSettings();
@@ -134,7 +136,7 @@ namespace BlackCore
             if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
             CVoiceRoomList voiceRoomList;
 
-            auto voiceChannelCom1 = m_voiceChannelMapping.value(BlackMisc::Aviation::CComSystem::Com1);
+            QSharedPointer<IVoiceChannel> voiceChannelCom1 = m_voiceChannelMapping.value(BlackMisc::Aviation::CComSystem::Com1);
             if (voiceChannelCom1)
             {
                 CVoiceRoom room = voiceChannelCom1->getVoiceRoom();
@@ -145,7 +147,7 @@ namespace BlackCore
                 voiceRoomList.push_back(CVoiceRoom());
             }
 
-            auto voiceChannelCom2 = m_voiceChannelMapping.value(BlackMisc::Aviation::CComSystem::Com2);
+            QSharedPointer<IVoiceChannel> voiceChannelCom2 = m_voiceChannelMapping.value(BlackMisc::Aviation::CComSystem::Com2);
             if (voiceChannelCom2)
             {
                 CVoiceRoom room = voiceChannelCom2->getVoiceRoom();
@@ -314,7 +316,7 @@ namespace BlackCore
             // changed rooms?  But only compare on "URL",  not status as connected etc.
             if (currentRoomCom1.getVoiceRoomUrl() != newRoomCom1.getVoiceRoomUrl())
             {
-                auto oldVoiceChannel = m_voiceChannelMapping.value(BlackMisc::Aviation::CComSystem::Com1);
+                QSharedPointer<IVoiceChannel> oldVoiceChannel = m_voiceChannelMapping.value(BlackMisc::Aviation::CComSystem::Com1);
                 if (oldVoiceChannel)
                 {
                     m_voiceChannelMapping.remove(BlackMisc::Aviation::CComSystem::Com1);
@@ -333,7 +335,7 @@ namespace BlackCore
 
                 if (newRoomCom1.isValid())
                 {
-                    auto newVoiceChannel = getVoiceChannelBy(newRoomCom1);
+                    QSharedPointer<IVoiceChannel> newVoiceChannel = getVoiceChannelBy(newRoomCom1);
                     newVoiceChannel->setOwnAircraftCallsign(ownCallsign);
                     bool inUse = m_voiceChannelMapping.key(newVoiceChannel);
                     m_voiceChannelMapping.insert(BlackMisc::Aviation::CComSystem::Com1, newVoiceChannel);
@@ -514,8 +516,19 @@ namespace BlackCore
         void CContextAudio::ps_setVoiceTransmission(bool enable)
         {
             // FIXME: Use the 'active' channel instead of hardcoded COM1
-            if (enable) m_audioMixer->makeMixerConnection(IAudioMixer::InputMicrophone, IAudioMixer::OutputVoiceChannel1);
-            else m_audioMixer->removeMixerConnection(IAudioMixer::InputMicrophone, IAudioMixer::OutputVoiceChannel1);
+            if (!m_voiceChannelMapping.contains(BlackMisc::Aviation::CComSystem::Com1)) { return; }
+            QSharedPointer<IVoiceChannel> voiceChannelCom1 = m_voiceChannelMapping.value(BlackMisc::Aviation::CComSystem::Com1);
+            IAudioMixer::OutputPort mixerOutputPort = m_voiceChannelOutputPortMapping.value(voiceChannelCom1);
+            if (enable)
+            {
+                m_audioMixer->makeMixerConnection(IAudioMixer::InputMicrophone, mixerOutputPort);
+            }
+            else
+            {
+                // Remove for both output ports, just in case.
+                m_audioMixer->removeMixerConnection(IAudioMixer::InputMicrophone, IAudioMixer::OutputVoiceChannel1);
+                m_audioMixer->removeMixerConnection(IAudioMixer::InputMicrophone, IAudioMixer::OutputVoiceChannel2);
+            }
         }
 
         void CContextAudio::ps_connectionStatusChanged(BlackCore::IVoiceChannel::ConnectionStatus oldStatus,
diff --git a/src/blackcore/context/contextaudioimpl.h b/src/blackcore/context/contextaudioimpl.h
index 12bc61897..609e1d48b 100644
--- a/src/blackcore/context/contextaudioimpl.h
+++ b/src/blackcore/context/contextaudioimpl.h
@@ -18,6 +18,7 @@
 #include "blackcore/corefacadeconfig.h"
 #include "blackcore/audio/audiosettings.h"
 #include "blackcore/voicechannel.h"
+#include "blackcore/audiomixer.h"
 #include "blackmisc/audio/audiodeviceinfolist.h"
 #include "blackmisc/audio/notificationsounds.h"
 #include "blackmisc/audio/voiceroom.h"
@@ -154,6 +155,7 @@ namespace BlackCore
 
             QList<QSharedPointer<IVoiceChannel>> m_unusedVoiceChannels;
             QHash<BlackMisc::Aviation::CComSystem::ComUnit, QSharedPointer<IVoiceChannel>> m_voiceChannelMapping;
+            QHash<QSharedPointer<IVoiceChannel>, IAudioMixer::OutputPort> m_voiceChannelOutputPortMapping;
             BlackSound::CSelcalPlayer *m_selcalPlayer = nullptr;
 
             // settings