New upstream version 1.6.8+ds

diff --git a/docs/changelog.yml b/docs/changelog.yml
index 2a29c5c22fad325584c8a7b56fed8afed792ad8e..fb8bfd903b08b5d44b6dfe02edc3ebb530cd0bd9 100644 (file)
--- a/docs/changelog.yml
+++ b/docs/changelog.yml
@@ -1,3 +1,9 @@
+- Version: "1.6.8"
+  Date: 2022-12-05
+  Description:
+  - (fixed) broken "Yes" button on launch
+  - (fixed) window resizing issues
+  - (fixed) subscribed studios showing up under Public in VS mode
 - Version: "1.6.7"
   Date: 2022-11-03
   Description:

diff --git a/releases/edge/mac-manifests.json b/releases/edge/mac-manifests.json
index 30905ec44c139c6ac14fe3b9ca7af183e7e13286..931144e87de9e65e2769de2fbda30ef8ff7ee04e 100644 (file)
--- a/releases/edge/mac-manifests.json
+++ b/releases/edge/mac-manifests.json
@@ -1,6 +1,16 @@
 {
     "app_name": "JackTrip",
     "releases": [
+        {
+            "version": "1.6.7",
+            "changelog": "Updated Windows networking, enabling all audio devices on Windows, new default device behavior, and fixes: https://github.com/jacktrip/jacktrip/releases/tag/v1.6.7",
+            "download": {
+                "date": "2022-12-02T00:00:00Z",
+                "url": "https://files.jacktrip.org/app-builds/JackTrip-v1.6.7-macOS-x64-installer.pkg",
+                "downloadSize": 11517151,
+                "sha256": "38c25788895ec404bdb4b6148114cad8af31b65e5189ca08819d1e954e2ef4e7"
+            }
+        },
         {
             "version": "1.6.7-rc.2",
             "changelog": "Virtual Studio first time UI, Non-ASIO devices on Windows, Windows can't connect fix: https://github.com/jacktrip/jacktrip/releases/tag/v1.6.7-rc.2",

diff --git a/releases/edge/win-manifests.json b/releases/edge/win-manifests.json
index d1412cc8c7d313f5902df0651a50df34b96caea7..24ff18e14129615f05c07536ef00f8bb3f420082 100644 (file)
--- a/releases/edge/win-manifests.json
+++ b/releases/edge/win-manifests.json
@@ -1,6 +1,16 @@
 {
     "app_name": "JackTrip",
     "releases": [
+        {
+            "version": "1.6.7",
+            "changelog": "Updated Windows networking, enabling all audio devices on Windows, new default device behavior, and fixes: https://github.com/jacktrip/jacktrip/releases/tag/v1.6.7",
+            "download": {
+                "date": "2022-12-02T00:00:00Z",
+                "url": "https://files.jacktrip.org/app-builds/JackTrip-v1.6.7-Windows-x64-installer.msi",
+                "downloadSize": 44535808,
+                "sha256": "75464575311da5521e011da8d2f2b5aff1379edb4dee9dcb90e1750dcc97f2f9"
+            }
+        },
         {
             "version": "1.6.7-rc.2",
             "changelog": "Virtual Studio first time UI, Non-ASIO devices on Windows, Windows can't connect fix: https://github.com/jacktrip/jacktrip/releases/tag/v1.6.7-rc.2",

diff --git a/releases/stable/linux-manifests.json b/releases/stable/linux-manifests.json
index a3e43acc10258156a3c4ae329ae395a61ec092bc..d4e82961b56823ec8dc60af10f26df92510abfc6 100644 (file)
--- a/releases/stable/linux-manifests.json
+++ b/releases/stable/linux-manifests.json
@@ -1,6 +1,16 @@
 {
     "app_name": "JackTrip",
     "releases": [
+        {
+            "version": "1.6.7",
+            "changelog": "Updated Windows networking, enabling all audio devices on Windows, new default device behavior, and fixes: https://github.com/jacktrip/jacktrip/releases/tag/v1.6.7",
+            "download": {
+                "date": "2022-12-02T00:00:00Z",
+                "url": "https://files.jacktrip.org/app-builds/JackTrip-v1.6.7-Linux-x64-binary.zip",
+                "downloadSize": 30495373,
+                "sha256": "09421562aeeefe40bb15945bf1e8e03b3f905ea383ce0a9ddd1f93f099141cfd"
+            }
+        },
         {
             "version": "1.6.6",
             "changelog": "Adding volume controls in Virtual Studio, preliminary QT6 support, classic mode GUI updates, and fixes: https://github.com/jacktrip/jacktrip/releases/tag/v1.6.6",

diff --git a/releases/stable/mac-manifests.json b/releases/stable/mac-manifests.json
index 4de4ce3c6fd7ec2ee31a507eaeeec5188d362e5c..6fec53931ec6b33b012dd7d105e773440da66fb1 100644 (file)
--- a/releases/stable/mac-manifests.json
+++ b/releases/stable/mac-manifests.json
@@ -1,6 +1,16 @@
 {
     "app_name": "JackTrip",
     "releases": [
+        {
+            "version": "1.6.7",
+            "changelog": "Updated Windows networking, enabling all audio devices on Windows, new default device behavior, and fixes: https://github.com/jacktrip/jacktrip/releases/tag/v1.6.7",
+            "download": {
+                "date": "2022-12-02T00:00:00Z",
+                "url": "https://files.jacktrip.org/app-builds/JackTrip-v1.6.7-macOS-x64-installer.pkg",
+                "downloadSize": 11517151,
+                "sha256": "38c25788895ec404bdb4b6148114cad8af31b65e5189ca08819d1e954e2ef4e7"
+            }
+        },
         {
             "version": "1.6.6",
             "changelog": "Adding volume controls in Virtual Studio, preliminary QT6 support, classic mode GUI updates, and fixes: https://github.com/jacktrip/jacktrip/releases/tag/v1.6.6",

diff --git a/releases/stable/win-manifests.json b/releases/stable/win-manifests.json
index 079d3a48480ccdfe24d83bd5bcf59773bb265db1..15d612253309bc5c3f7cd4488ccb328cfbfda25f 100644 (file)
--- a/releases/stable/win-manifests.json
+++ b/releases/stable/win-manifests.json
@@ -1,6 +1,16 @@
 {
     "app_name": "JackTrip",
     "releases": [
+        {
+            "version": "1.6.7",
+            "changelog": "Updated Windows networking, enabling all audio devices on Windows, new default device behavior, and fixes: https://github.com/jacktrip/jacktrip/releases/tag/v1.6.7",
+            "download": {
+                "date": "2022-12-02T00:00:00Z",
+                "url": "https://files.jacktrip.org/app-builds/JackTrip-v1.6.7-Windows-x64-installer.msi",
+                "downloadSize": 44535808,
+                "sha256": "75464575311da5521e011da8d2f2b5aff1379edb4dee9dcb90e1750dcc97f2f9"
+            }
+        },
         {
             "version": "1.6.6",
             "changelog": "Adding volume controls in Virtual Studio, preliminary QT6 support, classic mode GUI updates, and fixes: https://github.com/jacktrip/jacktrip/releases/tag/v1.6.6",

diff --git a/src/gui/FirstLaunch.qml b/src/gui/FirstLaunch.qml
index 2cba8ac0dfab6709990e0928de63bda5e4ad6030..a27d55a80af8927513b17229ec3e2257d1cb0543 100644 (file)
--- a/src/gui/FirstLaunch.qml
+++ b/src/gui/FirstLaunch.qml
@@ -60,7 +60,7 @@ Item {
                 color: shadowColour
             }
         }
-        onClicked: { virtualstudio.windowState = "login"; virtualstudio.toVirtualStudio(); }
+        onClicked: { virtualstudio.showFirstRun = false; virtualstudio.windowState = "login"; virtualstudio.toVirtualStudio(); }
         x: parent.width / 2 - (265 * virtualstudio.uiScale); y: 290 * virtualstudio.uiScale
         width: 234 * virtualstudio.uiScale; height: 49 * virtualstudio.uiScale
         Text {

diff --git a/src/gui/virtualstudio.cpp b/src/gui/virtualstudio.cpp
index d869d977307a18724d733a10d2f7d536e9508632..806c54de1603895536bfd509caee828994402579 100644 (file)
--- a/src/gui/virtualstudio.cpp
+++ b/src/gui/virtualstudio.cpp
@@ -199,6 +199,7 @@ VirtualStudio::VirtualStudio(bool firstRun, QObject* parent)
     m_view.setSource(QUrl(QStringLiteral("qrc:/vs/vs.qml")));
     m_view.setMinimumSize(QSize(594, 519));
     // m_view.setMaximumSize(QSize(696, 577));
+    m_view.setResizeMode(QQuickView::SizeRootObjectToView);
     m_view.resize(696 * m_uiScale, 577 * m_uiScale);
 
     // Connect our timers
@@ -274,6 +275,12 @@ bool VirtualStudio::showFirstRun()
     return m_showFirstRun;
 }
 
+void VirtualStudio::setShowFirstRun(bool show)
+{
+    m_showFirstRun = show;
+    emit showFirstRunChanged();
+}
+
 bool VirtualStudio::hasRefreshToken()
 {
     return !m_refreshToken.isEmpty();
@@ -825,6 +832,7 @@ void VirtualStudio::logout()
 
 void VirtualStudio::refreshStudios(int index, bool signalRefresh)
 {
+    getSubscriptions();
     getServerList(false, signalRefresh, index);
 }
 
@@ -1246,6 +1254,7 @@ void VirtualStudio::slotAuthSucceded()
         getUserId();
     } else {
         getSubscriptions();
+        getServerList(true, false);
     }
 
     if (m_regions.isEmpty()) {
@@ -1773,6 +1782,7 @@ void VirtualStudio::getUserId()
         settings.setValue(QStringLiteral("UserId"), m_userId);
         settings.endGroup();
         getSubscriptions();
+        getServerList(true, false);
 
         if (m_userMetadata.isEmpty() && !m_userId.isEmpty()) {
             getUserMetadata();
@@ -1807,7 +1817,6 @@ void VirtualStudio::getSubscriptions()
             m_subscribedServers.append(
                 subscriptions.at(i)[QStringLiteral("serverId")].toString());
         }
-        getServerList(true, false);
         reply->deleteLater();
     });
 }

diff --git a/src/gui/virtualstudio.h b/src/gui/virtualstudio.h
index 0866c2d67d59d485f03074edd417cb1dc4b510ce..5f1009b328abffdecbb47e244791ed3632260df9 100644 (file)
--- a/src/gui/virtualstudio.h
+++ b/src/gui/virtualstudio.h
@@ -70,7 +70,8 @@ class QJackTrip;
 class VirtualStudio : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(bool showFirstRun READ showFirstRun NOTIFY showFirstRunChanged)
+    Q_PROPERTY(bool showFirstRun READ showFirstRun WRITE setShowFirstRun NOTIFY
+                   showFirstRunChanged)
     Q_PROPERTY(bool hasRefreshToken READ hasRefreshToken NOTIFY hasRefreshTokenChanged)
     Q_PROPERTY(QString versionString READ versionString CONSTANT)
     Q_PROPERTY(QString logoSection READ logoSection NOTIFY logoSectionChanged)
@@ -136,6 +137,7 @@ class VirtualStudio : public QObject
     void raiseToTop();
 
     bool showFirstRun();
+    void setShowFirstRun(bool show);
     bool hasRefreshToken();
     QString versionString();
     QString logoSection();

diff --git a/src/jacktrip_globals.h b/src/jacktrip_globals.h
index 6ed30135fcb96aa645a6e6e07faa13658a899b8e..034f34e330147db0f4b4b6ee7b503447874ddbb8 100644 (file)
--- a/src/jacktrip_globals.h
+++ b/src/jacktrip_globals.h
@@ -40,7 +40,7 @@
 
 #include "AudioInterface.h"
 
-constexpr const char* const gVersion = "1.6.7";  ///< JackTrip version
+constexpr const char* const gVersion = "1.6.8";  ///< JackTrip version
 
 //*******************************************************************************
 /// \name Default Values