Author: grothoff
Date: 2008-03-07 21:47:01 -0700 (Fri, 07 Mar 2008)
New Revision: 6546
Modified:
Extractor/ChangeLog
Extractor/src/plugins/flacextractor.c
Extractor/src/plugins/id3v23extractor.c
Extractor/src/plugins/id3v24extractor.c
Extractor/src/plugins/id3v2extractor.c
Extractor/src/plugins/mp3extractor.c
Log:
update
Modified: Extractor/ChangeLog
===================================================================
--- Extractor/ChangeLog 2008-03-08 01:38:18 UTC (rev 6545)
+++ Extractor/ChangeLog 2008-03-08 04:47:01 UTC (rev 6546)
@@ -2,7 +2,7 @@
Added disc number.
Thu Mar 6 23:11:39 MST 2008
- Added track number and ISRC for FLAC files.
+ Added track number and ISRC for FLAC/mp3/ogg files.
Wed Feb 13 10:16:55 EET 2008
Added a plugin for AppleSingle/AppleDouble files.
Modified: Extractor/src/plugins/flacextractor.c
===================================================================
--- Extractor/src/plugins/flacextractor.c 2008-03-08 01:38:18 UTC (rev
6545)
+++ Extractor/src/plugins/flacextractor.c 2008-03-08 04:47:01 UTC (rev
6546)
@@ -247,8 +247,10 @@
static void
flac_error(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus
status, void *client_data)
{
+#if 0
fprintf(stderr,
"Got error: %u\n", status);
+#endif
}
/* mimetype = audio/flac */
Modified: Extractor/src/plugins/id3v23extractor.c
===================================================================
--- Extractor/src/plugins/id3v23extractor.c 2008-03-08 01:38:18 UTC (rev
6545)
+++ Extractor/src/plugins/id3v23extractor.c 2008-03-08 04:47:01 UTC (rev
6546)
@@ -81,6 +81,8 @@
{"TOFN", EXTRACTOR_FILENAME},
{"TOPE", EXTRACTOR_ARTIST},
{"TPUB", EXTRACTOR_PUBLISHER},
+ {"TRCK", EXTRACTOR_TRACK_NUMBER},
+ {"TRSC", EXTRACTOR_ISRC},
{"TRSN", EXTRACTOR_SOURCE},
{"TRSO", EXTRACTOR_CREATED_FOR},
{"TSRC", EXTRACTOR_RESOURCE_IDENTIFIER},
Modified: Extractor/src/plugins/id3v24extractor.c
===================================================================
--- Extractor/src/plugins/id3v24extractor.c 2008-03-08 01:38:18 UTC (rev
6545)
+++ Extractor/src/plugins/id3v24extractor.c 2008-03-08 04:47:01 UTC (rev
6546)
@@ -84,6 +84,8 @@
{"TOFN", EXTRACTOR_FILENAME},
{"TOPE", EXTRACTOR_ARTIST},
{"TPUB", EXTRACTOR_PUBLISHER},
+ {"TRCK", EXTRACTOR_TRACK_NUMBER},
+ {"TRSC", EXTRACTOR_ISRC},
{"TRSN", EXTRACTOR_SOURCE},
{"TRSO", EXTRACTOR_CREATED_FOR},
{"TSRC", EXTRACTOR_RESOURCE_IDENTIFIER},
Modified: Extractor/src/plugins/id3v2extractor.c
===================================================================
--- Extractor/src/plugins/id3v2extractor.c 2008-03-08 01:38:18 UTC (rev
6545)
+++ Extractor/src/plugins/id3v2extractor.c 2008-03-08 04:47:01 UTC (rev
6546)
@@ -75,7 +75,8 @@
{"TCR", EXTRACTOR_COPYRIGHT},
{"SLT", EXTRACTOR_LYRICS},
{"TOA", EXTRACTOR_ARTIST},
- {"TRC", EXTRACTOR_RESOURCE_IDENTIFIER},
+ {"TRC", EXTRACTOR_ISRC},
+ {"TRK", EXTRACTOR_TRACK_NUMBER},
{"TCM", EXTRACTOR_CREATOR},
{"TOT", EXTRACTOR_ALBUM},
{"TOL", EXTRACTOR_AUTHOR},
Modified: Extractor/src/plugins/mp3extractor.c
===================================================================
--- Extractor/src/plugins/mp3extractor.c 2008-03-08 01:38:18 UTC (rev
6545)
+++ Extractor/src/plugins/mp3extractor.c 2008-03-08 04:47:01 UTC (rev
6546)
@@ -44,6 +44,7 @@
char *year;
char *comment;
const char *genre;
+ unsigned int track_number;
} id3tag;
static const char *const genre_names[] = {
@@ -280,6 +281,16 @@
pos += 4;
id3->comment = convertToUtf8 (pos, 30, "ISO-8859-1");
trim (id3->comment);
+ if ( (pos[28] == '\0') &&
+ (pos[29] != '\0') )
+ {
+ /* ID3v1.1 */
+ id3->track_number = pos[29];
+ }
+ else
+ {
+ id3->track_number = 0;
+ }
pos += 30;
id3->genre = "";
if (pos[0] < GENRE_NAME_COUNT)
@@ -446,6 +457,7 @@
{
id3tag info;
char *word;
+ char track[16];
if (0 != get_id3 (data, size, &info))
return klist;
@@ -462,14 +474,18 @@
klist = addkword (klist, info.genre, EXTRACTOR_GENRE);
if (strlen (info.comment) > 0)
klist = addkword (klist, info.comment, EXTRACTOR_COMMENT);
+ if (info.track_number != 0)
+ {
+ snprintf(track, 15, "%u", info.track_number);
+ klist = addkword (klist, track, EXTRACTOR_TRACK_NUMBER);
+ }
-
/* A keyword that has all of the information together) */
- word =
- (char *) malloc (strlen (info.artist) + strlen (info.title) +
- strlen (info.album) + 6);
+ word = malloc (strlen (info.artist) + strlen (info.title) +
+ strlen (info.album) + 6);
sprintf (word, "%s: %s (%s)", info.artist, info.title, info.album);
klist = addkword (klist, word, EXTRACTOR_DESCRIPTION);
+
free (word);
free (info.title);
free (info.year);
_______________________________________________
GNUnet-SVN mailing list
GNUnet-SVN@gnu.org
http://lists.gnu.org/mailman/listinfo/gnunet-svn
