diff options
| author | oldmud0 <oldmud0@users.noreply.github.com> | 2019-01-07 10:17:26 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-07 10:17:26 -0600 |
| commit | 33dd06e9aa4de11c4e8f9e51bebfdede39c61573 (patch) | |
| tree | 41c5291ec187c76dea5b9c55f389186b6ee874a1 /src | |
| parent | 57b02c084ae6884c35dbf5a126ee2ec256ba1ca4 (diff) | |
| parent | f0069768a76293f00e26714a3c37d7f69e3ad4a5 (diff) | |
Merge pull request #56 from OmniTroid/master
Small fixes, decluttering + better build scripts
Diffstat (limited to 'src')
| -rw-r--r-- | src/courtroom.cpp | 5 | ||||
| -rw-r--r-- | src/text_file_functions.cpp | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp index f4b484b..598747c 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -3511,7 +3511,10 @@ void Courtroom::load_bass_opus_plugin() #elif defined __APPLE__ void Courtroom::load_bass_opus_plugin() { - BASS_PluginLoad("libbassopus.dylib", 0); + QString libpath = ao_app->get_base_path() + "../../Frameworks/libbassopus.dylib"; + QByteArray ba = libpath.toLocal8Bit(); + + BASS_PluginLoad(ba.data(), 0); } #else #error This operating system is unsupported for bass plugins. diff --git a/src/text_file_functions.cpp b/src/text_file_functions.cpp index 0af96f1..1e920d7 100644 --- a/src/text_file_functions.cpp +++ b/src/text_file_functions.cpp @@ -9,6 +9,10 @@ QString AOApplication::read_theme() int AOApplication::read_blip_rate() { int result = configini->value("blip_rate", 1).toInt(); + + if (result < 1) + return 1; + return result; } |
