1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-02 14:04:46 -04:00

Multiple audio support: added ability to manage more than one audio output

This commit is contained in:
f4exb
2018-03-24 23:50:28 +01:00
parent d7db3405a0
commit 7aaa230eb4
20 changed files with 133 additions and 99 deletions
+2 -3
View File
@@ -237,7 +237,7 @@ int WebAPIAdapterSrv::instanceAudioGet(
response.setNbInputDevices(nbInputDevices);
response.setInputDeviceSelectedIndex(m_mainCore.m_dspEngine->getAudioDeviceManager()->getInputDeviceIndex());
response.setNbOutputDevices(nbOutputDevices);
response.setOutputDeviceSelectedIndex(m_mainCore.m_dspEngine->getAudioDeviceManager()->getOutputDeviceIndex());
response.setOutputDeviceSelectedIndex(-1); // FIXME: remove
response.setInputVolume(m_mainCore.m_dspEngine->getAudioDeviceManager()->getInputVolume());
QList<SWGSDRangel::SWGAudioDevice*> *inputDevices = response.getInputDevices();
QList<SWGSDRangel::SWGAudioDevice*> *outputDevices = response.getOutputDevices();
@@ -279,11 +279,10 @@ int WebAPIAdapterSrv::instanceAudioPatch(
m_mainCore.m_dspEngine->getAudioDeviceManager()->setInputVolume(inputVolume);
m_mainCore.m_dspEngine->getAudioDeviceManager()->setInputDeviceIndex(inputIndex);
m_mainCore.m_dspEngine->getAudioDeviceManager()->setOutputDeviceIndex(outputIndex);
response.setInputVolume(m_mainCore.m_dspEngine->getAudioDeviceManager()->getInputVolume());
response.setInputIndex(m_mainCore.m_dspEngine->getAudioDeviceManager()->getInputDeviceIndex());
response.setOutputIndex(m_mainCore.m_dspEngine->getAudioDeviceManager()->getOutputDeviceIndex());
response.setOutputIndex(-1); // FIXME: remove
return 200;
}