- backported the xml load bug in the properties

Original commit message from CVS:
- backported the xml load bug in the properties
- backported the videosink bug
- make sure the regiontype is set to NONE after a getregion
- an ugly fix (copy the chainfunction outselves) to make the avidecoder
work again.

diff --git a/gst/gstprops.c b/gst/gstprops.c
index 11a5a523ae34ea67d2fd3a5faaf6b48844389fdc..2828eb264b88271253b59774fec59811f81a3721 100644 (file)
--- a/gst/gstprops.c
+++ b/gst/gstprops.c
@@ -578,7 +578,7 @@ gst_props_load_thyself_func (xmlNodePtr field)
     prop = xmlGetProp (field, "min");
     sscanf (prop, "%d", &entry->data.int_range_data.min);
     g_free (prop);
-    prop = xmlGetProp (field, "min");
+    prop = xmlGetProp (field, "max");
     sscanf (prop, "%d", &entry->data.int_range_data.max);
     g_free (prop);
   }

diff --git a/gst/gstscheduler.c b/gst/gstscheduler.c
index b2230b2fa5d81f8afbeebb8b92681c9905d73e45..cc6fe46d0e72245a512eab08fa9e42f46b988f8b 100644 (file)
--- a/gst/gstscheduler.c
+++ b/gst/gstscheduler.c
@@ -105,6 +105,7 @@ gst_bin_src_wrapper (int argc,char *argv[])
 //            fprintf(stderr,"error, no getregionfunc in \"%s\"\n", name);
 //          else
           buf = (GST_RPAD_GETREGIONFUNC(realpad))((GstPad*)realpad,realpad->regiontype,realpad->offset,realpad->len);
+         realpad->regiontype = GST_REGION_NONE;
         } else {
           g_return_val_if_fail (GST_RPAD_GETFUNC(realpad) != NULL, 0);
 //          if (GST_RPAD_GETFUNC(realpad) == NULL)

diff --git a/gstplay/gstmediaplay.c b/gstplay/gstmediaplay.c
index 49276c6af1d1884a41bc6b6ec8221bf0e4da36e9..24be408f5e4167a08ccb780db0202049bb55cb6c 100644 (file)
--- a/gstplay/gstmediaplay.c
+++ b/gstplay/gstmediaplay.c
@@ -412,6 +412,8 @@ gst_media_play_frame_displayed (GstPlay *play,
   size           = gst_play_get_media_size (play);
   current_offset = gst_play_get_media_offset (play);
 
+  //g_print ("%lu %lu %lu %lu\n", current_time, total_time, size, current_offset);
+
   if (current_time != mplay->last_time) {
     gdk_threads_enter ();
     gst_media_play_update_status_area (mplay, current_time, total_time);