Merge lp:~ballogy/gloobus-preview/xps-support into lp:gloobus-preview

[Balló György]

Add support for XPS document format

It introduces a new libgxps based plugin.

[lp:~ballogy/gloobus-preview/xps-support]

293. By Balló György on 2014-12-23

Better error handling

=== modified file 'configure.ac'
--- configure.ac	2014-12-23 16:22:50 +0000
+++ configure.ac	2014-12-23 19:06:15 +0000
@@ -49,7 +49,8 @@
 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(GXPS, libgxps)
 PKG_CHECK_MODULES(FREETYPE,freetype2)
 PKG_CHECK_MODULES(GLIB, glib-2.0)
 PKG_CHECK_MODULES(DBUS, dbus-glib-1)
@@ -87,6 +88,7 @@
     src/plugin-ps/Makefile
     src/plugin-text/Makefile
     src/plugin-ttf/Makefile
+    src/plugin-xps/Makefile
     src/loaders/PSD/Makefile
     src/loaders/XCF/Makefile
     data/Makefile

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2014-12-23 16:22:50 +0000
+++ src/Makefile.am	2014-12-23 19:06:15 +0000
@@ -12,7 +12,8 @@
     plugin-pixbuf \
     plugin-ps \
     plugin-text \
-    plugin-ttf
+    plugin-ttf \
+    plugin-xps
 
 #CXXFLAGS = -Werror -g    #If -O2  iDocument threads don't work
 AM_CXXFLAGS = -Wall #-g -O0

=== modified file 'src/gloobus-preview-plugin-manager.cpp'
--- src/gloobus-preview-plugin-manager.cpp	2014-12-20 21:05:12 +0000
+++ src/gloobus-preview-plugin-manager.cpp	2014-12-23 19:06:15 +0000
@@ -107,4 +107,5 @@
 #include "plugin-ps/ps-plugin.h"
 #include "plugin-text/plugin-text.h"
 #include "plugin-ttf/plugin-ttf.h"
+#include "plugin-xps/xps-plugin.h"
 }

=== 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-23 19:06:15 +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	2014-12-23 10:30:25 +0000
+++ src/plugin-gstreamer-audio/plugin-gstreamer-audio.cpp	2014-12-23 19:06:15 +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
@@ -262,7 +262,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;
 		}
@@ -272,8 +272,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-23 19:06:15 +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>
 

=== added directory 'src/plugin-xps'
=== added file 'src/plugin-xps/Makefile.am'
--- src/plugin-xps/Makefile.am	1970-01-01 00:00:00 +0000
+++ src/plugin-xps/Makefile.am	2014-12-23 19:06:15 +0000
@@ -0,0 +1,13 @@
+plugindir = $(prefix)/lib/gloobus/
+officeplugindir = $(prefix)/lib/gloobus/
+
+AM_CPPFLAGS += $(GTK_CFLAGS) $(GXPS_CFLAGS)
+AM_LDFLAGS = $(GTK_LIBS) $(GXPS_LIBS)
+
+plugin_LTLIBRARIES = xps.la
+xps_la_SOURCES = xps-plugin.cpp xps-loader.cpp
+xps_la_LDFLAGS = -module -export-dynamic $(AM_LDFLAGS)
+
+noinst_HEADERS = \
+	xps-loader.h \
+	xps-plugin.h

