Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

list audio devices (doesn't apply it yet)

Browse Source
This commit is contained in:
stonedDiscord 2019-08-19 19:06:41 +02:00
parent 49be444d74
commit 35f2333403
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/aooptionsdialog.h
View File

@ -2,7 +2,13 @@
#define AOOPTIONSDIALOG_H #define AOOPTIONSDIALOG_H
#include "aoapplication.h" #include "aoapplication.h"
#ifdef BASSAUDIO
#include "bass.h" #include "bass.h"
#elif defined QTAUDIO
#include <QAudio>
#include <QAudioDeviceInfo>
#endif
#include <QtCore/QVariant> #include <QtCore/QVariant>
#include <QtWidgets/QApplication> #include <QtWidgets/QApplication>

12
src/aooptionsdialog.cpp
View File

@ -1,6 +1,5 @@
#include "aooptionsdialog.h" #include "aooptionsdialog.h"
#include "aoapplication.h" #include "aoapplication.h"
#include "bass.h"
AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDialog(parent) 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 // Let's fill out the combobox with the available audio devices. Or don't if there is no audio
int a = 0; int a = 0;
#ifdef BASSAUDIO
BASS_DEVICEINFO info;
#endif
if (needs_default_audiodev()) if (needs_default_audiodev())
{ {
@ -245,12 +241,20 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDi
} }
#ifdef BASSAUDIO #ifdef BASSAUDIO
BASS_DEVICEINFO info;
for (a = 0; BASS_GetDeviceInfo(a, &info); a++) for (a = 0; BASS_GetDeviceInfo(a, &info); a++)
{ {
ui_audio_device_combobox->addItem(info.name); ui_audio_device_combobox->addItem(info.name);
if (p_ao_app->get_audio_output_device() == info.name) if (p_ao_app->get_audio_output_device() == info.name)
ui_audio_device_combobox->setCurrentIndex(ui_audio_device_combobox->count()-1); 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 #endif
ui_audio_layout->setWidget(0, QFormLayout::FieldRole, ui_audio_device_combobox); ui_audio_layout->setWidget(0, QFormLayout::FieldRole, ui_audio_device_combobox);