[Easytag-mailing] EasyTAG 1.99.5 - patch to add disc number in scanner

[Jérôme COUDERC <easytag gmail com>]

Hi,

   I've noted that I forgot to add a code for the disc number in the 
scanner... If you are interested by this feature, you can apply the 
attached patch.

Regards,
Jerome

--
EasyTAG - Tag editor for MP3 and Ogg Vorbis files
http://easytag.sourceforge.net
--
Jerome COUDERC <easytag gmail com>

diff -ruN easytag-1.99.5/src/scan.c easytag-1.99.5-fixed/src/scan.c
--- easytag-1.99.5/src/scan.c	2005-06-06 00:11:17.000000000 +0200
+++ easytag-1.99.5-fixed/src/scan.c	2005-06-09 23:08:15.000000000 +0200
@@ -1594,6 +1604,8 @@
             return &FileTag->artist;
         case 'b':    /* Album */
             return &FileTag->album;
+        case 'd':    /* Disc Number */
+            return &FileTag->disc_number;
         case 'y':    /* Year */
             return &FileTag->year;
         case 'n':    /* Track */
@@ -2124,33 +2136,36 @@
     Label = gtk_label_new(_("%r : copyright"));
     gtk_table_attach_defaults(GTK_TABLE(Table),Label,0,1,4,5);
     gtk_misc_set_alignment(GTK_MISC(Label),0,0.5);
-    Label = gtk_label_new(_("%e : encoded by"));
+    Label = gtk_label_new(_("%d : disc number"));
     gtk_table_attach_defaults(GTK_TABLE(Table),Label,1,2,0,1);
     gtk_misc_set_alignment(GTK_MISC(Label),0,0.5);
-    Label = gtk_label_new(_("%g : genre"));
+    Label = gtk_label_new(_("%e : encoded by"));
     gtk_table_attach_defaults(GTK_TABLE(Table),Label,1,2,1,2);
     gtk_misc_set_alignment(GTK_MISC(Label),0,0.5);
-    Label = gtk_label_new(_("%i : ignored"));
+    Label = gtk_label_new(_("%g : genre"));
     gtk_table_attach_defaults(GTK_TABLE(Table),Label,1,2,2,3);
     gtk_misc_set_alignment(GTK_MISC(Label),0,0.5);
-    Label = gtk_label_new(_("%l : number of tracks"));
+    Label = gtk_label_new(_("%i : ignored"));
     gtk_table_attach_defaults(GTK_TABLE(Table),Label,1,2,3,4);
     gtk_misc_set_alignment(GTK_MISC(Label),0,0.5);
-    Label = gtk_label_new(_("%o : orig. artist"));
+    Label = gtk_label_new(_("%l : number of tracks"));
     gtk_table_attach_defaults(GTK_TABLE(Table),Label,1,2,4,5);
     gtk_misc_set_alignment(GTK_MISC(Label),0,0.5);
-    Label = gtk_label_new(_("%n : track"));
+    Label = gtk_label_new(_("%o : orig. artist"));
     gtk_table_attach_defaults(GTK_TABLE(Table),Label,2,3,0,1);
     gtk_misc_set_alignment(GTK_MISC(Label),0,0.5);
-    Label = gtk_label_new(_("%t : title"));
+    Label = gtk_label_new(_("%n : track"));
     gtk_table_attach_defaults(GTK_TABLE(Table),Label,2,3,1,2);
     gtk_misc_set_alignment(GTK_MISC(Label),0,0.5);
-    Label = gtk_label_new(_("%u : URL"));
+    Label = gtk_label_new(_("%t : title"));
     gtk_table_attach_defaults(GTK_TABLE(Table),Label,2,3,2,3);
     gtk_misc_set_alignment(GTK_MISC(Label),0,0.5);
-    Label = gtk_label_new(_("%y : year"));
+    Label = gtk_label_new(_("%u : URL"));
     gtk_table_attach_defaults(GTK_TABLE(Table),Label,2,3,3,4);
     gtk_misc_set_alignment(GTK_MISC(Label),0,0.5);
+    Label = gtk_label_new(_("%y : year"));
+    gtk_table_attach_defaults(GTK_TABLE(Table),Label,2,3,4,5);
+    gtk_misc_set_alignment(GTK_MISC(Label),0,0.5);
 
     /*
      * Masks Editor
@@ -2427,9 +2442,9 @@
                 goto Good_Mask;
         }
         if ( strlen(tmp)>1
-        && (tmp[1]=='a' || tmp[1]=='b' || tmp[1]=='c' || tmp[1]=='p' || tmp[1]=='r' ||
-            tmp[1]=='e' || tmp[1]=='g' || tmp[1]=='i' || tmp[1]=='l' || tmp[1]=='o' ||
-            tmp[1]=='n' || tmp[1]=='t' || tmp[1]=='u' || tmp[1]=='y' ) )
+        && (tmp[1]=='a' || tmp[1]=='b' || tmp[1]=='c' || tmp[1]=='d' || tmp[1]=='p' ||
+            tmp[1]=='r' || tmp[1]=='e' || tmp[1]=='g' || tmp[1]=='i' || tmp[1]=='l' ||
+            tmp[1]=='o' || tmp[1]=='n' || tmp[1]=='t' || tmp[1]=='u' || tmp[1]=='y' ) )
         {
             /* Code is correct */
             *(mask+strlen(mask)-strlen(tmp)) = '\0';
@@ -2444,9 +2459,9 @@
             goto Good_Mask;
 
         if ( strlen(tmp)>2
-        && (tmp[1]=='a' || tmp[1]=='b' || tmp[1]=='c' || tmp[1]=='p' || tmp[1]=='r' ||
-            tmp[1]=='e' || tmp[1]=='g' || tmp[1]=='i' || tmp[1]=='l' || tmp[1]=='o' ||
-            tmp[1]=='n' || tmp[1]=='t' || tmp[1]=='u' || tmp[1]=='y' ) )
+        && (tmp[1]=='a' || tmp[1]=='b' || tmp[1]=='c' || tmp[1]=='d' || tmp[1]=='p' ||
+            tmp[1]=='r' || tmp[1]=='e' || tmp[1]=='g' || tmp[1]=='i' || tmp[1]=='l' ||
+            tmp[1]=='o' || tmp[1]=='n' || tmp[1]=='t' || tmp[1]=='u' || tmp[1]=='y' ) )
         {
             /* There is a separator and code is correct */
             *(mask+strlen(mask)-strlen(tmp)) = '\0';
@@ -2501,9 +2516,9 @@
             goto Good_Mask;
         }
         if ( strlen(tmp)>1
-        && (tmp[1]=='a' || tmp[1]=='b' || tmp[1]=='c' || tmp[1]=='p' || tmp[1]=='r' ||
-            tmp[1]=='e' || tmp[1]=='g' || tmp[1]=='i' || tmp[1]=='l' || tmp[1]=='o' ||
-            tmp[1]=='n' || tmp[1]=='t' || tmp[1]=='u' || tmp[1]=='y' ) )
+        && (tmp[1]=='a' || tmp[1]=='b' || tmp[1]=='c' || tmp[1]=='d' || tmp[1]=='p' ||
+            tmp[1]=='r' || tmp[1]=='e' || tmp[1]=='g' || tmp[1]=='i' || tmp[1]=='l' ||
+            tmp[1]=='o' || tmp[1]=='n' || tmp[1]=='t' || tmp[1]=='u' || tmp[1]=='y' ) )
         {
             /* The code is valid. */
             /* No separator is accepted. */