Author: holindho
Date: 2008-03-07 04:32:10 -0700 (Fri, 07 Mar 2008)
New Revision: 6542
Modified:
Extractor/src/plugins/qtextractor.c
Log:
extract iTunes track and disc numbers
Modified: Extractor/src/plugins/qtextractor.c
===================================================================
--- Extractor/src/plugins/qtextractor.c 2008-03-07 11:31:09 UTC (rev 6541)
+++ Extractor/src/plugins/qtextractor.c 2008-03-07 11:32:10 UTC (rev 6542)
@@ -874,13 +874,23 @@
if (flags == 0x0) { /* binary data */
if (memcmp(&patom[4], "gnre", 4) == 0) {
if (len >= 2) {
- short genre = ((unsigned char)input[pos+16] << 8) |
- (unsigned char)input[pos+17];
+ unsigned short genre = ((unsigned char)input[pos+16] << 8) |
+ (unsigned char)input[pos+17];
if (genre > 0 && genre < GENRE_NAME_COUNT)
- addKeyword(EXTRACTOR_GENRE, genre_names[genre-1], list);
+ addKeyword(type, genre_names[genre-1], list);
}
return 1;
}
+ else if ((memcmp(&patom[4], "trkn", 4) == 0) ||
+ (memcmp(&patom[4], "disk", 4) == 0)) {
+ if (len >= 4) {
+ unsigned short n = ((unsigned char)input[pos+18] << 8) |
+ (unsigned char)input[pos+19];
+ char s[8];
+ snprintf(s, 8, "%d", n);
+ addKeyword(type, s, list);
+ }
+ }
else {
return -1;
}
@@ -915,6 +925,8 @@
{"\xa9" "cmt", EXTRACTOR_COMMENT,},
{"\xa9" "day", EXTRACTOR_YEAR,},
{"\xa9" "nam", EXTRACTOR_TITLE,},
+ {"trkn", EXTRACTOR_TRACK_NUMBER,},
+ {"disk", EXTRACTOR_DISC_NUMBER,},
{"\xa9" "gen", EXTRACTOR_GENRE,},
{"gnre", EXTRACTOR_GENRE,},
{"\xa9" "wrt", EXTRACTOR_AUTHOR,},
_______________________________________________
GNUnet-SVN mailing list
GNUnet-SVN@gnu.org
http://lists.gnu.org/mailman/listinfo/gnunet-svn
