flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-26 18:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T609, function in audio context for COM integration + fix for wrong mixer device

Browse Source
This commit is contained in:
Klaus Basan
2019-08-03 14:30:03 +02:00
committed by Mat Sutcliffe
parent 64b2bd11ba
commit 429c63d220
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,8 @@
#include "blackcore/context/contextaudioimpl.h" #include "blackcore/context/contextaudioimpl.h"
#include "blackcore/context/contextnetwork.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/application.h"
#include "blackcore/audiodevice.h" #include "blackcore/audiodevice.h"
#include "blackcore/corefacade.h" #include "blackcore/corefacade.h"
@@ -144,7 +145,7 @@ namespace BlackCore
m_voice->connectVoice(m_audioMixer.get(), IAudioMixer::OutputVoiceChannel2, m_channel2.data()); m_voice->connectVoice(m_audioMixer.get(), IAudioMixer::OutputVoiceChannel2, m_channel2.data());
m_audioMixer->makeMixerConnection(IAudioMixer::InputVoiceChannel1, IAudioMixer::OutputOutputDevice1); m_audioMixer->makeMixerConnection(IAudioMixer::InputVoiceChannel1, IAudioMixer::OutputOutputDevice1);
m_audioMixer->makeMixerConnection(IAudioMixer::InputVoiceChannel2, IAudioMixer::OutputOutputDevice1); m_audioMixer->makeMixerConnection(IAudioMixer::InputVoiceChannel2, IAudioMixer::OutputOutputDevice2);
} }
CContextAudio::~CContextAudio() CContextAudio::~CContextAudio()
@@ -729,6 +730,12 @@ namespace BlackCore
return this->getIContextOwnAircraft()->getOwnComSystem(unit); return this->getIContextOwnAircraft()->getOwnComSystem(unit);
} }
bool CContextAudio::isComIntegratedWithSimulator() const
{
if (!this->getIContextSimulator()) { return false; }
return this->getIContextSimulator()->getSimulatorSettings().isComIntegrated();
}
QSharedPointer<IVoiceChannel> CContextAudio::getVoiceChannelBy(const CVoiceRoom &voiceRoom) QSharedPointer<IVoiceChannel> CContextAudio::getVoiceChannelBy(const CVoiceRoom &voiceRoom)
{ {
QSharedPointer<IVoiceChannel> voiceChannel; QSharedPointer<IVoiceChannel> voiceChannel;

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

@@ -171,6 +171,7 @@ namespace BlackCore
//! \remark cross context //! \remark cross context
//! @{ //! @{
BlackMisc::Aviation::CComSystem getOwnComSystem(BlackMisc::Aviation::CComSystem::ComUnit unit) const; BlackMisc::Aviation::CComSystem getOwnComSystem(BlackMisc::Aviation::CComSystem::ComUnit unit) const;
bool isComIntegratedWithSimulator() const;
//! @} //! @}
//! Voice channel by room //! Voice channel by room