diff options
| author | oldmud0 <3421260-oldmud0@users.noreply.gitlab.com> | 2019-07-20 16:57:27 +0000 |
|---|---|---|
| committer | oldmud0 <3421260-oldmud0@users.noreply.gitlab.com> | 2019-07-20 16:57:27 +0000 |
| commit | e0c49ceb0720fabc777e178e1c8ce76ec7ef42e9 (patch) | |
| tree | e78e7ec82f105e98a7e3f1dab2a5c907e249f877 /src/courtroom.cpp | |
| parent | e5c2898bac03c478b468afd765ecbf3ceaa19a46 (diff) | |
| parent | 4a2a167f7d552141a2e3450d350b57d2f7b342a0 (diff) | |
Merge branch 'bass-optional' into 'master'
Bass+discord optional
See merge request AttorneyOnline/AO2-Client!59
Diffstat (limited to 'src/courtroom.cpp')
| -rw-r--r-- | src/courtroom.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp index 237bedc5..5258120a 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -3,7 +3,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow() { ao_app = p_ao_app; - + #ifdef BASSAUDIO // Change the default audio output device to be the one the user has given // in his config.ini file for now. unsigned int a = 0; @@ -28,6 +28,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow() } } } + #endif keepalive_timer = new QTimer(this); keepalive_timer->start(60000); @@ -3568,23 +3569,29 @@ Courtroom::~Courtroom() delete blip_player; } + #if (defined (_WIN32) || defined (_WIN64)) void Courtroom::load_bass_opus_plugin() { + #ifdef BASSAUDIO BASS_PluginLoad("bassopus.dll", 0); + #endif } #elif (defined (LINUX) || defined (__linux__)) void Courtroom::load_bass_opus_plugin() { + #ifdef BASSAUDIO BASS_PluginLoad("libbassopus.so", 0); + #endif } #elif defined __APPLE__ void Courtroom::load_bass_opus_plugin() { QString libpath = ao_app->get_base_path() + "../../Frameworks/libbassopus.dylib"; QByteArray ba = libpath.toLocal8Bit(); - + #ifdef BASSAUDIO BASS_PluginLoad(ba.data(), 0); + #endif } #else #error This operating system is unsupported for bass plugins. |