media: ensure nonunique source is removed from pipeline when unlinked

Thu, 02 Oct 2014 23:46:22 +0200

author
Jakub Adam <jakub.adam@ktknet.cz>
date
Thu, 02 Oct 2014 23:46:22 +0200
changeset 36326
f80210352fb3
parent 36323
c372f69a051e
child 36327
8a6f23f61052

media: ensure nonunique source is removed from pipeline when unlinked

libpurple/mediamanager.c file | annotate | diff | comparison | revisions
--- a/libpurple/mediamanager.c	Fri Mar 13 13:43:39 2015 +0000
+++ b/libpurple/mediamanager.c	Thu Oct 02 23:46:22 2014 +0200
@@ -422,6 +422,16 @@
 
 	gst_iterator_free(iter);
 }
+
+static void
+nonunique_src_unlinked_cb(GstPad *pad, GstPad *peer, gpointer user_data)
+{
+	GstElement *element = GST_ELEMENT_PARENT(pad);
+	gst_element_set_locked_state(element, TRUE);
+	gst_element_set_state(element, GST_STATE_NULL);
+	gst_bin_remove(GST_BIN(GST_ELEMENT_PARENT(element)), element);
+}
+
 #endif
 
 #ifdef USE_GSTREAMER
@@ -561,6 +571,10 @@
 		ret = purple_media_element_info_call_create(info,
 				media, session_id, participant);
 		if (element_type & PURPLE_MEDIA_ELEMENT_SRC) {
+			GstPad *pad = gst_element_get_static_pad(ret, "src");
+			g_signal_connect(pad, "unlinked",
+					G_CALLBACK(nonunique_src_unlinked_cb), NULL);
+			gst_object_unref(pad);
 			gst_object_ref(ret);
 			gst_bin_add(GST_BIN(purple_media_manager_get_pipeline(manager)),
 				ret);

mercurial