/pidgin/main: b9d34920e752: Replace GstXOverlay with GstVideoOve...

[Elliott Sales de Andrade]

Changeset: b9d34920e752f5cf168a891fa801b3416e2d85e8
Author:	 Elliott Sales de Andrade <qulogic at pidgin.im>
Date:	 2012-09-02 03:46 -0400
Branch:	 default
URL: http://hg.pidgin.im/pidgin/main/rev/b9d34920e752

Description:

Replace GstXOverlay with GstVideoOverlay.

diffstat:

 configure.ac             |   2 +-
 libpurple/mediamanager.c |  18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diffs (55 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -840,7 +840,7 @@ AC_ARG_ENABLE(gstreamer,
 	[AC_HELP_STRING([--disable-gstreamer], [compile without GStreamer audio support])],
 	enable_gst="$enableval", enable_gst="yes")
 if test "x$enable_gst" != "xno"; then
-	PKG_CHECK_MODULES(GSTREAMER, [gstreamer-1.0], [
+	PKG_CHECK_MODULES(GSTREAMER, [gstreamer-1.0 gstreamer-video-1.0], [
 		AC_DEFINE(USE_GSTREAMER, 1, [Use GStreamer for playing sounds])
 		enable_gst="11"
 		AC_SUBST(GSTREAMER_CFLAGS)
diff --git a/libpurple/mediamanager.c b/libpurple/mediamanager.c
--- a/libpurple/mediamanager.c
+++ b/libpurple/mediamanager.c
@@ -44,7 +44,11 @@
 #else
 #include <farstream/fs-element-added-notifier.h>
 #endif
+#if GST_CHECK_VERSION(0,11,0)
+#include <gst/video/videooverlay.h>
+#else
 #include <gst/interfaces/xoverlay.h>
+#endif
 
 /** @copydoc _PurpleMediaManagerPrivate */
 typedef struct _PurpleMediaManagerPrivate PurpleMediaManagerPrivate;
@@ -726,9 +730,12 @@ window_id_cb(GstBus *bus, GstMessage *ms
 {
 	GstElement *sink;
 
-	if (GST_MESSAGE_TYPE(msg) != GST_MESSAGE_ELEMENT ||
-			!gst_structure_has_name(msg->structure,
-			"prepare-xwindow-id"))
+	if (GST_MESSAGE_TYPE(msg) != GST_MESSAGE_ELEMENT
+#if GST_CHECK_VERSION(0,11,0)
+	 || !gst_is_video_overlay_prepare_window_handle_message(msg))
+#else
+	 || !gst_structure_has_name(msg->structure, "prepare-xwindow-id"))
+#endif
 		return;
 
 	sink = GST_ELEMENT(GST_MESSAGE_SRC(msg));
@@ -742,7 +749,10 @@ window_id_cb(GstBus *bus, GstMessage *ms
 			| G_SIGNAL_MATCH_DATA, 0, 0, NULL,
 			window_id_cb, ow);
 
-#if GST_CHECK_VERSION(0,10,31)
+#if GST_CHECK_VERSION(0,11,0)
+	gst_video_overlay_set_window_handle(GST_VIDEO_OVERLAY(GST_MESSAGE_SRC(msg)),
+	                                    ow->window_id);
+#elif GST_CHECK_VERSION(0,10,31)
 	gst_x_overlay_set_window_handle(GST_X_OVERLAY(GST_MESSAGE_SRC(msg)),
 	                                ow->window_id);
 #else