From 1a66e839756d2c6b810bc7eacc7bb37132107be1 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Sat, 10 Feb 2001 14:46:37 +0000 Subject: [PATCH] - 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. --- gst/gstprops.c | 2 +- gst/gstscheduler.c | 1 + gstplay/gstmediaplay.c | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gst/gstprops.c b/gst/gstprops.c index 11a5a523ae..2828eb264b 100644 --- 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 b2230b2fa5..cc6fe46d0e 100644 --- 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 49276c6af1..24be408f5e 100644 --- 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);