From df941a9ca6fc6cea19c2c5776ddaa2e120000968 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 11 Dec 2001 16:42:09 +0000 Subject: [PATCH] Also swap the args in the callback function Original commit message from CVS: Also swap the args in the callback function --- gst/gstbin.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/gst/gstbin.c b/gst/gstbin.c index 5bfa479f51..42a3f96b64 100644 --- a/gst/gstbin.c +++ b/gst/gstbin.c @@ -45,8 +45,8 @@ static GstElementStateReturn gst_bin_change_state_norecurse (GstBin *bin); static gboolean gst_bin_change_state_type (GstBin *bin, GstElementState state, GType type); -static void gst_bin_child_state_change (GstBin *bin, GstElementState old, - GstElementState new, GstElement *child); +static void gst_bin_child_state_change (GstElement *child, GstElementState old, + GstElementState new, GstBin *bin); static gboolean gst_bin_iterate_func (GstBin *bin); @@ -358,7 +358,7 @@ gst_bin_remove (GstBin *bin, } static void -gst_bin_child_state_change (GstBin *bin, GstElementState old, GstElementState new, GstElement *child) +gst_bin_child_state_change (GstElement *child, GstElementState old, GstElementState new, GstBin *bin) { gint old_idx = 0, new_idx = 0, i; @@ -384,11 +384,6 @@ gst_bin_child_state_change (GstBin *bin, GstElementState old, GstElementState ne break; } } - // FIXME, need to setup this array at add/remove time - if (i<0) { - GST_STATE_PENDING (bin) = GST_STATE_NULL; - gst_bin_change_state_norecurse (bin); - } GST_UNLOCK (bin); } -- 2.34.1