Changeset 75 for branches

Timestamp:

Sep 30, 2023, 11:16:00 PM (23 months ago)

Author:

erdmann

Message:

pick up changes from trunk

Location:

branches/v2.9_Lars

Files:

• . (modified) (1 prop)
• classes/c/c_audio/cwmp3.c (modified) (3 diffs)
• mediafolder/c/cddb/pmcddb.cc (modified) (2 diffs)

branches/v2.9_Lars/classes/c/c_audio/cwmp3.c

@@ -64 +64 @@
 extern char classDLLPath[CCHMAXPATH];
 
-int iGenreLast=147;
+int iGenreLast=191;
 char *genreList[]={
         "Blues", "Classic Rock", "Country", "Dance", "Disco", "Funk",
@@ -91 +91 @@
         "Christian Gangsta", "Heavy Metal", "Black Metal", "Crossover", "Contemporary C",
         "Christian Rock", "Merengue", "Salsa", "Thrash Metal", "Anime", "JPop",
-        "SynthPop",
+        "SynthPop", "Christmas", "Art rock", "Baroque", "Bhangra", "Big beat", "Breakbeat",
+        "Chillout", "Downtempo", "Dub", "EBM", "Eclectic", "Electro", "Electroclash", "Emo",
+        "Experimental", "Garage", "Global", "IDM", "Illbient", "Industro-Goth", "Jam Band",
+        "Krautrock", "Leftfield", "Lounge", "Math rock", "New romantic", "Nu-breakz", "Post-punk",
+        "Post-rock", "Psytrance", "Shoegaze", "Space rock", "Trop rock", "World music", "Neoclassical",
+        "Audiobook", "Audio theatre", "Neue Deutsche Welle", "Podcast", "Indie-rock", "G-Funk",
+        "Dubstep", "Garage rock", "Psybient"
 };
 
@@ -411 +417 @@
   //We have a major tab so we need a name
   if(!getMessage(pageName, ID_ID3TAGSPAGENAME, sizeof(pageName),  queryResModuleHandle(), hwndNotebook))
-    strcpy(pageName, "~ID3 Tags");
+    strcpy(pageName, "~ID3 tag");
   pageinfo.pszName = pageName;
   //Insert the page into the settings notebook

branches/v2.9_Lars/mediafolder/c/cddb/pmcddb.cc

@@ -110 +110 @@
 #define QUERYCDDB_VERSION "0.1"
 
-int port=888;
-char host[1000]="uk.freedb.org";
+int port=8880;
+char host[1000]="gnudb.gnudb.org";
 char username[1000]={0};
 char hostname[1000]={0};
@@ -211 +211 @@
 
     if(NUMSERVERS==0) {
-      strncpy(cddbServer[0],"de.freedb.org:888",sizeof(cddbServer[0]));
-      strncpy(cddbServer[1],"at.freedb.org:888",sizeof(cddbServer[0]));
-      strncpy(cddbServer[2],"ca.freedb.org:888",sizeof(cddbServer[0]));
-      strncpy(cddbServer[3],"uk.freedb.org:888",sizeof(cddbServer[0]));
-      strncpy(cddbServer[4],"freedb.freedb.org:888",sizeof(cddbServer[0]));
-      strncpy(cddbServer[5],"cz.freedb.org:888",sizeof(cddbServer[0]));
-      NUMSERVERS=6;
+      strncpy(cddbServer[0],"gnudb.gnudb.org:8880",sizeof(cddbServer[0]));
+      NUMSERVERS=1;
     }
     else {