Author: grothoff Date: 2008-03-06 23:12:04 -0700 (Thu, 06 Mar 2008) New Revision: 6540
Modified: Extractor/ChangeLog Extractor/src/include/extractor.h Extractor/src/main/extractor.c Extractor/src/plugins/flacextractor.c Extractor/src/plugins/mp3extractor.c Log: flacstuff Modified: Extractor/ChangeLog =================================================================== --- Extractor/ChangeLog 2008-03-07 01:55:50 UTC (rev 6539) +++ Extractor/ChangeLog 2008-03-07 06:12:04 UTC (rev 6540) @@ -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. Modified: Extractor/src/include/extractor.h =================================================================== --- Extractor/src/include/extractor.h 2008-03-07 01:55:50 UTC (rev 6539) +++ Extractor/src/include/extractor.h 2008-03-07 06:12:04 UTC (rev 6540) @@ -184,7 +184,9 @@ 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; /** Modified: Extractor/src/main/extractor.c =================================================================== --- Extractor/src/main/extractor.c 2008-03-07 01:55:50 UTC (rev 6539) +++ Extractor/src/main/extractor.c 2008-03-07 06:12:04 UTC (rev 6540) @@ -172,12 +172,14 @@ 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 Modified: Extractor/src/plugins/flacextractor.c =================================================================== --- Extractor/src/plugins/flacextractor.c 2008-03-07 01:55:50 UTC (rev 6539) +++ Extractor/src/plugins/flacextractor.c 2008-03-07 06:12:04 UTC (rev 6540) @@ -135,11 +135,9 @@ {"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}, }; Modified: Extractor/src/plugins/mp3extractor.c =================================================================== --- Extractor/src/plugins/mp3extractor.c 2008-03-07 01:55:50 UTC (rev 6539) +++ Extractor/src/plugins/mp3extractor.c 2008-03-07 06:12:04 UTC (rev 6540) @@ -209,13 +209,13 @@ 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}, _______________________________________________ GNUnet-SVN mailing list GNUnet-SVN@gnu.org http://lists.gnu.org/mailman/listinfo/gnunet-svn