/pidgin/main: 60647bc63acc: Bump GStreamer checks to 1.0.0 inste...

Elliott Sales de Andrade qulogic at pidgin.im
Mon Nov 5 18:16:00 EST 2012


Changeset: 60647bc63acc9dc26d2144f05734e2665c50dbe7
Author:	 Elliott Sales de Andrade <qulogic at pidgin.im>
Date:	 2012-09-15 03:17 -0400
Branch:	 default
URL: http://hg.pidgin.im/pidgin/main/rev/60647bc63acc

Description:

Bump GStreamer checks to 1.0.0 instead of 0.11.0.

This is the version that's going to be in actual released copies.

Fixes #15299.

diffstat:

 finch/gntsound.c              |   2 +-
 libpurple/media/backend-fs2.c |   8 ++++----
 libpurple/mediamanager.c      |  20 ++++++++++----------
 pidgin/gtkprefs.c             |  16 ++++++++--------
 pidgin/gtksound.c             |   2 +-
 5 files changed, 24 insertions(+), 24 deletions(-)

diffs (231 lines):

diff --git a/finch/gntsound.c b/finch/gntsound.c
--- a/finch/gntsound.c
+++ b/finch/gntsound.c
@@ -553,7 +553,7 @@ finch_sound_play_file(const char *filena
 		return;
 	}
 
-#if GST_CHECK_VERSION(0,11,0)
+#if GST_CHECK_VERSION(1,0,0)
 	play = gst_element_factory_make("playbin", "play");
 #else
 	play = gst_element_factory_make("playbin2", "play");
