introduced new server lists: Any Genre 2, Choral/Barbershop (#875)

jamulussoftware · Jan 24, 2021 · 0192af1 · 0192af1
1 parent 54be858
commit 0192af1
Show file tree

Hide file tree

Showing 16 changed files with 2,422 additions and 2,134 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -2,7 +2,9 @@
 
 
 
-### 3.6.2git <- 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)
 

diff --git a/src/connectdlg.cpp b/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 (

diff --git a/src/global.h b/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"

diff --git a/src/res/translation/translation_de_DE.ts b/src/res/translation/translation_de_DE.ts
diff --git a/src/res/translation/translation_es_ES.ts b/src/res/translation/translation_es_ES.ts
diff --git a/src/res/translation/translation_fr_FR.ts b/src/res/translation/translation_fr_FR.ts
diff --git a/src/res/translation/translation_it_IT.ts b/src/res/translation/translation_it_IT.ts
diff --git a/src/res/translation/translation_nl_NL.ts b/src/res/translation/translation_nl_NL.ts
diff --git a/src/res/translation/translation_pl_PL.ts b/src/res/translation/translation_pl_PL.ts
diff --git a/src/res/translation/translation_pt_BR.ts b/src/res/translation/translation_pt_BR.ts
diff --git a/src/res/translation/translation_pt_PT.ts b/src/res/translation/translation_pt_PT.ts
diff --git a/src/res/translation/translation_sk_SK.ts b/src/res/translation/translation_sk_SK.ts
diff --git a/src/res/translation/translation_sv_SE.ts b/src/res/translation/translation_sv_SE.ts
diff --git a/src/serverdlg.cpp b/src/serverdlg.cpp
@@ -242,10 +242,12 @@ lvwClients->setMinimumHeight ( 140 );
     // 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->setCurrentIndex ( static_cast<int> ( pServer->GetCentralServerAddressType() ) );
 

diff --git a/src/util.cpp b/src/util.cpp
@@ -1040,10 +1040,12 @@ QString NetworkUtil::GetCentralServerAddress ( const ECSAddType eCentralServerAd
     switch ( eCentralServerAddressType )
     {
     case AT_CUSTOM:               return strCentralServerAddress;
-    case AT_ALL_GENRES:           return CENTSERV_ALL_GENRES;
+    case AT_ANY_GENRE2:           return CENTSERV_ANY_GENRE2;
+    case AT_ANY_GENRE3:           return CENTSERV_ANY_GENRE3;
     case AT_GENRE_ROCK:           return CENTSERV_GENRE_ROCK;
     case AT_GENRE_JAZZ:           return CENTSERV_GENRE_JAZZ;
     case AT_GENRE_CLASSICAL_FOLK: return CENTSERV_GENRE_CLASSICAL_FOLK;
+    case AT_GENRE_CHORAL:         return CENTSERV_GENRE_CHORAL;
     default:                      return DEFAULT_SERVER_ADDRESS; // AT_DEFAULT
     }
 }

diff --git a/src/util.h b/src/util.h
@@ -607,11 +607,13 @@ enum ECSAddType
 {
     // used for settings -> enum values should be fixed
     AT_DEFAULT = 0,
-    AT_ALL_GENRES = 1,
-    AT_GENRE_ROCK = 2,
-    AT_GENRE_JAZZ = 3,
-    AT_GENRE_CLASSICAL_FOLK = 4,
-    AT_CUSTOM = 5 // Must be the last entry!
+    AT_ANY_GENRE2 = 1,
+    AT_ANY_GENRE3 = 2,
+    AT_GENRE_ROCK = 3,
+    AT_GENRE_JAZZ = 4,
+    AT_GENRE_CLASSICAL_FOLK = 5,
+    AT_GENRE_CHORAL = 6,
+    AT_CUSTOM = 7 // Must be the last entry!
 };
 
 inline QString csCentServAddrTypeToString ( ECSAddType eAddrType )
@@ -621,8 +623,11 @@ inline QString csCentServAddrTypeToString ( ECSAddType eAddrType )
     case AT_CUSTOM:
         return QCoreApplication::translate ( "CClientSettingsDlg", "Custom" );
 
-    case AT_ALL_GENRES:
-        return QCoreApplication::translate ( "CClientSettingsDlg", "All Genres" );
+    case AT_ANY_GENRE2:
+        return QCoreApplication::translate ( "CClientSettingsDlg", "Any Genre 2" );
+
+    case AT_ANY_GENRE3:
+        return QCoreApplication::translate ( "CClientSettingsDlg", "Any Genre 3" );
 
     case AT_GENRE_ROCK:
         return QCoreApplication::translate ( "CClientSettingsDlg", "Genre Rock" );
@@ -631,10 +636,13 @@ inline QString csCentServAddrTypeToString ( ECSAddType eAddrType )
         return QCoreApplication::translate ( "CClientSettingsDlg", "Genre Jazz" );
 
     case AT_GENRE_CLASSICAL_FOLK:
-        return QCoreApplication::translate ( "CClientSettingsDlg", "Genre Classical/Folk/Choral" );
+        return QCoreApplication::translate ( "CClientSettingsDlg", "Genre Classical/Folk" );
+
+    case AT_GENRE_CHORAL:
+        return QCoreApplication::translate ( "CClientSettingsDlg", "Genre Choral/Barbershop" );
 
     default: // AT_DEFAULT
-        return QCoreApplication::translate ( "CClientSettingsDlg", "Default" );
+        return QCoreApplication::translate ( "CClientSettingsDlg", "Any Genre 1" );
     }
 }