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

List:       kde-commits
Subject:    [phonon-gstreamer/1.0-porting-for-merge] gstreamer: Merge branch 'master' into 1.0-porting-for-merge
From:       Torrie Fischer <tdfischer () kde ! org>
Date:       2013-07-14 16:22:54
Message-ID: E1UyP4Y-0002dB-2f () scm ! kde ! org
[Download RAW message or body]

Git commit cb85d8589586e1f9de658671d56ecd1c2ef99aba by Torrie Fischer.
Committed on 14/07/2013 at 16:22.
Pushed by tdfischer into branch '1.0-porting-for-merge'.

Merge branch 'master' into 1.0-porting-for-merge

Conflicts:
	gstreamer/CMakeLists.txt
	gstreamer/backend.cpp
	gstreamer/pipeline.cpp
	gstreamer/x11renderer.cpp

M  +11   -4    gstreamer/CMakeLists.txt
M  +6    -0    gstreamer/ConfigureChecks.cmake
M  +3    -2    gstreamer/backend.cpp
M  +1    -1    gstreamer/mediaobject.cpp
M  +5    -4    gstreamer/pipeline.cpp
M  +2    -2    gstreamer/plugininstaller.cpp
M  +1    -1    gstreamer/qwidgetvideosink.cpp
M  +1    -1    gstreamer/streamreader.cpp
M  +3    -3    gstreamer/videowidget.cpp
M  +11   -4    gstreamer/x11renderer.cpp

http://commits.kde.org/phonon-gstreamer/cb85d8589586e1f9de658671d56ecd1c2ef99aba

diff --cc gstreamer/backend.cpp
index b507138,c4a8844..ee43910
--- a/gstreamer/backend.cpp
+++ b/gstreamer/backend.cpp
@@@ -24,10 -24,9 +24,9 @@@
  #include "audioeffect.h"
  #include "debug.h"
  #include "mediaobject.h"
- 
  #ifndef PHONON_NO_GRAPHICSVIEW
  #include "videographicsobject.h"
 -#endif
 +#endif //PHONON_NO_GRAPHICSVIEW
  #include "videowidget.h"
  #include "devicemanager.h"
  #include "effectmanager.h"
diff --cc gstreamer/pipeline.cpp
index 3ea1f80,340befd..65d9059
--- a/gstreamer/pipeline.cpp
+++ b/gstreamer/pipeline.cpp
@@@ -53,15 -47,8 +53,14 @@@ Pipeline::Pipeline(QObject *parent
      , m_resetting(false)
  {
      qRegisterMetaType<GstState>("GstState");
 +#if GST_VERSION < GST_VERSION_CHECK (1,0,0,0)
      m_pipeline = GST_PIPELINE(gst_element_factory_make("playbin2", NULL));
 +    gst_object_ref(m_pipeline);
-     gst_object_sink(m_pipeline);
 +#else
 +    m_pipeline = GST_PIPELINE(gst_element_factory_make("playbin", NULL));
 +    gst_object_ref(m_pipeline);
-     gst_object_ref_sink(m_pipeline);
 +#endif
+     gst_object_ref_sink (m_pipeline);
      g_signal_connect(m_pipeline, "video-changed", G_CALLBACK(cb_videoChanged), this);
      g_signal_connect(m_pipeline, "text-tags-changed", G_CALLBACK(cb_textTagsChanged), this);
      g_signal_connect(m_pipeline, "audio-tags-changed", G_CALLBACK(cb_audioTagsChanged), this);
diff --cc gstreamer/videowidget.cpp
index afa0917,a3948ba..9b6d703
--- a/gstreamer/videowidget.cpp
+++ b/gstreamer/videowidget.cpp
@@@ -22,9 -22,11 +22,9 @@@
  #include <QtGui/QPalette>
  #include <QtGui/QImage>
  #include <QtGui/QPainter>
- #include <QtGui/QBoxLayout>
+ #include <QBoxLayout>
  #include <QApplication>
  #include <gst/gst.h>
 -#include <gst/interfaces/navigation.h>
 -#include <gst/interfaces/propertyprobe.h>
  #include <gst/pbutils/gstpluginsbaseversion.h>
  #include <gst/video/video.h>
  #include "abstractrenderer.h"
diff --cc gstreamer/x11renderer.cpp
index 7629a67,a8e922b..6bd9f5e
--- a/gstreamer/x11renderer.cpp
+++ b/gstreamer/x11renderer.cpp
@@@ -19,8 -19,8 +19,6 @@@
  
  #include "videowidget.h"
  
--#ifndef Q_WS_QWS
--
  #include "backend.h"
  #include "debug.h"
  #include "mediaobject.h"
@@@ -178,12 -164,15 +176,17 @@@ void X11Renderer::setOverlay(
          WId windowId = m_renderWidget->winId();
          // Even if we have created a winId at this point, other X applications
          // need to be aware of it.
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+ #warning syncx
+ //         QApplication::syncX();
+ #else
          QApplication::syncX();
 -#endif
 -#if GST_VERSION >= GST_VERSION_CHECK(0,10,31,0)
++#endif // QT_VERSION
 +#if GST_VERSION >= GST_VERSION_CHECK (1,0,0,0)
 +        gst_video_overlay_set_window_handle(GST_VIDEO_OVERLAY(m_videoSink), windowId);
- #elif GST_VERSION <= GST_VERSION_CHECK (1,0,0,0)
++#elif GST_VERSION >= GST_VERSION_CHECK(0,10,31,0)
          gst_x_overlay_set_window_handle(GST_X_OVERLAY(m_videoSink), windowId);
 -#else
 +#elif GST_VERSION <= GST_VERSION_CHECK(0,10,31,0)
          gst_x_overlay_set_xwindow_id(GST_X_OVERLAY(m_videoSink), windowId);
  #endif // GST_VERSION
      }
@@@ -193,19 -182,14 +196,23 @@@
  
  void X11Renderer::windowExposed()
  {
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+ #warning syncx
+ //     QApplication::syncX();
+ #else
      QApplication::syncX();
 -#endif
 -    if (m_videoSink && GST_IS_X_OVERLAY(m_videoSink))
 +    if (m_videoSink &&
 +        #if GST_VERSION < GST_VERSION_CHECK (1,0,0,0)
 +            GST_IS_X_OVERLAY(m_videoSink)
 +        #else
 +            GST_IS_VIDEO_OVERLAY(m_videoSink)
 +        #endif
 +            )
 +#if GST_VERSION < GST_VERSION_CHECK (1,0,0,0)
          gst_x_overlay_expose(GST_X_OVERLAY(m_videoSink));
 +#else
 +        gst_video_overlay_expose(GST_VIDEO_OVERLAY(m_videoSink));
 +#endif
  }
  
  }
[prev in list] [next in list] [prev in thread] [next in thread]