Revision: 2122
          http://gtkpod.svn.sourceforge.net/gtkpod/?rev=2122&view=rev
Author:   jcsjcs
Date:     2008-09-22 02:25:44 +0000 (Mon, 22 Sep 2008)

Log Message:
-----------
        * src/mp3file.c (id3_set_string): don't write genre IDs instead of
          genre string. The use of ID numbers seems antiquated.

Modified Paths:
--------------
    gtkpod/trunk/ChangeLog
    gtkpod/trunk/src/mp3file.c

Modified: gtkpod/trunk/ChangeLog
===================================================================
--- gtkpod/trunk/ChangeLog      2008-09-21 10:13:35 UTC (rev 2121)
+++ gtkpod/trunk/ChangeLog      2008-09-22 02:25:44 UTC (rev 2122)
@@ -1,5 +1,10 @@
 2008-09-21 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
+       * src/mp3file.c (id3_set_string): don't write genre IDs instead of
+         genre string. The use of ID numbers seems antiquated.
+
+2008-09-21 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
        * src/mp3file.c (id3_tag_read): (partially) implement genre IDs in
          parenthesis according to
          
http://www.id3.org/id3v2.3.0#head-42b02d20fb8bf48e38ec5415e34909945dd849dc

Modified: gtkpod/trunk/src/mp3file.c
===================================================================
--- gtkpod/trunk/src/mp3file.c  2008-09-21 10:13:35 UTC (rev 2121)
+++ gtkpod/trunk/src/mp3file.c  2008-09-22 02:25:44 UTC (rev 2122)
@@ -1,4 +1,4 @@
-/* Time-stamp: <2008-09-21 19:11:23 jcs>
+/* Time-stamp: <2008-09-22 11:28:27 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -1276,6 +1276,9 @@
     /* maybe could be optimized see
        http://www.mars.org/mailman/public/mad-dev/2002-October/000739.html
     */
+/* don't handle the genre frame differently any more */
+#define USE_GENRE_IDS 0
+#if USE_GENRE_IDS
     if (strcmp (frame_name, ID3_FRAME_GENRE) == 0)
     {
        id3_ucs4_t *tmp_ucs4 = id3_utf8_ucs4duplicate ((id3_utf8_t *)data);
@@ -1283,7 +1286,7 @@
        if (index != -1)
        {
            /* valid genre -- simply store the genre number */
-           gchar *tmp = g_strdup_printf("%d", index);
+           gchar *tmp = g_strdup_printf("(%d)", index);
            ucs4 = id3_latin1_ucs4duplicate (tmp);
            g_free (tmp);
        }
@@ -1310,6 +1313,7 @@
     }
     else
     {
+#endif
        if (encoding == ID3_FIELD_TEXTENCODING_ISO_8859_1)
        {
            /* we read 'ISO_8859_1' to stand for 'any locale charset'
@@ -1324,7 +1328,9 @@
               worry about charsets */
            ucs4 = id3_utf8_ucs4duplicate ((id3_utf8_t *)data);
        }
+#if USE_GENRE_IDS
     }
+#endif
 
     if (strcmp (frame_name, ID3_FRAME_COMMENT) == 0)
        res = id3_field_setfullstring (field, ucs4);


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2

Reply via email to