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

Moved bassopus stuff to its own function.

Browse Source 
Not that it works, so whatever.
This commit is contained in:
Cerapter 2018-10-23 09:33:58 +02:00
parent 265714d9d5
commit 546d3c8970
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
courtroom.cpp
View File

@ -22,8 +22,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
if (ao_app->get_audio_output_device() == "Default") if (ao_app->get_audio_output_device() == "Default")
{ {
BASS_Init(-1, 48000, BASS_DEVICE_LATENCY, 0, NULL); BASS_Init(-1, 48000, BASS_DEVICE_LATENCY, 0, NULL);
BASS_PluginLoad("bassopus.dll", BASS_UNICODE); load_bass_opus_plugin();
BASS_PluginLoad("libbassopus.so", 0);
} }
else else
{ {
@ -33,8 +32,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
{ {
BASS_SetDevice(a); BASS_SetDevice(a);
BASS_Init(a, 48000, BASS_DEVICE_LATENCY, 0, NULL); BASS_Init(a, 48000, BASS_DEVICE_LATENCY, 0, NULL);
BASS_PluginLoad("bassopus.dll", BASS_UNICODE); load_bass_opus_plugin();
BASS_PluginLoad("libbassopus.so", 0);
qDebug() << info.name << "was set as the default audio output device."; qDebug() << info.name << "was set as the default audio output device.";
break; break;
} }
@ -3514,3 +3512,17 @@ Courtroom::~Courtroom()
delete objection_player; delete objection_player;
delete blip_player; delete blip_player;
} }
#if (defined (_WIN32) || defined (_WIN64))
void Courtroom::load_bass_opus_plugin()
{
BASS_PluginLoad("bassopus.dll", 0);
}
#elif (defined (LINUX) || defined (__linux__))
void Courtroom::load_bass_opus_plugin()
{
BASS_PluginLoad("libbassopus.so", 0);
}
#else
#error This operating system is unsupported for bass plugins.
#endif

2
courtroom.h
View File

@ -645,6 +645,8 @@ private slots:
void on_switch_area_music_clicked(); void on_switch_area_music_clicked();
void ping_server(); void ping_server();
void load_bass_opus_plugin();
}; };
#endif // COURTROOM_H #endif // COURTROOM_H