From 4713bb3abcf5b8722565c3872fc9a6fb1e0f7f23 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Tue, 10 Feb 2009 20:38:58 -0800 Subject: [PATCH] Revert "Remove pad-removed handlers after setting the decodebins to NULL." This reverts commit b36d8f3e119f9edc5993c08025614ee32642972e. This brought back some deadlocks. A small leak is better, for now. Need to figure out a way to fix the leak properly. --- gst/playback/gstplaybin2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c index b86b03d..6244994 100644 --- a/gst/playback/gstplaybin2.c +++ b/gst/playback/gstplaybin2.c @@ -2139,13 +2139,13 @@ activate_group (GstPlayBin * playbin, GstSourceGroup * group) if (group->uridecodebin) { GST_DEBUG_OBJECT (playbin, "reusing existing uridecodebin"); REMOVE_SIGNAL (group->uridecodebin, group->pad_added_id); + REMOVE_SIGNAL (group->uridecodebin, group->pad_removed_id); REMOVE_SIGNAL (group->uridecodebin, group->no_more_pads_id); REMOVE_SIGNAL (group->uridecodebin, group->notify_source_id); REMOVE_SIGNAL (group->uridecodebin, group->drained_id); REMOVE_SIGNAL (group->uridecodebin, group->autoplug_factories_id); REMOVE_SIGNAL (group->uridecodebin, group->autoplug_select_id); gst_element_set_state (group->uridecodebin, GST_STATE_NULL); - REMOVE_SIGNAL (group->uridecodebin, group->pad_removed_id); uridecodebin = group->uridecodebin; } else { GST_DEBUG_OBJECT (playbin, "making new uridecodebin"); @@ -2198,9 +2198,9 @@ activate_group (GstPlayBin * playbin, GstSourceGroup * group) if (group->suburidecodebin) { GST_DEBUG_OBJECT (playbin, "reusing existing suburidecodebin"); REMOVE_SIGNAL (group->suburidecodebin, group->sub_pad_added_id); + REMOVE_SIGNAL (group->suburidecodebin, group->sub_pad_removed_id); REMOVE_SIGNAL (group->suburidecodebin, group->sub_no_more_pads_id); gst_element_set_state (group->suburidecodebin, GST_STATE_NULL); - REMOVE_SIGNAL (group->suburidecodebin, group->sub_pad_removed_id); suburidecodebin = group->suburidecodebin; } else { GST_DEBUG_OBJECT (playbin, "making new suburidecodebin"); -- 2.7.4