Merge remote-tracking branch 'x_github_corrados/master' into hash_in_verisoninfo

Author: nefarius2001

ChangeLog

@@ -2,7 +2,9 @@
 
 
 
-### 3.6.2dev <- NOTE: the release version number will be 3.6.3 ###
+### 3.6.2git <- NOTE: the release version number will be 3.7.0 ###
+
+- introduced new server lists: Any Genre 2, Choral/Barbershop (#875)
 
 - show --clientname as first word in title to avoid clipping in Windows task bar (#789)
 

src/connectdlg.cpp

@@ -74,10 +74,12 @@ CConnectDlg::CConnectDlg ( CClientSettings* pNSetP,
     // central server address type combo box
     cbxCentServAddrType->clear();
     cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_DEFAULT ) );
-    cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_ALL_GENRES ) );
+    cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_ANY_GENRE2 ) );
+    cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_ANY_GENRE3 ) );
     cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_ROCK ) );
     cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_JAZZ ) );
     cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_CLASSICAL_FOLK ) );
+    cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_GENRE_CHORAL ) );
     cbxCentServAddrType->addItem ( csCentServAddrTypeToString ( AT_CUSTOM ) );
 
     cbxCentServAddrType->setWhatsThis ( "<b>" + tr ( "Server List Selection" ) + ":</b> " + tr (

src/global.h

@@ -96,10 +96,12 @@ LED bar:      lbr
 // default server address and port numbers
 #define DEFAULT_SERVER_ADDRESS           "jamulus.fischvolk.de"
 #define DEFAULT_PORT_NUMBER              22124
-#define CENTSERV_ALL_GENRES              "jamulusallgenres.fischvolk.de:22224"
+#define CENTSERV_ANY_GENRE2              "jamulusanygenre2.fischvolk.de:22224"
+#define CENTSERV_ANY_GENRE3              "jamulusanygenre3.fischvolk.de:22624"
 #define CENTSERV_GENRE_ROCK              "jamulusrock.fischvolk.de:22424"
 #define CENTSERV_GENRE_JAZZ              "jamulusjazz.fischvolk.de:22324"
 #define CENTSERV_GENRE_CLASSICAL_FOLK    "jamulusclassical.fischvolk.de:22524"
+#define CENTSERV_GENRE_CHORAL            "jamuluschoral.fischvolk.de:22724"
 
 // getting started and software manual URL
 #define CLIENT_GETTING_STARTED_URL       "https://jamulus.io/wiki/Getting-Started"