diff options
| author | Guenter Bartsch <guenter@users.sourceforge.net> | 2002-03-11 12:31:24 +0000 |
|---|---|---|
| committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2002-03-11 12:31:24 +0000 |
| commit | face806c1ee187c1efbaa88313c955b9947948db (patch) | |
| tree | 974813b717201ac54afa760bac32a69f1a42addc /src/xine-engine/audio_decoder.c | |
| parent | 36a843032b4e28aa294ce0795fd96d76c57e3304 (diff) | |
| download | xine-lib-face806c1ee187c1efbaa88313c955b9947948db.tar.gz xine-lib-face806c1ee187c1efbaa88313c955b9947948db.tar.bz2 | |
metronom and demuxers should work again (although not all demuxers are fully updated at this point). demux_qt can handle compressed audio, but is still unfinished.
Yes, this _is_ the big metronom update, metronom now depends on disc_off information in discontinuities.
CVS patchset: 1554
CVS date: 2002/03/11 12:31:24
Diffstat (limited to 'src/xine-engine/audio_decoder.c')
| -rw-r--r-- | src/xine-engine/audio_decoder.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c index f329db056..2e4c9f5c8 100644 --- a/src/xine-engine/audio_decoder.c +++ b/src/xine-engine/audio_decoder.c @@ -1,7 +1,7 @@ /* - * Copyright (C) 2000-2001 the xine project + * Copyright (C) 2000-2002 the xine project * - * This file is part of xine, a unix video player. + * This file is part of xine, a free video player. * * xine is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -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: audio_decoder.c,v 1.63 2002/03/10 21:43:30 miguelfreitas Exp $ + * $Id: audio_decoder.c,v 1.64 2002/03/11 12:31:26 guenter Exp $ * * * functions that implement audio decoding @@ -84,7 +84,7 @@ void *audio_decoder_loop (void *this_gen) { this->audio_finished = 0; pthread_mutex_unlock (&this->finished_lock); - this->metronom->expect_audio_discontinuity (this->metronom); + this->metronom->audio_stream_start (this->metronom); break; @@ -98,7 +98,7 @@ void *audio_decoder_loop (void *this_gen) { pthread_mutex_lock (&this->finished_lock); - if (!this->audio_finished && (buf->decoder_info[0]==0)) { + if (!this->audio_finished && (buf->decoder_flags==BUF_FLAG_END_USER)) { this->audio_finished = 1; if (this->video_finished) { @@ -131,7 +131,7 @@ void *audio_decoder_loop (void *this_gen) { case BUF_CONTROL_DISCONTINUITY: printf ("audio_decoder: discontinuity ahead\n"); - this->metronom->expect_audio_discontinuity (this->metronom); + this->metronom->expect_audio_discontinuity (this->metronom, buf->disc_off); break; case BUF_CONTROL_AUDIO_CHANNEL: |