tracker r2345 - in trunk: . src/tracker-extract

[mr svn gnome org]

Author: mr
Date: Thu Oct  9 13:21:21 2008
New Revision: 2345
URL: http://svn.gnome.org/viewvc/tracker?rev=2345&view=rev

Log:
	* src/tracker-extract/Makefile.am: Don't link with GdkPixbuf
	unless we have it.

	* src/tracker-extract/tracker-extract-gstreamer.c: Don't call
	GdkPixbuf module functions unless we have GdkPixbuf.


Modified:
   trunk/ChangeLog
   trunk/src/tracker-extract/Makefile.am
   trunk/src/tracker-extract/tracker-extract-gstreamer.c

Modified: trunk/src/tracker-extract/Makefile.am
==============================================================================
--- trunk/src/tracker-extract/Makefile.am	(original)
+++ trunk/src/tracker-extract/Makefile.am	Thu Oct  9 13:21:21 2008
@@ -72,11 +72,15 @@
 
 # Common AlbumArt sources
 albumart_sources =
+albumart_libs =
 
 if HAVE_GDKPIXBUF
 albumart_sources +=							\
 	tracker-albumart.c						\
 	tracker-albumart.h
+
+albumart_libs += 							\
+	$(GDKPIXBUF_LIBS)
 endif
 
 # ABW
@@ -97,7 +101,7 @@
 # MP3
 libextract_mp3_la_SOURCES = tracker-extract-mp3.c $(albumart_sources)
 libextract_mp3_la_LDFLAGS = $(module_flags)
-libextract_mp3_la_LIBADD = $(GLIB2_LIBS) $(GDKPIXBUF_LIBS)
+libextract_mp3_la_LIBADD = $(albumart_libs) $(GLIB2_LIBS)
 
 # MPlayer
 libextract_mplayer_la_SOURCES = tracker-extract-mplayer.c
@@ -149,7 +153,7 @@
 # GStreamer
 libextract_gstreamer_la_SOURCES = tracker-extract-gstreamer.c $(albumart_sources)
 libextract_gstreamer_la_LDFLAGS = $(module_flags)
-libextract_gstreamer_la_LIBADD = $(GLIB2_LIBS) $(GSTREAMER_LIBS) $(GDKPIXBUF_LIBS)
+libextract_gstreamer_la_LIBADD = $(albumart_libs) $(GSTREAMER_LIBS) $(GLIB2_LIBS)
 
 # Xine
 libextract_xine_la_SOURCES = tracker-extract-libxine.c

Modified: trunk/src/tracker-extract/tracker-extract-gstreamer.c
==============================================================================
--- trunk/src/tracker-extract/tracker-extract-gstreamer.c	(original)
+++ trunk/src/tracker-extract/tracker-extract-gstreamer.c	Thu Oct  9 13:21:21 2008
@@ -62,7 +62,10 @@
 #include <gst/tag/tag.h>
 
 #include "tracker-extract.h"
+
+#ifdef HAVE_GDKPIXBUF
 #include "tracker-albumart.h"
+#endif /* HAVE_GDKPIXBUF */
 
 typedef enum {
 	EXTRACT_MIME_UNDEFINED=0,
@@ -854,10 +857,12 @@
 
 	/* Save embedded art */
 	if (extractor->album_art_data && extractor->album_art_size) {
+#ifdef HAVE_GDKPIXBUF
 		tracker_save_albumart (extractor->album_art_data, extractor->album_art_size,
 				       g_hash_table_lookup (metadata, "Audio:Artist") ,
 				       g_hash_table_lookup (metadata, "Audio:Album"),
 				       uri);
+#endif /* HAVE_GDKPIXBUF */
 	}
 
 	/* Check that we have the minimum data. FIXME We should not need to do this */