aboutsummaryrefslogtreecommitdiff
path: root/src/aooptionsdialog.cpp
diff options
context:
space:
mode:
authorstonedDiscord <stoned@derpymail.org>2019-07-30 20:42:33 +0200
committerstonedDiscord <stoned@derpymail.org>2019-07-30 20:42:33 +0200
commitafbbc5476bf5102f421a94006e5f590cb90fd862 (patch)
tree94a40dd3a9a337dc4ce589adc6ae6daa06d043ad /src/aooptionsdialog.cpp
parenta9b803a739fbd3996cfaff6854c76e40ed391980 (diff)
move #ifdef BASSAUDIO so the audio tab isn't deleted as a whole
Diffstat (limited to 'src/aooptionsdialog.cpp')
-rw-r--r--src/aooptionsdialog.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/aooptionsdialog.cpp b/src/aooptionsdialog.cpp
index 0f6a054a..4bfe9de2 100644
--- a/src/aooptionsdialog.cpp
+++ b/src/aooptionsdialog.cpp
@@ -199,7 +199,6 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDi
ui_callwords_layout->addWidget(ui_callwords_explain_lbl);
// The audio tab.
- #ifdef BASSAUDIO
ui_audio_tab = new QWidget();
ui_settings_tabs->addTab(ui_audio_tab, tr("Audio"));
@@ -221,20 +220,23 @@ 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())
{
+
ui_audio_device_combobox->addItem("default");
- }
+ }
+ #ifdef BASSAUDIO
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);
}
-
+ #endif
ui_audio_layout->setWidget(0, QFormLayout::FieldRole, ui_audio_device_combobox);
ui_audio_volume_divider = new QFrame(ui_audio_widget);
@@ -312,7 +314,6 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDi
ui_blank_blips_cb->setChecked(p_ao_app->get_blank_blip());
ui_audio_layout->setWidget(7, QFormLayout::FieldRole, ui_blank_blips_cb);
- #endif
// The casing tab!
ui_casing_tab = new QWidget();