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

Set the actually opened audio device from vatlib

Browse Source 
In the past, the optional arguments currentInput and currentOutput were not
used. Therefore we never knew which device was actually opened by vatlib.
This caused the Audio UI to be completely unsychronized from the reality
when loading swiftgui.

ref T337
This commit is contained in:
Roland Winklmeier
2018-09-12 17:12:55 +02:00
committed by Klaus Basan
parent 44b1273085
commit 24ebc2ce7f
5 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/blackcore/vatsim/audiodevicevatlib.cpp
View File

@@ -39,8 +39,9 @@ namespace BlackCore
: IAudioInputDevice(parent)
{
m_inputCodec.reset(Vat_CreateLocalInputCodec(audioService, vatCodecLegacy));
Vat_GetInputDeviceInfo(m_inputCodec.data(), onInputHardwareDeviceReceived, this, nullptr);
m_currentDevice = getDefaultInputDevice();
int currentDeviceIndex;
Vat_GetInputDeviceInfo(m_inputCodec.data(), onInputHardwareDeviceReceived, this, &currentDeviceIndex);
m_currentDevice = m_devices.findByDeviceIndex(currentDeviceIndex);
}
const CAudioDeviceInfoList &CAudioInputDeviceVatlib::getInputDevices() const
@@ -48,12 +49,6 @@ namespace BlackCore
return m_devices;
}
const CAudioDeviceInfo &CAudioInputDeviceVatlib::getDefaultInputDevice() const
{
static CAudioDeviceInfo info(CAudioDeviceInfo::InputDevice, CAudioDeviceInfo::defaultDeviceIndex(), "default");
return info;
}
const CAudioDeviceInfo &CAudioInputDeviceVatlib::getCurrentInputDevice() const
{
return m_currentDevice;
@@ -85,8 +80,9 @@ namespace BlackCore
: IAudioOutputDevice(parent)
{
m_outputCodec.reset(Vat_CreateLocalOutputCodec(audioService, vatCodecLegacy));
Vat_GetOutputDeviceInfo(m_outputCodec.data(), onOutputHardwareDeviceReceived, this, nullptr);
m_currentDevice = getDefaultOutputDevice();
int currentDeviceIndex;
Vat_GetOutputDeviceInfo(m_outputCodec.data(), onOutputHardwareDeviceReceived, this, &currentDeviceIndex);
m_currentDevice = m_devices.findByDeviceIndex(currentDeviceIndex);
}
const CAudioDeviceInfoList &CAudioOutputDeviceVatlib::getOutputDevices() const
@@ -94,12 +90,6 @@ namespace BlackCore
return m_devices;
}
const CAudioDeviceInfo &CAudioOutputDeviceVatlib::getDefaultOutputDevice() const
{
static CAudioDeviceInfo info(CAudioDeviceInfo::OutputDevice, CAudioDeviceInfo::defaultDeviceIndex(), "default");
return info;
}
const CAudioDeviceInfo &CAudioOutputDeviceVatlib::getCurrentOutputDevice() const
{
return m_currentDevice;