diff --git a/src/blackcore/context/contextaudioimpl.cpp b/src/blackcore/context/contextaudioimpl.cpp index 259173a4a..c4f0370b8 100644 --- a/src/blackcore/context/contextaudioimpl.cpp +++ b/src/blackcore/context/contextaudioimpl.cpp @@ -9,7 +9,8 @@ #include "blackcore/context/contextaudioimpl.h" #include "blackcore/context/contextnetwork.h" -#include "blackcore/context/contextownaircraft.h" +#include "blackcore/context/contextownaircraft.h" // for COM integration +#include "blackcore/context/contextsimulator.h" // for COM intergration #include "blackcore/application.h" #include "blackcore/audiodevice.h" #include "blackcore/corefacade.h" @@ -144,7 +145,7 @@ namespace BlackCore m_voice->connectVoice(m_audioMixer.get(), IAudioMixer::OutputVoiceChannel2, m_channel2.data()); m_audioMixer->makeMixerConnection(IAudioMixer::InputVoiceChannel1, IAudioMixer::OutputOutputDevice1); - m_audioMixer->makeMixerConnection(IAudioMixer::InputVoiceChannel2, IAudioMixer::OutputOutputDevice1); + m_audioMixer->makeMixerConnection(IAudioMixer::InputVoiceChannel2, IAudioMixer::OutputOutputDevice2); } CContextAudio::~CContextAudio() @@ -729,6 +730,12 @@ namespace BlackCore return this->getIContextOwnAircraft()->getOwnComSystem(unit); } + bool CContextAudio::isComIntegratedWithSimulator() const + { + if (!this->getIContextSimulator()) { return false; } + return this->getIContextSimulator()->getSimulatorSettings().isComIntegrated(); + } + QSharedPointer CContextAudio::getVoiceChannelBy(const CVoiceRoom &voiceRoom) { QSharedPointer voiceChannel; diff --git a/src/blackcore/context/contextaudioimpl.h b/src/blackcore/context/contextaudioimpl.h index be605d74f..b78b36970 100644 --- a/src/blackcore/context/contextaudioimpl.h +++ b/src/blackcore/context/contextaudioimpl.h @@ -171,6 +171,7 @@ namespace BlackCore //! \remark cross context //! @{ BlackMisc::Aviation::CComSystem getOwnComSystem(BlackMisc::Aviation::CComSystem::ComUnit unit) const; + bool isComIntegratedWithSimulator() const; //! @} //! Voice channel by room