debugging fixes

Original commit message from CVS:
debugging fixes

diff --git a/gst/gstbin.c b/gst/gstbin.c
index 3ae14d48c808dec0a83d7eed048c8ba00c819f57..27bbebcab51518b29daf3488f48a60548fe9a6e3 100644 (file)
--- a/gst/gstbin.c
+++ b/gst/gstbin.c
@@ -665,11 +665,14 @@ static void
 gst_bin_child_state_change_func (GstBin * bin, GstElementState oldstate,
     GstElementState newstate, GstElement * child)
 {
 gst_bin_child_state_change_func (GstBin * bin, GstElementState oldstate,
     GstElementState newstate, GstElement * child)
 {

+  GstElementState old = 0, new = 0;

   gint old_idx = 0, new_idx = 0, i;
 
   gint old_idx = 0, new_idx = 0, i;
 

-  while (oldstate >>= 1)
+  old = oldstate;
+  new = newstate;
+  while (old >>= 1)

     old_idx++;
     old_idx++;

-  while (newstate >>= 1)
+  while (new >>= 1)

     new_idx++;
 
   GST_LOCK (bin);
     new_idx++;
 
   GST_LOCK (bin);

diff --git a/gst/gstelement.c b/gst/gstelement.c
index 6dd45cb4fc834bf6b0317ac3385b3a508be7837f..63108ab2d52352abe97644211158cded007dd83a 100644 (file)
--- a/gst/gstelement.c
+++ b/gst/gstelement.c
@@ -2918,9 +2918,9 @@ gst_element_pads_activate (GstElement * element, gboolean active)
 static GstElementStateReturn
 gst_element_change_state (GstElement * element)
 {
 static GstElementStateReturn
 gst_element_change_state (GstElement * element)
 {

-  GstElementState old_state;
+  GstElementState old_state, old_pending;

   GstObject *parent;
   GstObject *parent;

-  gint old_pending, old_transition;
+  gint old_transition;

 
   g_return_val_if_fail (GST_IS_ELEMENT (element), GST_STATE_FAILURE);
 
 
   g_return_val_if_fail (GST_IS_ELEMENT (element), GST_STATE_FAILURE);