Also swap the args in the callback function

Original commit message from CVS:
Also swap the args in the callback function

diff --git a/gst/gstbin.c b/gst/gstbin.c
index 5bfa479f51a3e6edf21c33c7f7e4bb3474396221..42a3f96b6448812d47ea6e04293fdc3410ce2887 100644 (file)
--- 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 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);
 
 
 static gboolean                        gst_bin_iterate_func            (GstBin *bin);
 


@@ -358,7 +358,7 @@ gst_bin_remove (GstBin *bin,
 }
 
 static void
 }
 
 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;
 
 {
   gint old_idx = 0, new_idx = 0, i;
 


@@ -384,11 +384,6 @@ gst_bin_child_state_change (GstBin *bin, GstElementState old, GstElementState ne
       break;
     }
   }
       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);
 }
          
   GST_UNLOCK (bin);
 }