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

refs #320 Rename CAudioDevice to CAudioDeviceInfo

Browse Source 
CAudioDevice implied a device handler instead of device information
This commit is contained in:
Roland Winklmeier
2014-12-25 20:12:58 +01:00
parent 0d26a8fd9b
commit a1ef1d4484
20 changed files with 124 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/blackcore/context_audio_impl.cpp
View File

@@ -127,7 +127,7 @@ namespace BlackCore
/*
* Audio devices
*/
CAudioDeviceList CContextAudio::getAudioDevices() const
CAudioDeviceInfoList CContextAudio::getAudioDevices() const
{
Q_ASSERT(this->m_voice);
CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO;
@@ -137,11 +137,11 @@ namespace BlackCore
/*
* Audio default devices
*/
CAudioDeviceList CContextAudio::getCurrentAudioDevices() const
CAudioDeviceInfoList CContextAudio::getCurrentAudioDevices() const
{
Q_ASSERT(this->m_voice);
CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO;
CAudioDeviceList devices;
CAudioDeviceInfoList devices;
devices.push_back(this->m_voice->getCurrentInputDevice());
devices.push_back(this->m_voice->getCurrentOutputDevice());
return devices;
@@ -150,13 +150,13 @@ namespace BlackCore
/*
* Set current device
*/
void CContextAudio::setCurrentAudioDevice(const CAudioDevice &audioDevice)
void CContextAudio::setCurrentAudioDevice(const CAudioDeviceInfo &audioDevice)
{
Q_ASSERT(this->m_voice);
Q_ASSERT(audioDevice.getType() != CAudioDevice::Unknown);
Q_ASSERT(audioDevice.getType() != CAudioDeviceInfo::Unknown);
CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << audioDevice;
bool changed = false;
if (audioDevice.getType() == CAudioDevice::InputDevice)
if (audioDevice.getType() == CAudioDeviceInfo::InputDevice)
{
if (this->m_voice->getCurrentInputDevice() != audioDevice)
{
@@ -342,7 +342,7 @@ namespace BlackCore
{
Q_ASSERT(this->m_voice);
CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO << selcal;
CAudioDevice outputDevice = m_voice->getCurrentOutputDevice();
CAudioDeviceInfo outputDevice = m_voice->getCurrentOutputDevice();
BlackSound::CSoundGenerator::playSelcal(90, selcal, outputDevice);
}