Revision: 1580
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=1580&view=rev
Author: jcsjcs
Date: 2007-06-22 22:10:26 -0700 (Fri, 22 Jun 2007)
Log Message:
-----------
* src/itdb_itunesdb.c (mhod52_make_collate_keys): ignore empty
sort strings -- fixes multiple display of same album on the
iPod.
Modified Paths:
--------------
libgpod/trunk/ChangeLog
libgpod/trunk/src/itdb_itunesdb.c
Modified: libgpod/trunk/ChangeLog
===================================================================
--- libgpod/trunk/ChangeLog 2007-06-23 03:54:37 UTC (rev 1579)
+++ libgpod/trunk/ChangeLog 2007-06-23 05:10:26 UTC (rev 1580)
@@ -1,3 +1,9 @@
+2007-06-23 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+ * src/itdb_itunesdb.c (mhod52_make_collate_keys): ignore empty
+ sort strings -- fixes multiple display of same album on the
+ iPod.
+
2007-06-18 Jorg Schuler <jcsjcs at users.sourceforge.net>
* TROUBLESHOOTING: comment concerning namespace cleanup
Modified: libgpod/trunk/src/itdb_itunesdb.c
===================================================================
--- libgpod/trunk/src/itdb_itunesdb.c 2007-06-23 03:54:37 UTC (rev 1579)
+++ libgpod/trunk/src/itdb_itunesdb.c 2007-06-23 05:10:26 UTC (rev 1580)
@@ -229,7 +229,10 @@
MHOD52_SORTTYPE_ALBUM = 0x04,
MHOD52_SORTTYPE_ARTIST = 0x05,
MHOD52_SORTTYPE_GENRE = 0x07,
- MHOD52_SORTTYPE_COMPOSER = 0x12
+ MHOD52_SORTTYPE_COMPOSER = 0x12/*,
+ MHOD52_SORTTYPE_TVSHOW = 0x1d,
+ MHOD52_SORTTYPE_TVSEASON = 0x1e,
+ MHOD52_SORTTYPE_TVEPISODE= 0x1f*/
};
struct mhod52track
@@ -3705,7 +3708,7 @@
coltracks = g_list_prepend (coltracks, ct);
/* album */
- if (tr->sort_album)
+ if (tr->sort_album && *tr->sort_album)
{
ct->album = g_utf8_collate_key (tr->sort_album, -1);
}
@@ -3719,7 +3722,7 @@
}
/* title */
- if (tr->sort_title)
+ if (tr->sort_title && *tr->sort_title)
{
ct->title = g_utf8_collate_key (tr->sort_title, -1);
}
@@ -3759,7 +3762,7 @@
}
/* composer */
- if (tr->sort_composer)
+ if (tr->sort_composer && *tr->sort_composer)
{
ct->composer = g_utf8_collate_key (tr->sort_composer, -1);
}
@@ -4652,10 +4655,10 @@
mhod.data.mhod52coltracks = mhod52_make_collate_keys (pl->members);
mhod.data2.mhod52sorttype = MHOD52_SORTTYPE_TITLE;
mk_mhod (fexp, &mhod);
+ mhod.data2.mhod52sorttype = MHOD52_SORTTYPE_ARTIST;
+ mk_mhod (fexp, &mhod);
mhod.data2.mhod52sorttype = MHOD52_SORTTYPE_ALBUM;
mk_mhod (fexp, &mhod);
- mhod.data2.mhod52sorttype = MHOD52_SORTTYPE_ARTIST;
- mk_mhod (fexp, &mhod);
mhod.data2.mhod52sorttype = MHOD52_SORTTYPE_GENRE;
mk_mhod (fexp, &mhod);
mhod.data2.mhod52sorttype = MHOD52_SORTTYPE_COMPOSER;
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 DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
