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

only load bass plugins when bass is included

Browse Source
This commit is contained in:
sD 2020-02-21 18:00:23 +01:00
parent 87e359487d
commit 2716416b62
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/courtroom.h
View File

@ -688,7 +688,9 @@ private slots:
void ping_server(); void ping_server();
#ifdef BASSAUDIO
void load_bass_opus_plugin(); void load_bass_opus_plugin();
#endif
}; };
#endif // COURTROOM_H #endif // COURTROOM_H

9
src/courtroom.cpp
View File

@ -3955,30 +3955,25 @@ Courtroom::~Courtroom()
delete blip_player; delete blip_player;
} }
#ifdef BASSAUDIO
#if (defined (_WIN32) || defined (_WIN64)) #if (defined (_WIN32) || defined (_WIN64))
void Courtroom::load_bass_opus_plugin() void Courtroom::load_bass_opus_plugin()
{ {
#ifdef BASSAUDIO
BASS_PluginLoad("bassopus.dll", 0); BASS_PluginLoad("bassopus.dll", 0);
#endif
} }
#elif (defined (LINUX) || defined (__linux__)) #elif (defined (LINUX) || defined (__linux__))
void Courtroom::load_bass_opus_plugin() void Courtroom::load_bass_opus_plugin()
{ {
#ifdef BASSAUDIO
BASS_PluginLoad("libbassopus.so", 0); BASS_PluginLoad("libbassopus.so", 0);
#endif
} }
#elif defined __APPLE__ #elif defined __APPLE__
void Courtroom::load_bass_opus_plugin() void Courtroom::load_bass_opus_plugin()
{ {
QString libpath = ao_app->get_base_path() + "../../Frameworks/libbassopus.dylib"; QString libpath = ao_app->get_base_path() + "../../Frameworks/libbassopus.dylib";
QByteArray ba = libpath.toLocal8Bit(); QByteArray ba = libpath.toLocal8Bit();
#ifdef BASSAUDIO
BASS_PluginLoad(ba.data(), 0); BASS_PluginLoad(ba.data(), 0);
#endif
} }
#else #else
#error This operating system is unsupported for bass plugins. #error This operating system is unsupported for bass plugins.
#endif #endif
#endif