From b38e221fb169400a2f1afda0df18821b3c12381b Mon Sep 17 00:00:00 2001 From: raidensnake Date: Sun, 12 Jul 2020 05:06:38 +0100 Subject: [PATCH] Fix APNG backgrounds not appearing on list; fix BASSOPUS path for macOS (#185) * Added apng support for animated background positioning. * Adjusted the apng background position search. * Fixed libbassopus.dylib path on MacOS preventing opus files from playing. --- src/courtroom.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/courtroom.cpp b/src/courtroom.cpp index 5b043c4..effef54 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -1107,7 +1107,7 @@ void Courtroom::set_background(QString p_background, bool display) // Populate the dropdown list with all pos that exist on this bg QStringList pos_list = {}; for (QString key : default_pos.keys()) { - if (file_exists(ao_app->get_static_image_suffix( + if (file_exists(ao_app->get_image_suffix( ao_app->get_background_path(key)))) { pos_list.append(default_pos[key]); } @@ -4599,11 +4599,8 @@ void Courtroom::load_bass_opus_plugin() #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); + BASS_PluginLoad("libbassopus.dylib", 0); #endif } #else