From 1c6afdce99811525bd703a526041691070b03274 Mon Sep 17 00:00:00 2001 From: Cerapter Date: Thu, 13 Dec 2018 11:38:21 +0100 Subject: [PATCH] Fixed a bug where there would be no sound on Windows during the first start. --- aoblipplayer.cpp | 2 +- aomusicplayer.cpp | 2 +- aooptionsdialog.cpp | 2 +- aosfxplayer.cpp | 2 +- courtroom.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/aoblipplayer.cpp b/aoblipplayer.cpp index 067ed00..74757c5 100644 --- a/aoblipplayer.cpp +++ b/aoblipplayer.cpp @@ -29,7 +29,7 @@ void AOBlipPlayer::blip_tick() HSTREAM f_stream = m_stream_list[f_cycle]; - if (ao_app->get_audio_output_device() != "Default") + if (ao_app->get_audio_output_device() != "default") BASS_ChannelSetDevice(f_stream, BASS_GetDevice()); BASS_ChannelPlay(f_stream, false); } diff --git a/aomusicplayer.cpp b/aomusicplayer.cpp index bd36393..997d82d 100644 --- a/aomusicplayer.cpp +++ b/aomusicplayer.cpp @@ -21,7 +21,7 @@ void AOMusicPlayer::play(QString p_song) this->set_volume(m_volume); - if (ao_app->get_audio_output_device() != "Default") + if (ao_app->get_audio_output_device() != "default") BASS_ChannelSetDevice(m_stream, BASS_GetDevice()); BASS_ChannelPlay(m_stream, false); } diff --git a/aooptionsdialog.cpp b/aooptionsdialog.cpp index 7182e7a..2b8259f 100644 --- a/aooptionsdialog.cpp +++ b/aooptionsdialog.cpp @@ -224,7 +224,7 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDi if (needs_default_audiodev()) { - ui_audio_device_combobox->addItem("Default"); + ui_audio_device_combobox->addItem("default"); } for (a = 0; BASS_GetDeviceInfo(a, &info); a++) diff --git a/aosfxplayer.cpp b/aosfxplayer.cpp index 84a8eb3..90e458e 100644 --- a/aosfxplayer.cpp +++ b/aosfxplayer.cpp @@ -31,7 +31,7 @@ void AOSfxPlayer::play(QString p_sfx, QString p_char, QString shout) set_volume(m_volume); - if (ao_app->get_audio_output_device() != "Default") + if (ao_app->get_audio_output_device() != "default") BASS_ChannelSetDevice(m_stream, BASS_GetDevice()); BASS_ChannelPlay(m_stream, false); } diff --git a/courtroom.cpp b/courtroom.cpp index 7a9d3c5..f0bdcce 100644 --- a/courtroom.cpp +++ b/courtroom.cpp @@ -9,7 +9,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow() int a = 0; BASS_DEVICEINFO info; - if (ao_app->get_audio_output_device() == "Default") + if (ao_app->get_audio_output_device() == "default") { BASS_Init(-1, 48000, BASS_DEVICE_LATENCY, nullptr, nullptr); load_bass_opus_plugin();