/pidgin/main: 1ede0ced4e60: Fix request pad names.

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


Changeset: 1ede0ced4e60baaac571d4668ac8c86f00ad523a
Author:	 Elliott Sales de Andrade <qulogic at pidgin.im>
Date:	 2012-09-09 03:37 -0400
Branch:	 default
URL: http://hg.pidgin.im/pidgin/main/rev/1ede0ced4e60

Description:

Fix request pad names.

diffstat:

 libpurple/media/backend-fs2.c |  8 ++++++++
 libpurple/mediamanager.c      |  4 ++++
 2 files changed, 12 insertions(+), 0 deletions(-)

diffs (42 lines):

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
@@ -1570,7 +1570,11 @@ 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)
+		srcpad = gst_element_get_request_pad(session->tee, "src_%u");
+#else
 		srcpad = gst_element_get_request_pad(session->tee, "src%d");
+#endif
 	}
 
 	purple_debug_info("backend-fs2", "connecting pad: %s\n",
@@ -1831,7 +1835,11 @@ src_pad_added_cb(FsStream *fsstream, Gst
 		gst_element_link_many(stream->src, stream->tee, sink, NULL);
 	}
 
+#if GST_CHECK_VERSION(0,11,0)
+	sinkpad = gst_element_get_request_pad(stream->src, "sink_%u");
+#else
 	sinkpad = gst_element_get_request_pad(stream->src, "sink%d");
+#endif
 	gst_pad_link(srcpad, sinkpad);
 	gst_object_unref(sinkpad);
 
diff --git a/libpurple/mediamanager.c b/libpurple/mediamanager.c
--- a/libpurple/mediamanager.c
+++ b/libpurple/mediamanager.c
@@ -546,7 +546,11 @@ 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)
+		pad = gst_element_get_request_pad(tee, "src_%u");
+#else
 		pad = gst_element_get_request_pad(tee, "src%d");
+#endif
 		gst_object_unref(tee);
 		ghost = gst_ghost_pad_new(NULL, pad);
 		gst_object_unref(pad);



More information about the Commits mailing list