Changed voice context so it can play SELCAL tones. This makes sense, as I can

use the device information of this context. Sound shall be played on the
same computer as the voice.

* Adjusted .pro file
* Methods for SELCAL in context
* New XML file (DBus)
* changed the place where I can obtain the current in/output device
This commit is contained in:
Klaus Basan
2014-02-05 21:05:00 +00:00
committed by Mathew Sutcliffe
parent f9225814f9
commit 6485527062
9 changed files with 114 additions and 27 deletions

View File

@@ -43,6 +43,8 @@ namespace BlackCore
this->m_voiceRooms.push_back(CVoiceRoom()); // COM2
this->m_outputEnabled.insert(COM1, true);
this->m_outputEnabled.insert(COM2, true);
this->m_currentInputDevice = this->defaultAudioInputDevice();
this->m_currentOutputDevice = this->defaultAudioOutputDevice();
// do processing
this->startTimer(100);
@@ -87,6 +89,22 @@ namespace BlackCore
return BlackMisc::Voice::CAudioDevice(BlackMisc::Voice::CAudioDevice::OutputDevice, BlackMisc::Voice::CAudioDevice::defaultDevice(), "default");
}
/*
* Current output device
*/
CAudioDevice CVoiceVatlib::getCurrentOutputDevice() const
{
return m_currentOutputDevice;
}
/*
* Current input device
*/
CAudioDevice CVoiceVatlib::getCurrentInputDevice() const
{
return m_currentInputDevice;
}
/*
* Set input device
*/
@@ -109,6 +127,7 @@ namespace BlackCore
{
qWarning() << "Input device hit a fatal error";
}
this->m_currentInputDevice = device;
}
catch (...)
{
@@ -135,6 +154,7 @@ namespace BlackCore
{
qWarning() << "Input device hit a fatal error";
}
this->m_currentOutputDevice = device;
}
catch (...)
{