flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-05 09:15:34 +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

24
src/blackgui/components/audiosetupcomponent.cpp
View File

@@ -198,53 +198,53 @@ namespace BlackGui
if (!this->getIContextAudio()) return;
if (index < 0)return;
CAudioDeviceList devices = this->getIContextAudio()->getAudioDevices();
CAudioDeviceInfoList devices = this->getIContextAudio()->getAudioDevices();
if (devices.isEmpty()) return;
CAudioDevice selectedDevice;
CAudioDeviceInfo selectedDevice;
QObject *sender = QObject::sender();
if (sender == this->ui->cb_SetupAudioInputDevice)
{
CAudioDeviceList inputDevices = devices.getInputDevices();
CAudioDeviceInfoList inputDevices = devices.getInputDevices();
if (index >= inputDevices.size()) return;
selectedDevice = inputDevices[index];
this->getIContextAudio()->setCurrentAudioDevice(selectedDevice);
}
else if (sender == this->ui->cb_SetupAudioOutputDevice)
{
CAudioDeviceList outputDevices = devices.getOutputDevices();
CAudioDeviceInfoList outputDevices = devices.getOutputDevices();
if (index >= outputDevices.size()) return;
selectedDevice = outputDevices[index];
this->getIContextAudio()->setCurrentAudioDevice(selectedDevice);
}
}
void CAudioSetupComponent::ps_onCurrentAudioDevicesChanged(const BlackMisc::Audio::CAudioDeviceList &devices)
void CAudioSetupComponent::ps_onCurrentAudioDevicesChanged(const CAudioDeviceInfoList &devices)
{
foreach(CAudioDevice device, devices)
for(auto &device : devices)
{
if (device.getType() == CAudioDevice::InputDevice)
if (device.getType() == CAudioDeviceInfo::InputDevice)
{
this->ui->cb_SetupAudioInputDevice->setCurrentText(device.toQString(true));
}
else if (device.getType() == CAudioDevice::OutputDevice)
else if (device.getType() == CAudioDeviceInfo::OutputDevice)
{
this->ui->cb_SetupAudioOutputDevice->setCurrentText(device.toQString(true));
}
}
}
void CAudioSetupComponent::ps_onAudioDevicesChanged(const BlackMisc::Audio::CAudioDeviceList &devices)
void CAudioSetupComponent::ps_onAudioDevicesChanged(const CAudioDeviceInfoList &devices)
{
this->ui->cb_SetupAudioOutputDevice->clear();
this->ui->cb_SetupAudioInputDevice->clear();
foreach(CAudioDevice device, devices)
for(auto &device : devices)
{
if (device.getType() == CAudioDevice::InputDevice)
if (device.getType() == CAudioDeviceInfo::InputDevice)
{
this->ui->cb_SetupAudioInputDevice->addItem(device.toQString(true));
}
else if (device.getType() == CAudioDevice::OutputDevice)
else if (device.getType() == CAudioDeviceInfo::OutputDevice)
{
this->ui->cb_SetupAudioOutputDevice->addItem(device.toQString(true));
}

6
src/blackgui/components/audiosetupcomponent.h
View File

@@ -13,7 +13,7 @@
#define BLACKGUI_AUDIOSETUPCOMPONENT_H
#include "enableforruntime.h"
#include "blackmisc/audiodevicelist.h"
#include "blackmisc/audiodeviceinfolist.h"
#include <QFrame>
#include <QScopedPointer>
@@ -66,10 +66,10 @@ namespace BlackGui
void ps_audioDeviceSelected(int index);
//! Current audio devices changed
void ps_onCurrentAudioDevicesChanged(const Audio::CAudioDeviceList &devices);
void ps_onCurrentAudioDevicesChanged(const Audio::CAudioDeviceInfoList &devices);
//! Audio devices changed
void ps_onAudioDevicesChanged(const Audio::CAudioDeviceList &devices);
void ps_onAudioDevicesChanged(const Audio::CAudioDeviceInfoList &devices);
private:
//! Audio test modes