commit 87e9c71af1d12848cc1f224881e932707c33f5aa
Author: Christophe Fergeau <cferg...@mandriva.com>
Date: Tue Feb 16 22:53:54 2010 +0100
use itdb_device_is_shuffle in itdb_init_ipod
The code in that function needs to check if the current device is
an iPod Shuffle, but it was buggy and was only checking if we have
an iPod Shuffle 1st Gen.
src/itdb_itunesdb.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
---
diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c
index 46a5ade..581a655 100644
--- a/src/itdb_itunesdb.c
+++ b/src/itdb_itunesdb.c
@@ -7294,7 +7294,6 @@ gboolean itdb_init_ipod (const gchar *mountpoint,
gboolean writeok;
Itdb_iTunesDB *itdb = NULL;
Itdb_Playlist *mpl = NULL;
- Itdb_IpodInfo const *info = NULL;
gchar *path;
g_return_val_if_fail (mountpoint, FALSE);
@@ -7353,13 +7352,10 @@ gboolean itdb_init_ipod (const gchar *mountpoint,
}
g_free (path);
- /* Retrieve the model from the device information */
- info = itdb_device_get_ipod_info(itdb->device);
-
/* If model is a shuffle or the model is undetermined,
* ie. @model_number is NULL, then create the itunesSD database
*/
- if(!model_number || info->ipod_model == ITDB_IPOD_MODEL_SHUFFLE)
+ if(!model_number || itdb_device_is_shuffle (itdb->device))
{
path = itdb_get_itunessd_path (mountpoint);
if (!path)
------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
