diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sys/oss/gstosssink.c | 13 |
2 files changed, 15 insertions, 4 deletions
@@ -1,3 +1,9 @@ +2004-03-08 Thomas Vander Stichele <thomas at apestaart dot org> + + * sys/oss/gstosssink.c: (gst_osssink_get_delay), + (gst_osssink_get_time): + add a warning, IMO this won't get triggered anymore, remove later + 2004-03-07 David Schleef <ds@schleef.org> * gst/qtdemux/qtdemux.c: (qtdemux_video_caps): Added Cinepak diff --git a/sys/oss/gstosssink.c b/sys/oss/gstosssink.c index 839321f3..9e6a253e 100644 --- a/sys/oss/gstosssink.c +++ b/sys/oss/gstosssink.c @@ -296,12 +296,17 @@ gst_osssink_get_time (GstClock *clock, gpointer data) delay = gst_osssink_get_delay (osssink); - /* sometimes delay is bigger than the number of bytes sent to the device, - * which screws up this calculation, we assume that everything is still - * in the device then */ + /* sometimes delay is bigger than the number of bytes sent to the device, + * which screws up this calculation, we assume that everything is still + * in the device then + * thomas: with proper handling of the return value, this doesn't seem to + * happen anymore, so remove the second code path after april 2004 */ if (delay < 0) { delay = 0; - } else if (((guint64) delay) > osssink->handled) { + } else if ((guint64) delay > osssink->handled) { + g_warning ("Delay %d > osssink->handled %" G_GUINT64_FORMAT + ", setting to osssink->handled", + delay, osssink->handled); delay = osssink->handled; } res = (osssink->handled - delay) * GST_SECOND / GST_OSSELEMENT (osssink)->bps; |