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

refs #277, removed QAudioOutput as discussed

Browse Source 
(was used to work around a bug with muted sound)
This commit is contained in:
Klaus Basan
2014-06-23 00:26:00 +02:00
parent 317ea93701
commit 5da3f55886
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackcore/voice_vatlib.cpp
View File

@@ -19,7 +19,7 @@ namespace BlackCore
CVoiceVatlib::CVoiceVatlib(QObject *parent) : CVoiceVatlib::CVoiceVatlib(QObject *parent) :
IVoice(parent), IVoice(parent),
m_voice(nullptr), m_voice(nullptr),
m_audioOutput(nullptr), // m_audioOutput(nullptr), // removed #227
m_inputSquelch(-1), m_inputSquelch(-1),
m_micTestResult(Cvatlib_Voice_Simple::agc_Ok), m_micTestResult(Cvatlib_Voice_Simple::agc_Ok),
m_isAudioLoopbackEnabled(false), m_isAudioLoopbackEnabled(false),
@@ -40,7 +40,7 @@ namespace BlackCore
{ {
// we use reset here until issue #277 is resolved // we use reset here until issue #277 is resolved
// easier to find root cause // easier to find root cause
m_audioOutput.reset(new QAudioOutput()); // m_audioOutput.reset(new QAudioOutput());
m_voice.reset(Cvatlib_Voice_Simple::Create()); m_voice.reset(Cvatlib_Voice_Simple::Create());
m_voice->Setup(true, 3290, 2, 1, onRoomStatusUpdate, this); m_voice->Setup(true, 3290, 2, 1, onRoomStatusUpdate, this);
m_voice->GetInputDevices(onInputHardwareDeviceReceived, this); m_voice->GetInputDevices(onInputHardwareDeviceReceived, this);
@@ -54,7 +54,7 @@ namespace BlackCore
this->m_outputEnabled.insert(COM2, true); this->m_outputEnabled.insert(COM2, true);
this->m_currentInputDevice = this->defaultAudioInputDevice(); this->m_currentInputDevice = this->defaultAudioInputDevice();
this->m_currentOutputDevice = this->defaultAudioOutputDevice(); this->m_currentOutputDevice = this->defaultAudioOutputDevice();
this->m_audioOutput->setVolume(1.0); // make sure the overall sound is not muted // this->m_audioOutput->setVolume(1.0); // make sure the overall sound is not muted
// do processing // do processing
this->startTimer(10); this->startTimer(10);

2
src/blackcore/voice_vatlib.h
View File

@@ -226,7 +226,7 @@ namespace BlackCore
}; };
QScopedPointer<Cvatlib_Voice_Simple, Cvatlib_Voice_Simple_Deleter> m_voice; QScopedPointer<Cvatlib_Voice_Simple, Cvatlib_Voice_Simple_Deleter> m_voice;
QScopedPointer<QAudioOutput> m_audioOutput; // QScopedPointer<QAudioOutput> m_audioOutput; #227
BlackMisc::Aviation::CCallsign m_aircraftCallsign; /*!< own callsign to join voice rooms */ BlackMisc::Aviation::CCallsign m_aircraftCallsign; /*!< own callsign to join voice rooms */
BlackMisc::Audio::CVoiceRoomList m_voiceRooms; BlackMisc::Audio::CVoiceRoomList m_voiceRooms;
BlackMisc::Audio::CAudioDeviceList m_devices; /*!< in and output devices */ BlackMisc::Audio::CAudioDeviceList m_devices; /*!< in and output devices */