diff --git a/libpurple/media/backend-fs2.c b/libpurple/media/backend-fs2.c
--- a/libpurple/media/backend-fs2.c
+++ b/libpurple/media/backend-fs2.c
@@ -796,7 +796,7 @@ gst_msg_db_to_percent(GstMessage *msg, g
 	gdouble percent;
 
 	list = gst_structure_get_value(gst_message_get_structure(msg), value_name);
-#if GST_CHECK_VERSION(0,11,0)
+#if GST_CHECK_VERSION(1,0,0)
 	value = g_value_array_get_nth(g_value_get_boxed(list), 0);
 #else
 	value = gst_value_list_get_value(list, 0);
@@ -1573,7 +1573,7 @@ create_src(PurpleMediaBackendFs2 *self, 
 		srcpad = gst_element_get_static_pad(session->srcvalve, "src");
 		g_object_set(volume, "volume", input_volume, NULL);
 	} else {
-#if GST_CHECK_VERSION(0,11,0)
+#if GST_CHECK_VERSION(1,0,0)
 		srcpad = gst_element_get_request_pad(session->tee, "src_%u");
 #else
 		srcpad = gst_element_get_request_pad(session->tee, "src%d");
@@ -1817,7 +1817,7 @@ src_pad_added_cb(FsStream *fsstream, Gst
 			gst_element_link(stream->queue, stream->volume);
 			sink = stream->queue;
 		} else if (codec->media_type == FS_MEDIA_TYPE_VIDEO) {
-#if GST_CHECK_VERSION(0,11,0)
+#if GST_CHECK_VERSION(1,0,0)
 			stream->src = gst_element_factory_make("funnel", NULL);
 #else
 			stream->src = gst_element_factory_make("fsfunnel", NULL);
@@ -1836,7 +1836,7 @@ src_pad_added_cb(FsStream *fsstream, Gst
 		gst_element_link_many(stream->src, stream->tee, sink, NULL);
 	}
 
-#if GST_CHECK_VERSION(0,11,0)
+#if GST_CHECK_VERSION(1,0,0)
 	sinkpad = gst_element_get_request_pad(stream->src, "sink_%u");
 #else
 	sinkpad = gst_element_get_request_pad(stream->src, "sink%d");
diff --git a/libpurple/mediamanager.c b/libpurple/mediamanager.c
--- a/libpurple/mediamanager.c
+++ b/libpurple/mediamanager.c
@@ -44,7 +44,7 @@
 #else
 #include <farstream/fs-element-added-notifier.h>
 #endif
-#if GST_CHECK_VERSION(0,11,0)
+#if GST_CHECK_VERSION(1,0,0)
 #include <gst/video/videooverlay.h>
 #else
 #include <gst/interfaces/xoverlay.h>
@@ -274,7 +274,7 @@ purple_media_manager_get_pipeline(Purple
 		gst_bus_add_signal_watch(GST_BUS(bus));
 		g_signal_connect(G_OBJECT(bus), "message",
 				G_CALLBACK(pipeline_bus_call), manager);
-#if GST_CHECK_VERSION(0,11,0)
+#if GST_CHECK_VERSION(1,0,0)
 		gst_bus_set_sync_handler(bus, gst_bus_sync_signal_handler, NULL, NULL);
 #else
 		gst_bus_set_sync_handler(bus, gst_bus_sync_signal_handler, NULL);
@@ -408,7 +408,7 @@ request_pad_unlinked_cb(GstPad *pad, Gst
 {
 	GstElement *parent = GST_ELEMENT_PARENT(pad);
 	GstIterator *iter;
-#if GST_CHECK_VERSION(0,11,0)
+#if GST_CHECK_VERSION(1,0,0)
 	GValue tmp = G_VALUE_INIT;
 #endif
 	GstPad *remaining_pad;
@@ -418,7 +418,7 @@ request_pad_unlinked_cb(GstPad *pad, Gst
 
 	iter = gst_element_iterate_src_pads(parent);
 
-#if GST_CHECK_VERSION(0,11,0)
+#if GST_CHECK_VERSION(1,0,0)
 	result = gst_iterator_next(iter, &tmp);
 #else
 	result = gst_iterator_next(iter, (gpointer)&remaining_pad);
@@ -429,7 +429,7 @@ request_pad_unlinked_cb(GstPad *pad, Gst
 		gst_element_set_state(parent, GST_STATE_NULL);
 		gst_bin_remove(GST_BIN(GST_ELEMENT_PARENT(parent)), parent);
 	} else if (result == GST_ITERATOR_OK) {
-#if GST_CHECK_VERSION(0,11,0)
+#if GST_CHECK_VERSION(1,0,0)
 		remaining_pad = g_value_get_object(&tmp);
 		g_value_reset(&tmp);
 #endif
@@ -470,7 +470,7 @@ purple_media_manager_get_video_caps(Purp
 {
 #ifdef USE_VV
 	if (manager->priv->video_caps == NULL)
-#if GST_CHECK_VERSION(0,11,0)
+#if GST_CHECK_VERSION(1,0,0)
 		manager->priv->video_caps = gst_caps_from_string("video/x-raw,"
 #else
 		manager->priv->video_caps = gst_caps_from_string("video/x-raw-yuv,"
@@ -557,7 +557,7 @@ purple_media_manager_get_element(PurpleM
 		g_free(id);
 
 		tee = gst_bin_get_by_name(GST_BIN(ret), "tee");
-#if GST_CHECK_VERSION(0,11,0)
+#if GST_CHECK_VERSION(1,0,0)
 		pad = gst_element_get_request_pad(tee, "src_%u");
 #else
 		pad = gst_element_get_request_pad(tee, "src%d");
@@ -753,7 +753,7 @@ window_id_cb(GstBus *bus, GstMessage *ms
 	GstElement *sink;
 
 	if (GST_MESSAGE_TYPE(msg) != GST_MESSAGE_ELEMENT
-#if GST_CHECK_VERSION(0,11,0)
+#if GST_CHECK_VERSION(1,0,0)
 	 || !gst_is_video_overlay_prepare_window_handle_message(msg))
 #else
 	 || !gst_structure_has_name(msg->structure, "prepare-xwindow-id"))
@@ -771,7 +771,7 @@ window_id_cb(GstBus *bus, GstMessage *ms
 			| G_SIGNAL_MATCH_DATA, 0, 0, NULL,
 			window_id_cb, ow);
 
-#if GST_CHECK_VERSION(0,11,0)
+#if GST_CHECK_VERSION(1,0,0)
 	gst_video_overlay_set_window_handle(GST_VIDEO_OVERLAY(GST_MESSAGE_SRC(msg)),
 	                                    ow->window_id);
 #elif GST_CHECK_VERSION(0,10,31)
@@ -813,7 +813,7 @@ purple_media_manager_create_output_windo
 				continue;
 
 			queue = gst_element_factory_make("queue", NULL);
-#if GST_CHECK_VERSION(0,11,0)
+#if GST_CHECK_VERSION(1,0,0)
 			convert = gst_element_factory_make("videoconvert", NULL);
 #else
 			convert = gst_element_factory_make("ffmpegcolorspace", NULL);
diff --git a/pidgin/gtkprefs.c b/pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c
+++ b/pidgin/gtkprefs.c
@@ -59,7 +59,7 @@
 #include "pidginstock.h"
 #if USE_VV
 #include "media-gst.h"
-#if GST_CHECK_VERSION(0,11,0)
+#if GST_CHECK_VERSION(1,0,0)
 #include <gst/video/videooverlay.h>
 #else
 #include <gst/interfaces/xoverlay.h>
@@ -3007,7 +3007,7 @@ get_vv_element_devices(const gchar *elem
 	GList *ret = NULL;
 	GstElement *element;
 	GObjectClass *klass;
-#if !GST_CHECK_VERSION(0,11,0)
+#if !GST_CHECK_VERSION(1,0,0)
 	GstPropertyProbe *probe;
 	const GParamSpec *pspec;
 #endif
@@ -3033,7 +3033,7 @@ get_vv_element_devices(const gchar *elem
 		return g_list_reverse(ret);
 	}
 
-#if GST_CHECK_VERSION(0,11,0)
+#if GST_CHECK_VERSION(1,0,0)
 	purple_debug_info("vvconfig", "'%s' - no device\n", element_name);
 #else
 	if (!g_object_class_find_property(klass, "device") ||
@@ -3097,7 +3097,7 @@ get_vv_element_plugins(const gchar **plu
 	ret = g_list_prepend(ret, (gpointer)_("Default"));
 	ret = g_list_prepend(ret, "");
 	for (; plugins[0] && plugins[1]; plugins += 2) {
-#if GST_CHECK_VERSION(0,11,0)
+#if GST_CHECK_VERSION(1,0,0)
 		if (gst_registry_check_feature_version(gst_registry_get(),
 		                                       plugins[0], 0, 0, 0)) {
 #else
@@ -3270,7 +3270,7 @@ gst_msg_db_to_percent(GstMessage *msg, g
 	gdouble percent;
 
 	list = gst_structure_get_value(gst_message_get_structure(msg), value_name);
-#if GST_CHECK_VERSION(0,11,0)
+#if GST_CHECK_VERSION(1,0,0)
 	value = g_value_array_get_nth(g_value_get_boxed(list), 0);
 #else
 	value = gst_value_list_get_value(list, 0);
@@ -3477,7 +3477,7 @@ static void
 window_id_cb(GstBus *bus, GstMessage *msg, gulong window_id)
 {
 	if (GST_MESSAGE_TYPE(msg) != GST_MESSAGE_ELEMENT
-#if GST_CHECK_VERSION(0,11,0)
+#if GST_CHECK_VERSION(1,0,0)
 	 || !gst_is_video_overlay_prepare_window_handle_message(msg))
 #else
 	 || !gst_structure_has_name(msg->structure, "prepare-xwindow-id"))
@@ -3489,7 +3489,7 @@ window_id_cb(GstBus *bus, GstMessage *ms
 	                                     0, 0, NULL, window_id_cb,
 	                                     (gpointer)window_id);
 
-#if GST_CHECK_VERSION(0,11,0)
+#if GST_CHECK_VERSION(1,0,0)
 	gst_video_overlay_set_window_handle(GST_VIDEO_OVERLAY(GST_MESSAGE_SRC(msg)),
 	                                    window_id);
 #elif GST_CHECK_VERSION(0,10,31)
@@ -3522,7 +3522,7 @@ toggle_video_test_cb(GtkToggleButton *te
 
 		video_pipeline = create_video_pipeline();
 		bus = gst_pipeline_get_bus(GST_PIPELINE(video_pipeline));
-#if GST_CHECK_VERSION(0,11,0)
+#if GST_CHECK_VERSION(1,0,0)
 		gst_bus_set_sync_handler(bus, gst_bus_sync_signal_handler, NULL, NULL);
 #else
 		gst_bus_set_sync_handler(bus, gst_bus_sync_signal_handler, NULL);
diff --git a/pidgin/gtksound.c b/pidgin/gtksound.c
--- a/pidgin/gtksound.c
+++ b/pidgin/gtksound.c
@@ -527,7 +527,7 @@ pidgin_sound_play_file(const char *filen
 		return;
 	}
 
-#if GST_CHECK_VERSION(0,11,0)
+#if GST_CHECK_VERSION(1,0,0)
 	play = gst_element_factory_make("playbin", "play");
 #else
 	play = gst_element_factory_make("playbin2", "play");



More information about the Commits mailing list