list audio devices (doesn't apply it yet)
This commit is contained in:
parent
49be444d74
commit
35f2333403
@ -2,7 +2,13 @@
|
||||
#define AOOPTIONSDIALOG_H
|
||||
|
||||
#include "aoapplication.h"
|
||||
|
||||
#ifdef BASSAUDIO
|
||||
#include "bass.h"
|
||||
#elif defined QTAUDIO
|
||||
#include <QAudio>
|
||||
#include <QAudioDeviceInfo>
|
||||
#endif
|
||||
|
||||
#include <QtCore/QVariant>
|
||||
#include <QtWidgets/QApplication>
|
||||
|
@ -1,6 +1,5 @@
|
||||
#include "aooptionsdialog.h"
|
||||
#include "aoapplication.h"
|
||||
#include "bass.h"
|
||||
|
||||
AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDialog(parent)
|
||||
{
|
||||
@ -235,9 +234,6 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDi
|
||||
|
||||
// Let's fill out the combobox with the available audio devices. Or don't if there is no audio
|
||||
int a = 0;
|
||||
#ifdef BASSAUDIO
|
||||
BASS_DEVICEINFO info;
|
||||
#endif
|
||||
if (needs_default_audiodev())
|
||||
{
|
||||
|
||||
@ -245,12 +241,20 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDi
|
||||
|
||||
}
|
||||
#ifdef BASSAUDIO
|
||||
BASS_DEVICEINFO info;
|
||||
for (a = 0; BASS_GetDeviceInfo(a, &info); a++)
|
||||
{
|
||||
ui_audio_device_combobox->addItem(info.name);
|
||||
if (p_ao_app->get_audio_output_device() == info.name)
|
||||
ui_audio_device_combobox->setCurrentIndex(ui_audio_device_combobox->count()-1);
|
||||
}
|
||||
#elif defined QTAUDIO
|
||||
foreach (const QAudioDeviceInfo &deviceInfo, QAudioDeviceInfo::availableDevices(QAudio::AudioOutput))
|
||||
{
|
||||
ui_audio_device_combobox->addItem(deviceInfo.deviceName());
|
||||
if (p_ao_app->get_audio_output_device() == deviceInfo.deviceName())
|
||||
ui_audio_device_combobox->setCurrentIndex(ui_audio_device_combobox->count()-1);
|
||||
}
|
||||
#endif
|
||||
ui_audio_layout->setWidget(0, QFormLayout::FieldRole, ui_audio_device_combobox);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user