Merge lp:~jpakkane/thumbnailer/gst-disable into lp:thumbnailer

[Jussi Pakkanen]

Disable use of in-process GStreamer because we use 1.0, which clashes with 0.10.

Disable use of in-process GStreamer because we use 1.0, which clashes with 0.10.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:56
http://jenkins.qa.ubuntu.com/job/thumbnailer-ci/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-saucy-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-saucy-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/thumbnailer-saucy-armhf-ci/10/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/thumbnailer-saucy-i386-ci/10

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/thumbnailer-ci/10/rebuild

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

review: Approve

[Timo Jyrinki (timo-jyrinki)]

Fixes https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1235484/comments/8

review: Approve

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2013-10-02 09:31:37 +0000
+++ src/CMakeLists.txt	2013-10-08 11:12:12 +0000
@@ -1,11 +1,12 @@
 add_library(thumbnailer SHARED
-audioimageextractor.cpp
+#audioimageextractor.cpp
 imagescaler.cpp
 thumbnailcache.cpp
 thumbnailer.cpp
 videoscreenshotter.cpp
 )
-target_link_libraries(thumbnailer ${GST_DEPS_LDFLAGS} ${IMG_DEPS_LDFLAGS})
+target_link_libraries(thumbnailer #${GST_DEPS_LDFLAGS}
+ ${IMG_DEPS_LDFLAGS})
 set_target_properties(thumbnailer PROPERTIES VERSION ${SO_VERSION} SOVERSION ${ABI_VERSION})
 
 install(

=== modified file 'src/audioimageextractor.cpp'
--- src/audioimageextractor.cpp	2013-09-27 09:42:35 +0000
+++ src/audioimageextractor.cpp	2013-10-08 11:12:12 +0000
@@ -25,6 +25,11 @@
 
 using namespace std;
 
+class GstInitializer {
+public:
+    GstInitializer() { gst_init(nullptr, nullptr); };
+};
+
 class AudioImageExtractorPrivate {
 };
 
@@ -48,6 +53,7 @@
 }
 
 AudioImageExtractor::AudioImageExtractor() {
+    static GstInitializer i; // C++ standard guarantees this to be lazy and thread safe.
     p = new AudioImageExtractorPrivate();
 }
 

=== modified file 'src/thumbnailer.cpp'
--- src/thumbnailer.cpp	2013-10-02 13:01:08 +0000
+++ src/thumbnailer.cpp	2013-10-08 11:12:12 +0000
@@ -29,18 +29,13 @@
 
 using namespace std;
 
-class GstInitializer {
-public:
-    GstInitializer() { gst_init(nullptr, nullptr); };
-};
-
 class ThumbnailerPrivate {
 private:
     mt19937 rnd;
 
 public:
     ThumbnailCache cache;
-    AudioImageExtractor audio;
+//    AudioImageExtractor audio;
     VideoScreenshotter video;
     ImageScaler scaler;
 
@@ -74,6 +69,11 @@
         // Fail is ok, just try the next one.
     }
     bool extracted = false;
+    // There was a symbol clas between 1.0 and 0.10 versions of
+    // GStreamer on the desktop so we need to disable in-process
+    // usage of gstreamer. Re-enable this once desktop moves to
+    // newer Qt multimedia that has GStreamer 1.0.
+/*
     try {
         if(audio.extract(abspath, tmpname)) {
             extracted = true;
@@ -85,6 +85,7 @@
         unlink(tmpname.c_str());
         return tnfile;
     }
+    */
     try {
         if(video.extract(abspath, tmpname)) {
             extracted = true;
@@ -101,7 +102,6 @@
 }
 
 Thumbnailer::Thumbnailer() {
-    static GstInitializer i; // C++ standard guarantees this to be lazy and thread safe.
     p = new ThumbnailerPrivate();
 }
 

=== modified file 'tools/CMakeLists.txt'
--- tools/CMakeLists.txt	2013-10-02 09:31:37 +0000
+++ tools/CMakeLists.txt	2013-10-08 11:12:12 +0000
@@ -1,5 +1,5 @@
-add_executable(imdump imdump.cpp)
-target_link_libraries(imdump thumbnailer)
+#add_executable(imdump imdump.cpp)
+#target_link_libraries(imdump thumbnailer ${GST_DEPS_LDFLAGS})
 
 add_executable(scaler scaler.cpp)
 target_link_libraries(scaler thumbnailer)