From 0788b162f1bb3dbfef66fbe9d341bc3a857a90e1 Mon Sep 17 00:00:00 2001 From: David Skoland Date: Wed, 2 Jan 2019 22:28:16 +0100 Subject: fixed a crash condition where blip rate is less than 1 --- src/text_file_functions.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/text_file_functions.cpp b/src/text_file_functions.cpp index fcb8df2c..f35690af 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; } -- cgit From 9ce14dd479e01f51d497a4bbb7e8cc94636a7695 Mon Sep 17 00:00:00 2001 From: David Skoland Date: Wed, 2 Jan 2019 23:32:07 +0100 Subject: yOu nEEd tO HaVe iCoNs oF ALl kINdS oF SIzeS -sincerely, apple --- resource/logo.iconset/icon_1024x1024.png | Bin 0 -> 391400 bytes resource/logo.iconset/icon_128x128.png | Bin 0 -> 29889 bytes resource/logo.iconset/icon_128x128@2x.png | Bin 0 -> 74755 bytes resource/logo.iconset/icon_16x16.png | Bin 0 -> 3685 bytes resource/logo.iconset/icon_256x256.png | Bin 0 -> 74755 bytes resource/logo.iconset/icon_256x256@2x.png | Bin 0 -> 172975 bytes resource/logo.iconset/icon_32x32.png | Bin 0 -> 5603 bytes resource/logo.iconset/icon_512x512.png | Bin 0 -> 172975 bytes resource/logo.iconset/icon_512x512@2x.png | Bin 0 -> 391400 bytes resource/logo.iconset/icon_64x64.png | Bin 0 -> 11744 bytes 10 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 resource/logo.iconset/icon_1024x1024.png create mode 100644 resource/logo.iconset/icon_128x128.png create mode 100644 resource/logo.iconset/icon_128x128@2x.png create mode 100644 resource/logo.iconset/icon_16x16.png create mode 100644 resource/logo.iconset/icon_256x256.png create mode 100644 resource/logo.iconset/icon_256x256@2x.png create mode 100644 resource/logo.iconset/icon_32x32.png create mode 100644 resource/logo.iconset/icon_512x512.png create mode 100644 resource/logo.iconset/icon_512x512@2x.png create mode 100644 resource/logo.iconset/icon_64x64.png diff --git a/resource/logo.iconset/icon_1024x1024.png b/resource/logo.iconset/icon_1024x1024.png new file mode 100644 index 00000000..97c96a4a Binary files /dev/null and b/resource/logo.iconset/icon_1024x1024.png differ diff --git a/resource/logo.iconset/icon_128x128.png b/resource/logo.iconset/icon_128x128.png new file mode 100644 index 00000000..b08cc076 Binary files /dev/null and b/resource/logo.iconset/icon_128x128.png differ diff --git a/resource/logo.iconset/icon_128x128@2x.png b/resource/logo.iconset/icon_128x128@2x.png new file mode 100644 index 00000000..355253d3 Binary files /dev/null and b/resource/logo.iconset/icon_128x128@2x.png differ diff --git a/resource/logo.iconset/icon_16x16.png b/resource/logo.iconset/icon_16x16.png new file mode 100644 index 00000000..e0e088dc Binary files /dev/null and b/resource/logo.iconset/icon_16x16.png differ diff --git a/resource/logo.iconset/icon_256x256.png b/resource/logo.iconset/icon_256x256.png new file mode 100644 index 00000000..355253d3 Binary files /dev/null and b/resource/logo.iconset/icon_256x256.png differ diff --git a/resource/logo.iconset/icon_256x256@2x.png b/resource/logo.iconset/icon_256x256@2x.png new file mode 100644 index 00000000..4191c2f8 Binary files /dev/null and b/resource/logo.iconset/icon_256x256@2x.png differ diff --git a/resource/logo.iconset/icon_32x32.png b/resource/logo.iconset/icon_32x32.png new file mode 100644 index 00000000..01bab863 Binary files /dev/null and b/resource/logo.iconset/icon_32x32.png differ diff --git a/resource/logo.iconset/icon_512x512.png b/resource/logo.iconset/icon_512x512.png new file mode 100644 index 00000000..4191c2f8 Binary files /dev/null and b/resource/logo.iconset/icon_512x512.png differ diff --git a/resource/logo.iconset/icon_512x512@2x.png b/resource/logo.iconset/icon_512x512@2x.png new file mode 100644 index 00000000..97c96a4a Binary files /dev/null and b/resource/logo.iconset/icon_512x512@2x.png differ diff --git a/resource/logo.iconset/icon_64x64.png b/resource/logo.iconset/icon_64x64.png new file mode 100644 index 00000000..c4e28ad2 Binary files /dev/null and b/resource/logo.iconset/icon_64x64.png differ -- cgit From bb27b6095db20791b36662167bf737913ff3f37d Mon Sep 17 00:00:00 2001 From: David Skoland Date: Thu, 3 Jan 2019 00:04:16 +0100 Subject: added macos post build script --- scripts/macos_post_build.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 scripts/macos_post_build.sh diff --git a/scripts/macos_post_build.sh b/scripts/macos_post_build.sh new file mode 100644 index 00000000..875078bd --- /dev/null +++ b/scripts/macos_post_build.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +DST_FOLDER="./bin/Attorney_Online.app/Contents/Frameworks" + +cd .. + +mkdir $DST_FOLDER + +cp libbass.dylib $DST_FOLDER +cp libbassopus.dylib $DST_FOLDER + +install_name_tool -id @executable_path/../Frameworks/libbass.dylib $DST_FOLDER/libbass.dylib + +install_name_tool -change @loader_path/libbass.dylib @executable_path/../Frameworks/libbass.dylib ./bin/Attorney_Online.app/Contents/MacOS/Attorney_Online -- cgit From 5b9bf086cfc83da38a319dd44befb544160096e7 Mon Sep 17 00:00:00 2001 From: David Skoland Date: Thu, 3 Jan 2019 00:09:24 +0100 Subject: adjusted macos post build script --- scripts/macos_post_build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/macos_post_build.sh b/scripts/macos_post_build.sh index 875078bd..c37efdf9 100644 --- a/scripts/macos_post_build.sh +++ b/scripts/macos_post_build.sh @@ -6,8 +6,8 @@ cd .. mkdir $DST_FOLDER -cp libbass.dylib $DST_FOLDER -cp libbassopus.dylib $DST_FOLDER +cp ./lib/libbass.dylib $DST_FOLDER +cp ./lib/libbassopus.dylib $DST_FOLDER install_name_tool -id @executable_path/../Frameworks/libbass.dylib $DST_FOLDER/libbass.dylib -- cgit From 181b5da379b35c05671b25472d0b0b78e8660120 Mon Sep 17 00:00:00 2001 From: David Skoland Date: Thu, 3 Jan 2019 00:29:42 +0100 Subject: removed redundant QTPLUGIN declaration and added macx icon file --- Attorney_Online.pro | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Attorney_Online.pro b/Attorney_Online.pro index c7bf3d80..42f43c20 100644 --- a/Attorney_Online.pro +++ b/Attorney_Online.pro @@ -26,5 +26,4 @@ CONFIG += c++11 RESOURCES += resources.qrc win32:RC_ICONS = resource/logo.ico - -QTPLUGIN += qapng +macx:ICON = resource/logo.icns -- cgit From 00933ad997b00f0b89cf9efa0f4958c39b1f6275 Mon Sep 17 00:00:00 2001 From: David Skoland Date: Thu, 3 Jan 2019 00:32:27 +0100 Subject: added the last few icons to prevent warnings in iconutil --- resource/logo.iconset/icon_16x16@2x.png | Bin 0 -> 5603 bytes resource/logo.iconset/icon_32x32@2x.png | Bin 0 -> 11744 bytes resource/logo.iconset/icon_64x64@2x.png | Bin 0 -> 29889 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 resource/logo.iconset/icon_16x16@2x.png create mode 100644 resource/logo.iconset/icon_32x32@2x.png create mode 100644 resource/logo.iconset/icon_64x64@2x.png diff --git a/resource/logo.iconset/icon_16x16@2x.png b/resource/logo.iconset/icon_16x16@2x.png new file mode 100644 index 00000000..01bab863 Binary files /dev/null and b/resource/logo.iconset/icon_16x16@2x.png differ diff --git a/resource/logo.iconset/icon_32x32@2x.png b/resource/logo.iconset/icon_32x32@2x.png new file mode 100644 index 00000000..c4e28ad2 Binary files /dev/null and b/resource/logo.iconset/icon_32x32@2x.png differ diff --git a/resource/logo.iconset/icon_64x64@2x.png b/resource/logo.iconset/icon_64x64@2x.png new file mode 100644 index 00000000..b08cc076 Binary files /dev/null and b/resource/logo.iconset/icon_64x64@2x.png differ -- cgit From a3ac7c477c685428543d93aab7fb5aa7f09b06a5 Mon Sep 17 00:00:00 2001 From: David Skoland Date: Thu, 3 Jan 2019 00:38:56 +0100 Subject: added icns file for macos --- resource/logo.icns | Bin 0 -> 1129414 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 resource/logo.icns diff --git a/resource/logo.icns b/resource/logo.icns new file mode 100644 index 00000000..fb2456c8 Binary files /dev/null and b/resource/logo.icns differ -- cgit From bda0457f2e8c775a9430f4790230c82a6604e412 Mon Sep 17 00:00:00 2001 From: David Skoland Date: Thu, 3 Jan 2019 00:47:02 +0100 Subject: declutter pro file --- Attorney_Online.pro | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Attorney_Online.pro b/Attorney_Online.pro index 42f43c20..8f80380c 100644 --- a/Attorney_Online.pro +++ b/Attorney_Online.pro @@ -1,11 +1,4 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2016-12-29T01:14:46 -# -#------------------------------------------------- - -QT += core gui multimedia network -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets +QT += core gui widgets multimedia network TARGET = Attorney_Online TEMPLATE = app -- cgit From e2034188be7ec63bd0f30bb0ce1bdba06f4ffb92 Mon Sep 17 00:00:00 2001 From: David Skoland Date: Sat, 5 Jan 2019 22:58:54 +0100 Subject: remove old mac script --- scripts/fix_dynamic_linking_macos.sh | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 scripts/fix_dynamic_linking_macos.sh diff --git a/scripts/fix_dynamic_linking_macos.sh b/scripts/fix_dynamic_linking_macos.sh deleted file mode 100644 index a786a55a..00000000 --- a/scripts/fix_dynamic_linking_macos.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -#this script relinks dynamic libraries so the .app file can be distributed as standalone - -install_name_tool -id @executable_path/../Frameworks/libbass.dylib ../bin/Attorney_Online.app/Contents/Frameworks/libbass.dylib - -install_name_tool -id @executable_path/../Frameworks/libbassopus.dylib ../bin/Attorney_Online.app/Contents/Frameworks/libbassopus.dylib - -install_name_tool -id @executable_path/../Frameworks/libdiscord-rpc.dylib ../bin/Attorney_Online.app/Contents/Frameworks/libdiscord-rpc.dylib - -install_name_tool -id @executable_path/../Frameworks/libqapng.dylib ../bin/Attorney_Online.app/Contents/Frameworks/libqapng.dylib - -install_name_tool -change @loader_path/libbass.dylib @executable_path/../Frameworks/libbass.dylib ../bin/Attorney_Online.app/Contents/MacOS/Attorney_Online - -install_name_tool -change @rpath/libdiscord-rpc.dylib @executable_path/../Frameworks/libdiscord-rpc.dylib ../bin/Attorney_Online.app/Contents/MacOS/Attorney_Online - -- cgit From ce459e3bc107ababb25b74062ea43a9dbdf7e490 Mon Sep 17 00:00:00 2001 From: David Skoland Date: Sat, 5 Jan 2019 23:02:07 +0100 Subject: version bump in .pro file --- Attorney_Online.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Attorney_Online.pro b/Attorney_Online.pro index 8f80380c..39366c04 100644 --- a/Attorney_Online.pro +++ b/Attorney_Online.pro @@ -3,7 +3,7 @@ QT += core gui widgets multimedia network TARGET = Attorney_Online TEMPLATE = app -VERSION = 2.6.0.0 +VERSION = 2.6.1.0 INCLUDEPATH += $$PWD/include DESTDIR = $$PWD/bin -- cgit From 3965a847c211e3b1930a53dfe95f1136da781e88 Mon Sep 17 00:00:00 2001 From: David Skoland Date: Sun, 6 Jan 2019 12:14:00 +0100 Subject: fixed opus plugin load for macOS --- src/courtroom.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/courtroom.cpp b/src/courtroom.cpp index f4b484b7..598747c4 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. -- cgit From f0069768a76293f00e26714a3c37d7f69e3ad4a5 Mon Sep 17 00:00:00 2001 From: David Skoland Date: Sun, 6 Jan 2019 21:50:05 +0100 Subject: updated macos build script --- scripts/macos_post_build.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/macos_post_build.sh b/scripts/macos_post_build.sh index c37efdf9..d69da0b4 100644 --- a/scripts/macos_post_build.sh +++ b/scripts/macos_post_build.sh @@ -1,14 +1,16 @@ #!/bin/bash - + DST_FOLDER="./bin/Attorney_Online.app/Contents/Frameworks" - + cd .. - + mkdir $DST_FOLDER - + cp ./lib/libbass.dylib $DST_FOLDER cp ./lib/libbassopus.dylib $DST_FOLDER - + install_name_tool -id @executable_path/../Frameworks/libbass.dylib $DST_FOLDER/libbass.dylib - + +install_name_tool -id @executable_path/../Frameworks/libbassopus.dylib $DST_FOLDER/libbassopus.dylib + install_name_tool -change @loader_path/libbass.dylib @executable_path/../Frameworks/libbass.dylib ./bin/Attorney_Online.app/Contents/MacOS/Attorney_Online -- cgit