rhythmbox r5746 - in trunk: . plugins/ipod

[teuf svn gnome org]

Author: teuf
Date: Sat Jun 14 15:53:20 2008
New Revision: 5746
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5746&view=rev

Log:
Require libgpod 0.6 since it's needed to support ipod classic/video nano


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/plugins/ipod/rb-ipod-db.c
   trunk/plugins/ipod/rb-ipod-source.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Jun 14 15:53:20 2008
@@ -33,7 +33,7 @@
 GNOME_MEDIA_PROFILES_REQS=2.8
 GNOME_VFS_REQS=2.8.0
 LIBNOTIFY_REQS=0.3.2
-LIBGPOD_REQS=0.4
+LIBGPOD_REQS=0.6
 MUSICBRAINZ_REQS=2.1.0
 NCB_MIN_REQS=2.9.0
 TOTEM_PLPARSER_REQS=2.21.4
@@ -148,9 +148,6 @@
 	     AC_DEFINE(WITH_IPOD_SUPPORT, 1, [Define if iPod support is enabled])
 	     use_ipod=yes
 	  fi
-	  AC_CHECK_LIB(gpod, itdb_track_set_thumbnails_from_pixbuf,
-		       [AC_DEFINE([HAVE_ITDB_TRACK_SET_THUMBNAILS_FROM_PIXBUF], 1, [Have libgpod function to set thumbnails from a GdkPixbuf])],
-		       ,[$IPOD_LIBS $IPOD_CFLAGS])
 	  AC_SUBST(IPOD_CFLAGS)
 	  AC_SUBST(IPOD_LIBS)
 	fi

Modified: trunk/plugins/ipod/rb-ipod-db.c
==============================================================================
--- trunk/plugins/ipod/rb-ipod-db.c	(original)
+++ trunk/plugins/ipod/rb-ipod-db.c	Sat Jun 14 15:53:20 2008
@@ -318,36 +318,10 @@
 rb_ipod_db_set_thumbnail_internal (RbIpodDb *ipod_db, Itdb_Track *track, 
 				   GdkPixbuf *pixbuf)
 {
-#ifndef HAVE_ITDB_TRACK_SET_THUMBNAILS_FROM_PIXBUF
-	gchar *image_data;
-	gsize image_data_len;
-	GError *err = NULL;
-	gboolean success;
-#endif /* HAVE_ITDB_TRACK_SET_THUMBNAILS_FROM_PIXBUF */
-
 	g_return_if_fail (track != NULL);
 	g_return_if_fail (pixbuf != NULL);
 
-#ifdef HAVE_ITDB_TRACK_SET_THUMBNAILS_FROM_PIXBUF
 	itdb_track_set_thumbnails_from_pixbuf (track, pixbuf);
-#else /* HAVE_ITDB_TRACK_SET_THUMBNAILS_FROM_PIXBUF */
-
-	success = gdk_pixbuf_save_to_buffer (pixbuf,
-					     &image_data, &image_data_len,
-					     "jpeg", &err,
-					     "quality", "100",
-					     NULL);
-	if (!success) {
-		g_assert (image_data == NULL);
-		g_warning ("Failed to save pixbuf to buffer %s", err->message);
-		g_error_free (err);
-		return;
-	}
-
-	itdb_track_set_thumbnails_from_data (track, (guchar *) image_data, 
-					     image_data_len);
-	g_free (image_data);
-#endif /* HAVE_ITDB_TRACK_SET_THUMBNAILS_FROM_PIXBUF */
 
 	rb_ipod_db_save_async (ipod_db);
 }

Modified: trunk/plugins/ipod/rb-ipod-source.c
==============================================================================
--- trunk/plugins/ipod/rb-ipod-source.c	(original)
+++ trunk/plugins/ipod/rb-ipod-source.c	Sat Jun 14 15:53:20 2008
@@ -1371,6 +1371,7 @@
 		RBiPodSourcePrivate *priv = IPOD_SOURCE_GET_PRIVATE (source);
 		char *filename;
 		const char *mount_path;
+		Itdb_Device *device;
 
 		filename = g_filename_from_uri (dest, NULL, NULL);
 		mount_path = rb_ipod_db_get_mount_path (priv->ipod_db);
@@ -1381,18 +1382,10 @@
 		if (song->mediatype == MEDIATYPE_PODCAST) {
 			add_to_podcasts (isource, song);
 		}
-#ifdef HAVE_ITDB_TRACK_SET_THUMBNAILS_FROM_PIXBUF
-		/* reuse that #define since both functions were added to 
-		 * libgpod CVS HEAD around the same time
-		 */
-		Itdb_Device *device;
 		device = rb_ipod_db_get_device (priv->ipod_db);		
 		if (device && itdb_device_supports_artwork (device)) {
 			request_artwork (isource, entry, db, song);
 		}
-#else 
-		request_artwork (isource, entry, db, song);
-#endif
 		add_ipod_song_to_db (isource, db, song);
 		rb_ipod_db_add_track (priv->ipod_db, song);
 	}