[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [phonon-gstreamer/1.0-porting-for-merge] gstreamer: Dont build QGV elements if PHONON_NO_GRAPHICSVIE
From:       Torrie Fischer <tdfischer () kde ! org>
Date:       2013-07-14 15:34:21
Message-ID: E1UyOJZ-0000D0-Oy () scm ! kde ! org
[Download RAW message or body]

Git commit 080c61eda5bcc1d9c76a15fd4ef9ac2537bfda3f by Torrie Fischer.
Committed on 14/07/2013 at 15:34.
Pushed by tdfischer into branch '1.0-porting-for-merge'.

Dont build QGV elements if PHONON_NO_GRAPHICSVIEW is configured in libphonon

M  +8    -0    gstreamer/CMakeLists.txt
M  +5    -0    gstreamer/backend.cpp

http://commits.kde.org/phonon-gstreamer/080c61eda5bcc1d9c76a15fd4ef9ac2537b=
fda3f

diff --git a/gstreamer/CMakeLists.txt b/gstreamer/CMakeLists.txt
index 8015ca8..9bc866b 100644
--- a/gstreamer/CMakeLists.txt
+++ b/gstreamer/CMakeLists.txt
@@ -59,6 +59,14 @@ if (BUILD_PHONON_GSTREAMER)
       widgetrenderer.cpp
       )
 =

+    if (NOT PHONON_NO_GRAPHICSVIEW)
+      set(phonon_gstreamer_SRCS
+        ${phonon_gstreamer_SRCS}
+        videographicsobject.cpp
+        videosink.c
+      )
+    endif (NOT PHONON_NO_GRAPHICSVIEW)
+
     if(PHONON_FOUND_EXPERIMENTAL)
         add_definitions(-DPHONON_EXPERIMENTAL)
         list(APPEND phonon_gstreamer_SRCS videodataoutput.cpp)
diff --git a/gstreamer/backend.cpp b/gstreamer/backend.cpp
index 3fcebc2..b507138 100644
--- a/gstreamer/backend.cpp
+++ b/gstreamer/backend.cpp
@@ -24,7 +24,10 @@
 #include "audioeffect.h"
 #include "debug.h"
 #include "mediaobject.h"
+
+#ifndef PHONON_NO_GRAPHICSVIEW
 #include "videographicsobject.h"
+#endif //PHONON_NO_GRAPHICSVIEW
 #include "videowidget.h"
 #include "devicemanager.h"
 #include "effectmanager.h"
@@ -170,11 +173,13 @@ QObject *Backend::createObject(BackendInterface::Clas=
s c, QObject *parent, const
             return new VideoWidget(this, widget);
         }
 =

+#ifndef PHONON_NO_GRAPHICSVIEW
 #warning FIXME: Enable this once we port VGO to GStreamer 1.0
 #if GST_VERSION < GST_VERSION_CHECK (1,0,0,0)
     case VideoGraphicsObjectClass:
         return new VideoGraphicsObject(this, parent);
 #endif
+#endif //PHONON_NO_GRAPHICSVIEW
 #endif //QT_NO_PHONON_VIDEO
 #ifndef QT_NO_PHONON_VOLUMEFADEREFFECT
     case VolumeFaderEffectClass:
[prev in list] [next in list] [prev in thread] [next in thread]