=== added file 'src/plugin-xps/xps-loader.cpp'
--- src/plugin-xps/xps-loader.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin-xps/xps-loader.cpp	2014-12-23 19:06:15 +0000
@@ -0,0 +1,106 @@
+#include "xps-loader.h"
+
+#include "../gloobus-preview-defines.h"
+
+XpsLoader::XpsLoader ():xps_document_(NULL) {}
+
+XpsLoader::~XpsLoader ()
+{
+    if (xps_document_) {
+        g_object_unref(xps_document_);
+    }
+}
+
+DocumentState XpsLoader::loadDocument( GFile *file )
+{
+    GError *error = NULL;
+    DocumentState state = DOCUMENT_NONE;
+
+    GXPSFile * xps_file = gxps_file_new (file, &error);
+    if (!xps_file) {
+        g_warning ("Error opening XPS file: %s\n", error->message);
+        g_error_free (error);
+        return DOCUMENT_INVALID;
+    }
+
+    xps_document_ = gxps_file_get_document (xps_file, 0, &error);
+    if (!xps_document_) {
+        g_warning ("Error loading XPS document: %s\n", error->message);
+        g_error_free (error);
+        state = DOCUMENT_INVALID;
+    } else {
+        state = DOCUMENT_LOADED;
+    }
+
+    return state;
+}
+
+int XpsLoader::getPagesNumber (void)
+{
+    return gxps_document_get_n_pages(xps_document_);
+}
+
+void XpsLoader::getPageSize (int index, int *width, int *height)
+{
+    GError          *error = NULL;
+    GXPSPage *page = gxps_document_get_page (xps_document_, index, &error);
+    if (!page) {
+        g_warning ("Error loading page %d: %s\n", index, error->message);
+        g_error_free (error);
+        return;
+    }
+
+    double page_width, page_height;
+    gxps_page_get_size (page, &page_width, &page_height);
+
+    if (width) {
+        *width = page_width;
+    }
+    if (height) {
+        *height = page_height;
+    }
+
+    g_object_unref(page);
+}
+
+cairo_surface_t * XpsLoader::getPage(int index, double scale)
+{
+    GXPSPage        *page;
+    gdouble          page_width, page_height;
+    gdouble          width, height;
+    cairo_t         *cr;
+    cairo_surface_t *surface;
+    GError          *error = NULL;
+
+    page = gxps_document_get_page (xps_document_, index, &error);
+    if (!page) {
+        g_warning ("Error loading page %d: %s\n", index, error->message);
+        g_error_free (error);
+        return NULL;
+    }
+
+    gxps_page_get_size (page, &page_width, &page_height);
+    width = page_width * scale;
+    height = page_height * scale;
+
+    surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height);
+    cr = cairo_create (surface);
+
+    if (scale != 1.0) {
+        cairo_scale (cr, scale, scale);
+    }
+    cairo_set_source_rgb (cr, 1., 1., 1.);
+    cairo_paint (cr);
+
+    gxps_page_render (page, cr, &error);
+
+    cairo_destroy (cr);
+    g_object_unref(page);
+
+    if (error) {
+        g_warning ("Error rendering page %d: %s\n", index, error->message);
+        g_error_free (error);
+    }
+
+    return surface;
+}

=== added file 'src/plugin-xps/xps-loader.h'
--- src/plugin-xps/xps-loader.h	1970-01-01 00:00:00 +0000
+++ src/plugin-xps/xps-loader.h	2014-12-23 19:06:15 +0000
@@ -0,0 +1,23 @@
+#ifndef XPS_LOADER_H
+#define XPS_LOADER_H
+
+#include <libgxps/gxps.h>
+
+#include "../document-loader.h"
+
+class XpsLoader : public DocumentLoader
+{
+    private:
+        GXPSDocument *xps_document_;
+
+    public:
+        XpsLoader ();
+        virtual ~XpsLoader ();
+
+        virtual DocumentState loadDocument( GFile *file );
+        virtual int getPagesNumber();
+        virtual void getPageSize( int index, int *width, int *height );
+        virtual cairo_surface_t *getPage( int index, double scale );
+};
+
+#endif /* XPS_LOADER_H */

=== added file 'src/plugin-xps/xps-plugin.cpp'
--- src/plugin-xps/xps-plugin.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin-xps/xps-plugin.cpp	2014-12-23 19:06:15 +0000
@@ -0,0 +1,14 @@
+#include "../document-plugin.h"
+#include "xps-loader.h"
+
+extern "C" interface * create() {
+    return new DocumentPlugin(new XpsLoader());
+}
+
+extern "C" void destroy(interface * p) {
+    delete static_cast<DocumentPlugin*>(p);
+}
+
+extern "C" int getVersion() {
+    return MANAGER_VERSION;
+}

=== added file 'src/plugin-xps/xps-plugin.h'
--- src/plugin-xps/xps-plugin.h	1970-01-01 00:00:00 +0000
+++ src/plugin-xps/xps-plugin.h	2014-12-23 19:06:15 +0000
@@ -0,0 +1,13 @@
+#ifndef XPS_PLUGIN_H
+#define XPS_PLUGIN_H
+
+#ifdef PLUGIN_LOADER
+
+PluginManager::register_plugin("xps");
+
+PluginManager::register_filetype("application/oxps", 1);
+PluginManager::register_filetype("application/vnd.ms-xpsdocument",1);
+
+#endif
+
+#endif /* XPS_PLUGIN_H */