From 14d1124a74815a903432a8a3e970d1acef1fb680 Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig=20=28Debian/GNU=29?= Date: Mon, 29 Aug 2022 09:24:15 +0200 Subject: [PATCH] New upstream version 1.6.3+ds0 --- CMakeLists.txt | 2 ++ docs/changelog.yml | 6 ++++++ linux/org.jacktrip.JackTrip.desktop.in | 2 +- releases/edge/mac-manifests.json | 10 ++++++++++ releases/edge/win-manifests.json | 10 ++++++++++ releases/stable/mac-manifests.json | 10 ++++++++++ releases/stable/win-manifests.json | 10 ++++++++++ src/jacktrip_globals.h | 2 +- src/main.cpp | 2 -- 9 files changed, 50 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8673486..5cb1697 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -147,6 +147,8 @@ if (NOT nogui) src/gui/vsUrlHandler.cpp src/gui/vsWebSocket.cpp src/gui/qjacktrip.qrc + # Need to include this for AUTOMOC to do its thing + src/JTApplication.h ) else () set (qjacktrip_SRC ${qjacktrip_SRC} src/gui/qjacktrip_novs.qrc) diff --git a/docs/changelog.yml b/docs/changelog.yml index 4a83d87..fd026c3 100644 --- a/docs/changelog.yml +++ b/docs/changelog.yml @@ -1,3 +1,9 @@ +- Version: "1.6.3" + Date: 2022-08-23 + Description: + - (fixed) Segfault when creating a hub server via cmd line + - (fixed) Linux desktop file is no longer invalid + - (fixed) Command line arguments no longer print to console - Version: "1.6.2" Date: 2022-08-05 Description: diff --git a/linux/org.jacktrip.JackTrip.desktop.in b/linux/org.jacktrip.JackTrip.desktop.in index c34033c..620a3e6 100644 --- a/linux/org.jacktrip.JackTrip.desktop.in +++ b/linux/org.jacktrip.JackTrip.desktop.in @@ -3,7 +3,7 @@ Type=Application Name=JackTrip@name_suffix@ Comment=Network Music Performance over the Internet Comment[fr]=Performance de musique en réseau sur internet -Exec=/bin/bash -c 'if [ -z "$1" ]; then jacktrip; else jacktrip --gui --deeplink $1; fi' /bin/bash %u +Exec=/bin/bash -c "if [ -z ""\$"1" ]; then jacktrip; else jacktrip --gui --deeplink ""\$"1"; fi" /bin/bash %u Icon=@icon@ Terminal=false StartupWMClass=@wmclass@ diff --git a/releases/edge/mac-manifests.json b/releases/edge/mac-manifests.json index 5fa65e2..7b26f5f 100644 --- a/releases/edge/mac-manifests.json +++ b/releases/edge/mac-manifests.json @@ -1,6 +1,16 @@ { "app_name": "JackTrip", "releases": [ + { + "version": "1.6.2", + "changelog": "Ability to open app via URL schemes, displaying latency stats, and Virtual Studio device support. Learn more here: https://github.com/jacktrip/jacktrip/releases/tag/v1.6.2", + "download": { + "date": "2022-08-17T00:00:00Z", + "url": "https://github.com/jacktrip/jacktrip/releases/download/v1.6.2/JackTrip-v1.6.2-macOS-x64-installer.pkg", + "downloadSize": 11536442, + "sha256": "450222f4db1922275e07286d0be6ea2df2873a8a39c3b23096bcfbce342b7b3c" + } + }, { "version": "1.6.2-rc.3", "changelog": "Ability to open app via URL schemes, displaying latency stats, and Virtual Studio device support. Learn more here: https://github.com/jacktrip/jacktrip/releases/tag/v1.6.2-rc3", diff --git a/releases/edge/win-manifests.json b/releases/edge/win-manifests.json index 2471877..6304bbb 100644 --- a/releases/edge/win-manifests.json +++ b/releases/edge/win-manifests.json @@ -1,6 +1,16 @@ { "app_name": "JackTrip", "releases": [ + { + "version": "1.6.2", + "changelog": "Ability to open app via URL schemes, displaying latency stats, and Virtual Studio device support. Learn more here: https://github.com/jacktrip/jacktrip/releases/tag/v1.6.2", + "download": { + "date": "2022-08-17T00:00:00Z", + "url": "https://github.com/jacktrip/jacktrip/releases/download/v1.6.2/JackTrip-v1.6.2-Windows-x64-installer.msi", + "downloadSize": 43606016, + "sha256": "2bb06fe3624df447d56da0d72fef1f4328346fd92c6dffccf66ba37253ec5e62" + } + }, { "version": "1.6.2-rc.3", "changelog": "Ability to open app via URL schemes, displaying latency stats, and Virtual Studio device support. Learn more here: https://github.com/jacktrip/jacktrip/releases/tag/v1.6.2-rc3", diff --git a/releases/stable/mac-manifests.json b/releases/stable/mac-manifests.json index 2bcad7b..c91d622 100644 --- a/releases/stable/mac-manifests.json +++ b/releases/stable/mac-manifests.json @@ -1,6 +1,16 @@ { "app_name": "JackTrip", "releases": [ + { + "version": "1.6.2", + "changelog": "Ability to open app via URL schemes, displaying latency stats, and Virtual Studio device support. Learn more here: https://github.com/jacktrip/jacktrip/releases/tag/v1.6.2", + "download": { + "date": "2022-08-17T00:00:00Z", + "url": "https://github.com/jacktrip/jacktrip/releases/download/v1.6.2/JackTrip-v1.6.2-macOS-x64-installer.pkg", + "downloadSize": 11536442, + "sha256": "450222f4db1922275e07286d0be6ea2df2873a8a39c3b23096bcfbce342b7b3c" + } + }, { "version": "1.6.1", "changelog": "Bugfixes around UDP timeout and 'Logging In' screen navigation. Learn more here: https://github.com/jacktrip/jacktrip/releases/tag/v1.6.1", diff --git a/releases/stable/win-manifests.json b/releases/stable/win-manifests.json index 42b0d70..48486bb 100644 --- a/releases/stable/win-manifests.json +++ b/releases/stable/win-manifests.json @@ -1,6 +1,16 @@ { "app_name": "JackTrip", "releases": [ + { + "version": "1.6.2", + "changelog": "Ability to open app via URL schemes, displaying latency stats, and Virtual Studio device support. Learn more here: https://github.com/jacktrip/jacktrip/releases/tag/v1.6.2", + "download": { + "date": "2022-08-17T00:00:00Z", + "url": "https://github.com/jacktrip/jacktrip/releases/download/v1.6.2/JackTrip-v1.6.2-Windows-x64-installer.msi", + "downloadSize": 43606016, + "sha256": "2bb06fe3624df447d56da0d72fef1f4328346fd92c6dffccf66ba37253ec5e62" + } + }, { "version": "1.6.1", "changelog": "Bugfixes around UDP timeout and 'Logging In' screen navigation. Learn more here: https://github.com/jacktrip/jacktrip/releases/tag/v1.6.1", diff --git a/src/jacktrip_globals.h b/src/jacktrip_globals.h index eb27960..f57e6ef 100644 --- a/src/jacktrip_globals.h +++ b/src/jacktrip_globals.h @@ -40,7 +40,7 @@ #include "AudioInterface.h" -constexpr const char* const gVersion = "1.6.2"; ///< JackTrip version +constexpr const char* const gVersion = "1.6.3"; ///< JackTrip version //******************************************************************************* /// \name Default Values diff --git a/src/main.cpp b/src/main.cpp index 2c11e33..9b0cf48 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -90,7 +90,6 @@ QCoreApplication* createApplication(int& argc, char* argv[]) // Check for some specific, GUI related command line options. bool forceGui = false; for (int i = 1; i < argc; i++) { - std::cout << argv[i] << std::endl; if (strcmp(argv[i], "--gui") == 0) { forceGui = true; } else if (strcmp(argv[i], "--test-gui") == 0) { @@ -507,7 +506,6 @@ int main(int argc, char* argv[]) #endif // NO_GUI // Otherwise use the non-GUI version, and parse our command line. QLoggingCategory::setFilterRules(QStringLiteral("*.debug=true")); - qInstallMessageHandler(qtMessageHandler); try { Settings settings; settings.parseInput(argc, argv); -- 2.30.2