diff options
| -rw-r--r-- | src/input/input_dvd.c | 10 | ||||
| -rw-r--r-- | src/xine-engine/demux.c | 3 | ||||
| -rw-r--r-- | src/xine-engine/xine.c | 10 |
3 files changed, 12 insertions, 11 deletions
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index 8d3ac5f48..94d74f08a 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.c @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: input_dvd.c,v 1.118 2002/11/20 11:57:42 mroi Exp $ + * $Id: input_dvd.c,v 1.119 2002/11/22 16:23:58 mroi Exp $ * */ @@ -790,9 +790,6 @@ static void flush_buffers(dvd_input_plugin_t *this) { if (stream->audio_out) { stream->audio_out->flush(stream->audio_out); } - - this->stream->xine->clock->adjust_clock(this->stream->xine->clock, - this->stream->xine->clock->get_current_time(this->stream->xine->clock) + 30 * 90000 ); } static void xine_dvd_send_button_update(dvd_input_plugin_t *this, int mode) { @@ -1664,6 +1661,11 @@ static void *init_class (xine_t *xine, void *data) { /* * $Log: input_dvd.c,v $ + * Revision 1.119 2002/11/22 16:23:58 mroi + * do not play with the clock any more, we have dedicated flush functions for that now + * (This should fix Daniels MP3 problems, since the end of one stream would + * have adjusted the global clock thus affecting all other streams.) + * * Revision 1.118 2002/11/20 11:57:42 mroi * engine modifications to allow post plugin layer: * * new public output interface xine_{audio,video}_port_t instead of diff --git a/src/xine-engine/demux.c b/src/xine-engine/demux.c index 54edcbe97..027743ed2 100644 --- a/src/xine-engine/demux.c +++ b/src/xine-engine/demux.c @@ -65,9 +65,6 @@ void xine_demux_flush_engine (xine_stream_t *stream) { if (stream->audio_out) { stream->audio_out->flush(stream->audio_out); } - - stream->xine->clock->adjust_clock(stream->xine->clock, - stream->xine->clock->get_current_time(stream->xine->clock) + 30 * 90000 ); } diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index 80c0f9686..b71acb94e 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine.c,v 1.194 2002/11/20 11:57:49 mroi Exp $ + * $Id: xine.c,v 1.195 2002/11/22 16:23:59 mroi Exp $ * * top-level xine functions * @@ -198,10 +198,12 @@ void xine_stop (xine_stream_t *stream) { /* * stream will make output threads discard about everything - * am i abusing of xine architeture? :) */ - stream->xine->clock->adjust_clock (stream->xine->clock, - stream->xine->clock->get_current_time(stream->xine->clock) + 30 * 90000 ); + if (stream->audio_out) + stream->audio_out->flush(stream->audio_out); + + if (stream->video_out) + stream->video_out->flush(stream->video_out); pthread_mutex_unlock (&stream->frontend_lock); } |