changeset 1393:f8e301246b1b trunk

[svn] - make cdaudio access cddb via protocol level 6 for utf-8 reply.
author yaz
date Tue, 11 Jul 2006 16:49:16 -0700
parents db56f6752bd1
children 65490480559e
files ChangeLog Plugins/Input/cdaudio/cddb.c Plugins/Input/cdaudio/cddb.h
diffstat 3 files changed, 35 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Jul 10 17:37:19 2006 -0700
+++ b/ChangeLog	Tue Jul 11 16:49:16 2006 -0700
@@ -1,3 +1,11 @@
+2006-07-11 00:37:19 +0000  Giacomo Lozito <james@develia.org>
+  revision [1698]
+  amidi-plug alsa: check if a sequencer actually exists before requesting sequencer port list
+
+  Changes:        Modified:
+  +4 -1           trunk/Plugins/Input/amidi-plug/backend-alsa/b-alsa.c  
+
+
 2006-07-10 21:09:15 +0000  William Pitcock <nenolod@nenolod.net>
   revision [1696]
   - update NEWS
--- a/Plugins/Input/cdaudio/cddb.c	Mon Jul 10 17:37:19 2006 -0700
+++ b/Plugins/Input/cdaudio/cddb.c	Tue Jul 11 16:49:16 2006 -0700
@@ -362,6 +362,16 @@
             }
             command++;
         case 3:
+            if (!strncmp(buffer, "DYEAR", 5)) {
+                break;
+            }
+            command++;
+        case 4:
+            if (!strncmp(buffer, "DGENRE", 6)) {
+                break;
+            }
+            command++;
+        case 5:
             if (!strncmp(buffer, "TTITLE", 6)) {
                 num = atoi(buffer + 6);
                 if (oldnum < 0 || num == oldnum) {
@@ -384,17 +394,17 @@
             bufs = 0;
             oldnum = -1;
             command++;
-        case 4:
+        case 6:
             if (!strncmp(buffer, "EXTD", 4)) {
                 break;
             }
             command++;
-        case 5:
+        case 7:
             if (!strncmp(buffer, "EXTT", 4)) {
                 break;
             }
             command++;
-        case 6:
+        case 8:
             if (!strncmp(buffer, "PLAYORDER", 9)) {
                 break;
             }
@@ -584,6 +594,16 @@
             }
             command++;
         case 3:
+            if (!strncmp(buffer, "DYEAR", 5)) {
+                break;
+            }
+            command++;
+        case 4:
+            if (!strncmp(buffer, "DGENRE", 6)) {
+                break;
+            }
+            command++;
+        case 5:
             if (!strncmp(buffer, "TTITLE", 6)) {
                 num = atoi(buffer + 6);
                 if (oldnum < 0 || num == oldnum) {
@@ -606,17 +626,17 @@
             bufs = 0;
             oldnum = -1;
             command++;
-        case 4:
+        case 6:
             if (!strncmp(buffer, "EXTD", 4)) {
                 break;
             }
             command++;
-        case 5:
+        case 7:
             if (!strncmp(buffer, "EXTT", 4)) {
                 break;
             }
             command++;
-        case 6:
+        case 8:
             if (!strncmp(buffer, "PLAYORDER", 9)) {
                 break;
             }
--- a/Plugins/Input/cdaudio/cddb.h	Mon Jul 10 17:37:19 2006 -0700
+++ b/Plugins/Input/cdaudio/cddb.h	Tue Jul 11 16:49:16 2006 -0700
@@ -28,7 +28,7 @@
     guint32 discid;
 } cddb_disc_header_t;
 
-#define CDDB_MAX_PROTOCOL_LEVEL 3
+#define CDDB_MAX_PROTOCOL_LEVEL 6
 #define CDDB_HOSTNAME_LEN 100
 #define CDDB_LOG_MAX 100