Edu tools to main branch

ChangeLog

@@ -1,32 +1,35 @@
 
 
 
+3.6.2git <- NOTE: the release version number will be 3.6.3
 
 
 
-3.6.1git <- NOTE: the release version number will be 3.6.2
+
+3.6.2 (2020-12-12)
 
 - change Clear All Stored Solo Settings to clear Mute as well (#731)
 
 - avoid selecting IPv6 results from hostname lookup, coded by jarmar (#722)
 
 - added possibility to set MIDI offset for fader control to --ctrlmidich (#95)
 
-- bug fix: do not reset sound card channel selection on a device property change
-
-- bug fix: compiling Jamulus 3.6.1 is failing on Debian 9 Linode (#736)
-
-- bug fix: on MacOS Jamulus does not always select the previous sound card (#680)
-
-
-
+- detect if no audio Device is selected before trying to connect a server (#129)
 
+- on MacOS if an audio device is no longer available, show a warning
+  rather than switching to default automatically (#727)
 
+- bug fix: sliders move by themselves if fader groups are used on reconnect (#611)
 
+- bug fix: do not reset sound card channel selection on a device property change (#727)
 
+- bug fix: compiling Jamulus 3.6.1 is failing on Debian 9 Linode (#736)
 
+- bug fix: on MacOS Jamulus does not always select the previous sound card (#680)
 
+- bug fix: use new server icon on Mac server bundle and Windows installer (#737)
 
+- bug fix: ping times of servers which are further down the server list are too high (#49)
 
 
 3.6.1 (2020-11-21)
@@ -78,7 +81,7 @@
 
 - replaced double types by floats for some of the signal processing, coded by hselasky (#544)
 
-- support permanent channl fader sorting (i.e., not only on request but always) (#666)
+- support permanent channel fader sorting (i.e., not only on request but always) (#666)
 
 - support sorting faders by channel city
 

Jamulus.pro

@@ -1,4 +1,4 @@
-VERSION = 3.6.1git
+VERSION = 3.6.2git
 
 # use target name which does not use a captital letter at the beginning
 contains(CONFIG, "noupcasename") {
@@ -97,14 +97,18 @@ win32 {
 
         DEFINES += SERVER_BUNDLE
         TARGET = $${TARGET}Server
+        MACOSX_BUNDLE_ICON_FILE = jamulus-server-icon-2020.icns
+        RC_FILE = mac/jamulus-server-icon-2020.icns
+    } else {
+        MACOSX_BUNDLE_ICON_FILE = mainicon.icns
+        RC_FILE = mac/mainicon.icns
     }
 
     QT += macextras
     HEADERS += mac/sound.h
     SOURCES += mac/sound.cpp
     HEADERS += mac/activity.h
     OBJECTIVE_SOURCES += mac/activity.mm
-    RC_FILE = mac/mainicon.icns
     CONFIG += x86
     QMAKE_TARGET_BUNDLE_PREFIX = net.sourceforge.llcon
     QMAKE_APPLICATION_BUNDLE_NAME. = $$TARGET

mac/Info-make.plist

@@ -17,7 +17,7 @@
         <key>CFBundleDevelopmentRegion</key>
         <string>en</string>
         <key>CFBundleIconFile</key>
-        <string>mainicon.icns</string>
+        <string>@ICON@</string>
         <key>CFBundleGetInfoString</key>
         <string>Created by Qt/QMake</string>
 

mac/Info-xcode.plist

@@ -17,7 +17,7 @@
         <key>CFBundleDevelopmentRegion</key>
         <string>en</string>
         <key>CFBundleIconFile</key>
-        <string>mainicon.icns</string>
+        <string>${ASSETCATALOG_COMPILER_APPICON_NAME}</string>
         <key>CFBundleGetInfoString</key>
         <string>Created by Qt/QMake</string>