Introduce Asian directory server

For geo redundancy, latency and since Any Genre 3 is not heavily used,
we introduce a directory in Asia. See
#3692

Author: ann0see

src/connectdlg.cpp

@@ -1128,7 +1128,7 @@ void CConnectDlg::UpdateDirectoryComboBox()
     cbxDirectory->clear();
     cbxDirectory->addItem ( DirectoryTypeToString ( AT_DEFAULT ) );
     cbxDirectory->addItem ( DirectoryTypeToString ( AT_ANY_GENRE2 ) );
-    cbxDirectory->addItem ( DirectoryTypeToString ( AT_ANY_GENRE3 ) );
+    cbxDirectory->addItem ( DirectoryTypeToString ( AT_ANY_GENRE_ASIA ) );
     cbxDirectory->addItem ( DirectoryTypeToString ( AT_GENRE_ROCK ) );
     cbxDirectory->addItem ( DirectoryTypeToString ( AT_GENRE_JAZZ ) );
     cbxDirectory->addItem ( DirectoryTypeToString ( AT_GENRE_CLASSICAL_FOLK ) );

src/global.h

@@ -114,7 +114,7 @@ LED bar:      lbr
 #define DEFAULT_SERVER_ADDRESS        "anygenre1.jamulus.io:22124" // default port explicit to avoid unneeded SRV lookup
 #define DEFAULT_PORT_NUMBER           22124
 #define CENTSERV_ANY_GENRE2           "anygenre2.jamulus.io:22224"
-#define CENTSERV_ANY_GENRE3           "anygenre3.jamulus.io:22624"
+#define CENTSERV_ANY_GENRE_ASIA       "asia.jamulus.io:22624"
 #define CENTSERV_GENRE_ROCK           "rock.jamulus.io:22424"
 #define CENTSERV_GENRE_JAZZ           "jazz.jamulus.io:22324"
 #define CENTSERV_GENRE_CLASSICAL_FOLK "classical.jamulus.io:22524"

src/serverdlg.cpp

@@ -317,7 +317,7 @@ CServerDlg::CServerDlg ( CServer* pNServP, CServerSettings* pNSetP, const bool b
     cbxDirectoryType->addItem ( DirectoryTypeToString ( AT_NONE ) );
     cbxDirectoryType->addItem ( DirectoryTypeToString ( AT_DEFAULT ) );
     cbxDirectoryType->addItem ( DirectoryTypeToString ( AT_ANY_GENRE2 ) );
-    cbxDirectoryType->addItem ( DirectoryTypeToString ( AT_ANY_GENRE3 ) );
+    cbxDirectoryType->addItem ( DirectoryTypeToString ( AT_ANY_GENRE_ASIA ) );
     cbxDirectoryType->addItem ( DirectoryTypeToString ( AT_GENRE_ROCK ) );
     cbxDirectoryType->addItem ( DirectoryTypeToString ( AT_GENRE_JAZZ ) );
     cbxDirectoryType->addItem ( DirectoryTypeToString ( AT_GENRE_CLASSICAL_FOLK ) );

src/serverrpc.cpp

@@ -303,7 +303,7 @@ const std::unordered_map<EDirectoryType, std::string>
         { EDirectoryType::AT_NONE, "none" },
         { EDirectoryType::AT_DEFAULT, "any_genre_1" },
         { EDirectoryType::AT_ANY_GENRE2, "any_genre_2" },
-        { EDirectoryType::AT_ANY_GENRE3, "any_genre_3" },
+        { EDirectoryType::AT_ANY_GENRE_ASIA, "any_genre_asia" },
         { EDirectoryType::AT_GENRE_ROCK, "genre_rock" },
         { EDirectoryType::AT_GENRE_JAZZ, "genre_jazz" },
         { EDirectoryType::AT_GENRE_CLASSICAL_FOLK, "genre_classical_folk" },
@@ -324,7 +324,7 @@ const std::unordered_map<std::string, EDirectoryType> CServerRpc::sumStringToDir
     { "none", EDirectoryType::AT_NONE },
     { "any_genre_1", EDirectoryType::AT_DEFAULT },
     { "any_genre_2", EDirectoryType::AT_ANY_GENRE2 },
-    { "any_genre_3", EDirectoryType::AT_ANY_GENRE3 },
+    { "any_genre_asia", EDirectoryType::AT_ANY_GENRE_ASIA },
     { "genre_rock", EDirectoryType::AT_GENRE_ROCK },
     { "genre_jazz", EDirectoryType::AT_GENRE_JAZZ },
     { "genre_classical_folk", EDirectoryType::AT_GENRE_CLASSICAL_FOLK },

src/util.cpp

@@ -1003,8 +1003,8 @@ QString NetworkUtil::GetDirectoryAddress ( const EDirectoryType eDirectoryType,
         return strDirectoryAddress;
     case AT_ANY_GENRE2:
         return CENTSERV_ANY_GENRE2;
-    case AT_ANY_GENRE3:
-        return CENTSERV_ANY_GENRE3;
+    case AT_ANY_GENRE_ASIA:
+        return CENTSERV_ANY_GENRE_ASIA;
     case AT_GENRE_ROCK:
         return CENTSERV_GENRE_ROCK;
     case AT_GENRE_JAZZ:

src/util.h

@@ -604,7 +604,7 @@ enum EDirectoryType
     AT_NONE                 = -1, // means not registered, "invalid value"
     AT_DEFAULT              = 0,
     AT_ANY_GENRE2           = 1,
-    AT_ANY_GENRE3           = 2,
+    AT_ANY_GENRE_ASIA       = 2,
     AT_GENRE_ROCK           = 3,
     AT_GENRE_JAZZ           = 4,
     AT_GENRE_CLASSICAL_FOLK = 5,
@@ -622,8 +622,8 @@ inline QString DirectoryTypeToString ( EDirectoryType eAddrType )
     case AT_ANY_GENRE2:
         return QCoreApplication::translate ( "CClientSettingsDlg", "Any Genre 2" );
 
-    case AT_ANY_GENRE3:
-        return QCoreApplication::translate ( "CClientSettingsDlg", "Any Genre 3" );
+    case AT_ANY_GENRE_ASIA:
+        return QCoreApplication::translate ( "CClientSettingsDlg", "Any Genre Asia" );
 
     case AT_GENRE_ROCK:
         return QCoreApplication::translate ( "CClientSettingsDlg", "Genre Rock" );