diff options
| author | David Skoland <davidskoland@gmail.com> | 2019-07-12 23:00:25 +0000 |
|---|---|---|
| committer | oldmud0 <3421260-oldmud0@users.noreply.gitlab.com> | 2019-07-12 23:00:25 +0000 |
| commit | 5eccabcad15a52691228aded1d9c1fd5074fb70e (patch) | |
| tree | 7eb561cd17039bb29e2f50dd5699c634051d72b2 /src/courtroom.cpp | |
| parent | 621aa1adacec2bcc6befb1a4a70eff7c0e46e7b6 (diff) | |
Less insane debugging; minor refactoring (!75)
Diffstat (limited to 'src/courtroom.cpp')
| -rw-r--r-- | src/courtroom.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp index 3d812e05..a8e97392 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -6,7 +6,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow() // Change the default audio output device to be the one the user has given // in his config.ini file for now. - int a = 0; + unsigned int a = 0; BASS_DEVICEINFO info; if (ao_app->get_audio_output_device() == "default") @@ -21,7 +21,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow() if (ao_app->get_audio_output_device() == info.name) { BASS_SetDevice(a); - BASS_Init(a, 48000, BASS_DEVICE_LATENCY, nullptr, nullptr); + BASS_Init(static_cast<int>(a), 48000, BASS_DEVICE_LATENCY, nullptr, nullptr); load_bass_opus_plugin(); qDebug() << info.name << "was set as the default audio output device."; break; @@ -49,8 +49,6 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow() testimony_hide_timer = new QTimer(this); testimony_hide_timer->setSingleShot(true); - char_button_mapper = new QSignalMapper(this); - music_player = new AOMusicPlayer(this, ao_app); music_player->set_volume(0); sfx_player = new AOSfxPlayer(this, ao_app); @@ -2223,11 +2221,7 @@ void Courtroom::chat_tick() case INLINE_GREY: ui_vp_message->insertHtml("<font color=\""+ get_text_color("_inline_grey").name() +"\">" + f_character + "</font>"); break; - default: - ui_vp_message->insertHtml(f_character); - break; } - } else { |