From f04b458d87a90e04c866e970733d0888ced2377c Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Wed, 10 Nov 2004 22:01:19 +0000 Subject: [PATCH] ext/alsa/gstalsasink.c: This seems to be antique leftover. It needs to pass error checking. Original commit message from CVS: * ext/alsa/gstalsasink.c: (gst_alsa_sink_get_time): This seems to be antique leftover. It needs to pass error checking. * ext/sdl/sdlvideosink.c: (gst_sdlvideosink_init), (gst_sdlvideosink_deinitsdl), (gst_sdlvideosink_initsdl), (gst_sdlvideosink_destroy), (gst_sdlvideosink_create), (gst_sdlvideosink_sinkconnect), (gst_sdlvideosink_chain): Fix GstXOverlay implementation (#151059). --- ChangeLog | 11 +++++++++++ ext/alsa/gstalsasink.c | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d9a1528..b6b3534 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ 2004-11-10 Ronald S. Bultje + * ext/alsa/gstalsasink.c: (gst_alsa_sink_get_time): + This seems to be antique leftover. It needs to pass error + checking. + * ext/sdl/sdlvideosink.c: (gst_sdlvideosink_init), + (gst_sdlvideosink_deinitsdl), (gst_sdlvideosink_initsdl), + (gst_sdlvideosink_destroy), (gst_sdlvideosink_create), + (gst_sdlvideosink_sinkconnect), (gst_sdlvideosink_chain): + Fix GstXOverlay implementation (#151059). + +2004-11-10 Ronald S. Bultje + * gst/playback/gstplaybasebin.c: (gst_play_base_bin_change_state): Don't assert (#157853). diff --git a/ext/alsa/gstalsasink.c b/ext/alsa/gstalsasink.c index 897c533..25a1685 100644 --- a/ext/alsa/gstalsasink.c +++ b/ext/alsa/gstalsasink.c @@ -576,7 +576,7 @@ gst_alsa_sink_get_time (GstAlsa * this) if (!GST_FLAG_IS_SET (this, GST_ALSA_RUNNING)) { delay = 0; } else if (snd_pcm_delay (this->handle, &delay) != 0) { - return this->played / this->format->rate; + delay = 0; } if (this->played <= delay) { return 0; -- 2.7.4