commit bafeeeffd6164ecd43b927eda71c5002194132e4
Author: Joeny Ang <ang.jo...@gmail.com>
Date: Sun Apr 4 21:04:08 2010 +0200
fix iPod Classic 80GB support
It doesn't cope well with reordered mhsds and considers the database
as invalid (and the ipod then looks empty). Put them in an order that
works for this iPod.
src/itdb_itunesdb.c | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
---
diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c
index 0796df7..c1a6571 100644
--- a/src/itdb_itunesdb.c
+++ b/src/itdb_itunesdb.c
@@ -5652,55 +5652,55 @@ static gboolean itdb_write_file_internal (Itdb_iTunesDB
*itdb,
mk_mhbd (fexp, 7); /* seven mhsds */
- /* write albums (mhsd type 4) */
- if (!write_mhsd_albums (fexp)) {
+ /* write tracklist (mhsd type 1) */
+ if (!fexp->error && !write_mhsd_tracks (fexp)) {
g_set_error (&fexp->error,
ITDB_FILE_ERROR,
ITDB_FILE_ERROR_ITDB_CORRUPT,
- _("Error writing list of albums (mhsd type 4)"));
+ _("Error writing list of tracks (mhsd type 1)"));
goto err;
}
- /* write artists (mhsd type 8) */
- if (!fexp->error && !write_mhsd_artists (fexp)) {
+
+ /* write special podcast version mhsd (mhsd type 3) */
+ if (!fexp->error && !write_mhsd_playlists (fexp, 3)) {
g_set_error (&fexp->error,
ITDB_FILE_ERROR,
ITDB_FILE_ERROR_ITDB_CORRUPT,
- _("Error writing list of artists (mhsd type 8)"));
+ _("Error writing special podcast playlists (mhsd type
3)"));
goto err;
}
-
- /* write tracklist (mhsd type 1) */
- if (!fexp->error && !write_mhsd_tracks (fexp)) {
- g_set_error (&fexp->error,
+ /* write standard playlist mhsd (mhsd type 2) */
+ if (!fexp->error && !write_mhsd_playlists (fexp, 2)) {
+ g_set_error (&fexp->error,
ITDB_FILE_ERROR,
ITDB_FILE_ERROR_ITDB_CORRUPT,
- _("Error writing list of tracks (mhsd type 1)"));
+ _("Error writing standard playlists (mhsd type 2)"));
goto err;
}
- /* write empty mhsd type 6, whatever it is */
- if (!fexp->error && !write_mhsd_type6 (fexp)) {
+ /* write albums (mhsd type 4) */
+ if (!write_mhsd_albums (fexp)) {
g_set_error (&fexp->error,
ITDB_FILE_ERROR,
ITDB_FILE_ERROR_ITDB_CORRUPT,
- _("Error writing mhsd type 6"));
+ _("Error writing list of albums (mhsd type 4)"));
goto err;
}
-
- /* write special podcast version mhsd (mhsd type 3) */
- if (!fexp->error && !write_mhsd_playlists (fexp, 3)) {
- g_set_error (&fexp->error,
+ /* write artists (mhsd type 8) */
+ if (!fexp->error && !write_mhsd_artists (fexp)) {
+ g_set_error (&fexp->error,
ITDB_FILE_ERROR,
ITDB_FILE_ERROR_ITDB_CORRUPT,
- _("Error writing special podcast playlists (mhsd type
3)"));
+ _("Error writing list of artists (mhsd type 8)"));
goto err;
}
- /* write standard playlist mhsd (mhsd type 2) */
- if (!fexp->error && !write_mhsd_playlists (fexp, 2)) {
- g_set_error (&fexp->error,
+
+ /* write empty mhsd type 6, whatever it is */
+ if (!fexp->error && !write_mhsd_type6 (fexp)) {
+ g_set_error (&fexp->error,
ITDB_FILE_ERROR,
ITDB_FILE_ERROR_ITDB_CORRUPT,
- _("Error writing standard playlists (mhsd type 2)"));
+ _("Error writing mhsd type 6"));
goto err;
}
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
