mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-11 01:45:33 +00:00
Also swap the args in the callback function
Original commit message from CVS: Also swap the args in the callback function
This commit is contained in:
parent
4d22077446
commit
df941a9ca6
1 changed files with 3 additions and 8 deletions
11
gst/gstbin.c
11
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);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue