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

List:       kde-commits
Subject:    =?utf-8?q?=5Bphonon-gstreamer=5D_gstreamer=3A_only_use_new_api_i?=
From:       Harald Sitter <sitter () kde ! org>
Date:       2011-02-16 19:28:35
Message-ID: 20110216192835.4EF39A609B () git ! kde ! org
[Download RAW message or body]

Git commit 26a897a94cc38e9adcabfa36d647f52d48b040c1 by Harald Sitter.
Committed on 16/02/2011 at 20:28.
Pushed by sitter into branch 'master'.

only use new api if present gst version is recent enough

M  +6    -2    gstreamer/x11renderer.cpp     

http://commits.kde.org/phonon-gstreamer/26a897a94cc38e9adcabfa36d647f52d48b040c1

diff --git a/gstreamer/x11renderer.cpp b/gstreamer/x11renderer.cpp
index f773dcf..0fed143 100644
--- a/gstreamer/x11renderer.cpp
+++ b/gstreamer/x11renderer.cpp
@@ -103,7 +103,7 @@ GstElement* X11Renderer::createVideoSink()
     QByteArray tegraEnv = qgetenv("TEGRA_GST_OPENMAX");
     if(!tegraEnv.isEmpty())
     {
-        videoSink = gst_element_factory_make ("nv_gl_videosink", NULL);    
+        videoSink = gst_element_factory_make ("nv_gl_videosink", NULL);
     }
     if (!videoSink)
         videoSink = gst_element_factory_make ("ximagesink", NULL);
@@ -179,7 +179,11 @@ void X11Renderer::setOverlay()
         // Even if we have created a winId at this point, other X applications
         // need to be aware of it.
         QApplication::syncX();
-        gst_x_overlay_set_window_handle( GST_X_OVERLAY(m_videoSink), windowId );
+#if GST_VERSION >= GST_VERSION_CHECK(0,10,31,0)
+        gst_x_overlay_set_window_handle(GST_X_OVERLAY(m_videoSink), windowId);
+#else
+        gst_x_overlay_set_xwindow_id(GST_X_OVERLAY(m_videoSink), windowId);
+#endif // GST_VERSION
     }
     windowExposed();
     m_overlaySet = true;

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