flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-05 09:15:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #892, disable audio settings when no audio context is available

Browse Source 
* Info for which machine audio setup is displayed
* Obtain audio "location"
* Remark: Audio can run on core and in GUI which is different from other contexts
This commit is contained in:
Klaus Basan
2017-02-27 05:39:31 +01:00
committed by Mathew Sutcliffe
parent 891b67eccc
commit 7203655a05
9 changed files with 104 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackcore/context/contextaudio.h
View File

@@ -137,6 +137,9 @@ namespace BlackCore
//! Audio devices
virtual BlackMisc::Audio::CAudioDeviceInfoList getAudioDevices() const = 0;
//! Audio runs where
virtual BlackMisc::CIdentifier audioRunsWhere() const = 0;
//! Get current audio device
//! \return input and output devices
virtual BlackMisc::Audio::CAudioDeviceInfoList getCurrentAudioDevices() const = 0;

8
src/blackcore/context/contextaudioempty.h
View File

@@ -88,6 +88,14 @@ namespace BlackCore
logEmptyContextWarning(Q_FUNC_INFO);
}
//! \copydoc IContextAudio::audioRunsWhere()
virtual BlackMisc::CIdentifier audioRunsWhere() const override
{
logEmptyContextWarning(Q_FUNC_INFO);
static const BlackMisc::CIdentifier i("CContextAudioEmpty");
return i;
}
//! \copydoc IContextAudio::getAudioDevices()
virtual BlackMisc::Audio::CAudioDeviceInfoList getAudioDevices() const override
{

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

@@ -167,6 +167,14 @@ namespace BlackCore
m_unusedVoiceChannels.push_back(m_channel2);
}
CIdentifier CContextAudio::audioRunsWhere() const
{
Q_ASSERT(this->m_voice);
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
static const BlackMisc::CIdentifier i("CContextAudio");
return i;
}
CAudioDeviceInfoList CContextAudio::getAudioDevices() const
{
Q_ASSERT(this->m_voice);

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

@@ -81,6 +81,7 @@ namespace BlackCore
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;
virtual BlackMisc::Audio::CAudioDeviceInfoList getAudioDevices() const override;
virtual BlackMisc::Audio::CAudioDeviceInfoList getCurrentAudioDevices() const override;
virtual void setCurrentAudioDevice(const BlackMisc::Audio::CAudioDeviceInfo &audioDevice) override;

5
src/blackcore/context/contextaudioproxy.cpp
View File

@@ -82,6 +82,11 @@ namespace BlackCore
return this->m_dBusInterface->callDBusRet<CAudioDeviceInfoList>(QLatin1String("getAudioDevices"));
}
CIdentifier CContextAudioProxy::audioRunsWhere() const
{
return this->m_dBusInterface->callDBusRet<CIdentifier>(QLatin1String("audioRunsWhere"));
}
CAudioDeviceInfoList CContextAudioProxy::getCurrentAudioDevices() const
{
return this->m_dBusInterface->callDBusRet<CAudioDeviceInfoList>(QLatin1String("getCurrentAudioDevices"));

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

@@ -70,6 +70,7 @@ namespace BlackCore
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;
virtual BlackMisc::Audio::CAudioDeviceInfoList getAudioDevices() const override;
virtual BlackMisc::Audio::CAudioDeviceInfoList getCurrentAudioDevices() const override;
virtual void setCurrentAudioDevice(const BlackMisc::Audio::CAudioDeviceInfo &audioDevice) override;