Merge lp:~ballogy/gloobus-preview/drop-taglib into lp:gloobus-preview

[Balló György]

Use GStreamer to parse tags

It works reliably now, there is no reason to use taglib. Comment out the code, and remove taglib dependency.

=== modified file 'configure.ac'
--- configure.ac	2012-05-13 19:48:02 +0000
+++ configure.ac	2014-12-22 19:21:10 +0000
@@ -51,7 +51,7 @@
 PKG_CHECK_MODULES(POPPLER, poppler-glib)
 PKG_CHECK_MODULES(SPECTRE, libspectre >= 0.2.2)
 PKG_CHECK_MODULES(DJVU, ddjvuapi)
-PKG_CHECK_MODULES(TAGLIB, taglib)
+#PKG_CHECK_MODULES(TAGLIB, taglib)
 PKG_CHECK_MODULES(FREETYPE,freetype2)
 PKG_CHECK_MODULES(GLIB, glib-2.0)
 PKG_CHECK_MODULES(DBUS, dbus-glib-1)
 
=== modified file 'src/plugin-gstreamer-audio/Makefile.am'
--- src/plugin-gstreamer-audio/Makefile.am	2010-04-19 18:00:37 +0000
+++ src/plugin-gstreamer-audio/Makefile.am	2014-12-22 19:21:10 +0000
@@ -1,7 +1,7 @@
 plugindir = $(prefix)/lib/gloobus/
 
-AM_CPPFLAGS += $(GTK_CFLAGS) $(GSTREAMER_CFLAGS) $(GDK_CFLAGS) $(TAGLIB_CFLAGS)
-AM_LDFLAGS = $(GTK_LIBS)  $(GSTREAMER_LIBS)	$(GDK_LIBS) $(TAGLIB_LIBS)
+AM_CPPFLAGS += $(GTK_CFLAGS) $(GSTREAMER_CFLAGS) $(GDK_CFLAGS) #$(TAGLIB_CFLAGS)
+AM_LDFLAGS = $(GTK_LIBS)  $(GSTREAMER_LIBS)	$(GDK_LIBS) #$(TAGLIB_LIBS)
 
 plugin_LTLIBRARIES = audio.la 
 audio_la_SOURCES = plugin-gstreamer-audio.cpp 
 
=== modified file 'src/plugin-gstreamer-audio/plugin-gstreamer-audio.cpp'
--- src/plugin-gstreamer-audio/plugin-gstreamer-audio.cpp	2012-04-06 10:42:24 +0000
+++ src/plugin-gstreamer-audio/plugin-gstreamer-audio.cpp	2014-12-22 19:21:10 +0000
@@ -38,12 +38,12 @@
 	pix_reflection = ui->pixbuf_reflect(pix_cover);
 	g_object_unref(temp);
 
-	load_info();
+	//load_info(); // Use GStreamer instead of taglib
 	
 	return true;
 }
 
-void iAudio::load_info( void )
+/*void iAudio::load_info( void )
 {
 	TagLib::FileRef file(m_filename.c_str());
 	
@@ -54,7 +54,7 @@
 	this->title  = title.toCString(true);
 	this->artist = artist.toCString(true);
 	this->album  = album.toCString(true);
-}
+}*/
 
 void iAudio::end( void )
 {
@@ -166,7 +166,7 @@
 {
 	GdkPixbuf *temp = NULL;
 
-	TagLib::MPEG::File file(m_filename.c_str());
+/*	TagLib::MPEG::File file(m_filename.c_str());
 	TagLib::ID3v2::Tag *tagv2 = file.ID3v2Tag();
 	if(tagv2) {
 		TagLib::ID3v2::FrameListMap tags  = tagv2->frameListMap();
@@ -187,7 +187,7 @@
 			if(temp)
 				return temp;
 		}
-	}
+	}*/
 	
 	// If there is no cover attached, load cover.jpg, then if there is not cover.jpg, try to load
 	// cover.png, and there is not cover.png, then, load the default theme icon for audio/mpeg using the
@@ -261,7 +261,7 @@
 		case GST_MESSAGE_TAG: {
 			GstTagList *tags = NULL;
 			gst_message_parse_tag (message, &tags);
-			//audio->handle_tags (tags); // FIXME: uncomment when handle_tags() works well
+			audio->handle_tags (tags);
 			gst_tag_list_free (tags);
 			break;
 		}
@@ -271,8 +271,6 @@
 
 void iAudio::handle_tags( GstTagList *tags )
 {
-	// FIXME: this works very bad for now, so we still have to use TagLib
-	
 	gchar *title, *artist, *album, *info;
 	
 	if( !gst_tag_list_get_string_index (tags, GST_TAG_TITLE, 0, &title) )
 
=== modified file 'src/plugin-gstreamer-audio/plugin-gstreamer-audio.h'
--- src/plugin-gstreamer-audio/plugin-gstreamer-audio.h	2012-04-13 12:53:01 +0000
+++ src/plugin-gstreamer-audio/plugin-gstreamer-audio.h	2014-12-22 19:21:10 +0000
@@ -3,10 +3,10 @@
 
 #ifndef PLUGIN_LOADER
 
-#include <taglib/fileref.h>
+/*#include <taglib/fileref.h>
 #include <taglib/mpegfile.h>
 #include <taglib/attachedpictureframe.h>
-#include <taglib/id3v2tag.h>
+#include <taglib/id3v2tag.h>*/
 #include <config.h>
 #include <string>