libextractor

commit 960f1c73f718322c1a586e1ab7d33c35cc8f04a7
parent 5c1ff811af288aaced328b38b19eae38a12082f8
Author: Christian Grothoff <christian@grothoff.org>
Date:   Fri,  7 Mar 2008 06:12:04 +0000

flacstuff

Diffstat:
M
ChangeLog
 | 
3
+++
M
src/include/extractor.h
 | 
4
+++-
M
src/main/extractor.c
 | 
6
++++--
M
src/plugins/flacextractor.c
 | 
8
+++-----
M
src/plugins/mp3extractor.c
 | 
14
+++++++-------

5 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+Thu Mar  6 23:11:39 MST 2008
+	Added track number and ISRC for FLAC files.
+
 Wed Feb 13 10:16:55 EET 2008
 	Added a plugin for AppleSingle/AppleDouble files.
 
diff --git a/src/include/extractor.h b/src/include/extractor.h
@@ -184,7 +184,9 @@ typedef enum {
   EXTRACTOR_STARTING_SONG = 128,
   EXTRACTOR_HARDWARE_DEPENDENCY = 129,
   EXTRACTOR_RIPPER = 130,
-  EXTRACTOR_FILE_SIZE = 131
+  EXTRACTOR_FILE_SIZE = 131,
+  EXTRACTOR_TRACK_NUMBER = 132,
+  EXTRACTOR_ISRC = 133,
 } EXTRACTOR_KeywordType;
 
 /**
diff --git a/src/main/extractor.c b/src/main/extractor.c
@@ -172,12 +172,14 @@ static const char *keywordTypes[] = {
   gettext_noop("starting song"),
   gettext_noop("hardware dependency"),
   gettext_noop("ripper"), /* 130 */
-  gettext_noop("filesize") /* 131 */,
+  gettext_noop("filesize"),
+  gettext_noop("track number"),
+  gettext_noop("international standard recording code"), /* 133 */
   NULL,
 };
 
 /* the number of keyword types (for bounds-checking) */
-#define HIGHEST_TYPE_NUMBER 132
+#define HIGHEST_TYPE_NUMBER 134
 
 #ifdef HAVE_LIBOGG
 #if HAVE_VORBIS
diff --git a/src/plugins/flacextractor.c b/src/plugins/flacextractor.c
@@ -135,11 +135,9 @@ static Matches tmap[] = {
   {"GENRE", EXTRACTOR_GENRE},
   {"DATE", EXTRACTOR_DATE},
   {"LOCATION", EXTRACTOR_LOCATION},
-  {"CONTACT", EXTRACTOR_CONTACT},
-  /*
-    {"ISRC", EXTRACTOR_...},
-    {"TRACKNUMBER", EXTRACTOR_...},
-  */
+  {"CONTACT", EXTRACTOR_CONTACT}, 
+  {"TRACKNUMBER", EXTRACTOR_TRACK_NUMBER},
+  {"ISRC", EXTRACTOR_ISRC},
   {NULL, 0},
 };
 
diff --git a/src/plugins/mp3extractor.c b/src/plugins/mp3extractor.c
@@ -209,13 +209,13 @@ enum
 enum
 { LAYER_ERR = 0, LAYER_1 = 1, LAYER_2 = 2, LAYER_3 = 3 };
 
-const unsigned int sync_mask = 0xE0FF;
-const unsigned int mpeg_ver_mask = 0x1800;
-const unsigned int mpeg_layer_mask = 0x600;
-const unsigned int bitrate_mask = 0xF00000;
-const unsigned int freq_mask = 0xC0000;
-const unsigned int ch_mask = 0xC0000000;
-const unsigned int pad_mask = 0x20000;
+#define sync_mask ((unsigned int) 0xE0FF)
+#define mpeg_ver_mask ((unsigned int) 0x1800)
+#define mpeg_layer_mask  ((unsigned int)0x600)
+#define bitrate_mask  ((unsigned int)0xF00000)
+#define freq_mask  ((unsigned int)0xC0000)
+#define ch_mask  ((unsigned int)0xC0000000)
+#define pad_mask  ((unsigned int)0x20000)
 
 unsigned int bitrate_table[16][6] = {
   {0, 0, 0, 0, 0, 0},