Revision: 2231
          http://gtkpod.svn.sourceforge.net/gtkpod/?rev=2231&view=rev
Author:   teuf
Date:     2009-01-20 21:39:56 +0000 (Tue, 20 Jan 2009)

Log Message:
-----------
Add support for MHODs used as children of MHIA blocks

Modified Paths:
--------------
    libgpod/trunk/ChangeLog
    libgpod/trunk/src/itdb_itunesdb.c

Modified: libgpod/trunk/ChangeLog
===================================================================
--- libgpod/trunk/ChangeLog     2009-01-19 03:59:28 UTC (rev 2230)
+++ libgpod/trunk/ChangeLog     2009-01-20 21:39:56 UTC (rev 2231)
@@ -1,3 +1,8 @@
+2009-01-20  Christophe Fergeau  <teuf at gnome.org>
+
+       * src/itdb_itunesdb.c: add new enum value for MHOD types found as
+       children of the MHLA header (list of albums)
+
 2009-01-18  Todd Zullinger  <tmzullinger at users.sourceforge.net>
 
        * configure.ac: Bump version to 0.7.1SVN for further development

Modified: libgpod/trunk/src/itdb_itunesdb.c
===================================================================
--- libgpod/trunk/src/itdb_itunesdb.c   2009-01-19 03:59:28 UTC (rev 2230)
+++ libgpod/trunk/src/itdb_itunesdb.c   2009-01-20 21:39:56 UTC (rev 2231)
@@ -219,7 +219,10 @@
   MHOD_ID_SPLRULES = 51, /* rules for smart playlist     */
   MHOD_ID_LIBPLAYLISTINDEX = 52,  /* Library Playlist Index */
   MHOD_ID_LIBPLAYLISTJUMPTABLE=53,
-  MHOD_ID_PLAYLIST = 100
+  MHOD_ID_PLAYLIST = 100,
+  MHOD_ID_ALBUM_ALBUM = 200, /* MHODs for the MHIAs */
+  MHOD_ID_ALBUM_ARTIST = 201,
+  MHOD_ID_ALBUM_SORT_ARTIST = 202
 };
 
 
@@ -1660,6 +1663,9 @@
     case MHOD_ID_SORT_ALBUMARTIST:
     case MHOD_ID_SORT_COMPOSER:
     case MHOD_ID_SORT_TVSHOW:
+    case MHOD_ID_ALBUM_ALBUM:
+    case MHOD_ID_ALBUM_ARTIST:
+    case MHOD_ID_ALBUM_SORT_ARTIST:
        mhoddata = get_mhod (fimp, seek, ml);
        if ((*ml != -1) && mhoddata.valid)
            return mhoddata.data.string;
@@ -2132,6 +2138,9 @@
          case MHOD_ID_SORT_ALBUMARTIST:
          case MHOD_ID_SORT_COMPOSER:
          case MHOD_ID_SORT_TVSHOW:
+         case MHOD_ID_ALBUM_ALBUM:
+         case MHOD_ID_ALBUM_ARTIST:
+         case MHOD_ID_ALBUM_SORT_ARTIST:
          case MHOD_ID_LIBPLAYLISTJUMPTABLE:
              /* these are not expected here */
              break;
@@ -2449,6 +2458,9 @@
          case MHOD_ID_LIBPLAYLISTJUMPTABLE:
          case MHOD_ID_PLAYLIST:
          case MHOD_ID_CHAPTERDATA:
+         case MHOD_ID_ALBUM_ALBUM:
+         case MHOD_ID_ALBUM_ARTIST:
+         case MHOD_ID_ALBUM_SORT_ARTIST:
              g_free (entry_utf8);
              break;
          }
@@ -3981,6 +3993,9 @@
   case MHOD_ID_SORT_ALBUMARTIST:
   case MHOD_ID_SORT_COMPOSER:
   case MHOD_ID_SORT_TVSHOW:
+  case MHOD_ID_ALBUM_ALBUM:
+  case MHOD_ID_ALBUM_ARTIST:
+  case MHOD_ID_ALBUM_SORT_ARTIST:
       g_return_if_fail (mhod->data.string);
       /* normal iTunesDBs seem to take utf16 strings), endian-inversed
         iTunesDBs seem to take utf8 strings */


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:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2

Reply via email to