From 3bf4eda70288c5a79ef1cd1ce33583aab4f51b7d Mon Sep 17 00:00:00 2001 From: Roland Rossgotterer Date: Wed, 9 Oct 2019 16:40:00 +0200 Subject: [PATCH] [AFV] Start audio with configured device or default --- src/blackcore/context/contextaudio.cpp | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/blackcore/context/contextaudio.cpp b/src/blackcore/context/contextaudio.cpp index a3565a1ae..9ea8f25cc 100644 --- a/src/blackcore/context/contextaudio.cpp +++ b/src/blackcore/context/contextaudio.cpp @@ -421,8 +421,23 @@ namespace BlackCore m_voiceClient.updateVoiceServerUrl(vs.getAfvVoiceServerUrl()); const CUser connectedUser = this->getIContextNetwork()->getConnectedServer().getUser(); + const QString inputDeviceName = m_inputDeviceSetting.get(); + CAudioDeviceInfo input = CAudioDeviceInfo::getDefaultInputDevice(); + if (!inputDeviceName.isEmpty()) + { + const CAudioDeviceInfoList inputDevs = this->getAudioInputDevices(); + input = inputDevs.findByName(inputDeviceName); + } + + const QString outputDeviceName = m_outputDeviceSetting.get(); + CAudioDeviceInfo output = CAudioDeviceInfo::getDefaultOutputDevice(); + if (!outputDeviceName.isEmpty()) + { + const CAudioDeviceInfoList outputDevs = this->getAudioOutputDevices(); + output = outputDevs.findByName(outputDeviceName); + } m_voiceClient.connectTo(connectedUser.getId(), connectedUser.getPassword(), connectedUser.getCallsign().asString()); - m_voiceClient.startAudio(CAudioDeviceInfo::getDefaultInputDevice(), CAudioDeviceInfo::getDefaultOutputDevice(), {0, 1}); + m_voiceClient.startAudio(input, output, {0, 1}); } else if (to.isDisconnected()) {