summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThibaut Mattern <tmattern@users.sourceforge.net>2002-05-15 22:50:59 +0000
committerThibaut Mattern <tmattern@users.sourceforge.net>2002-05-15 22:50:59 +0000
commit8a71715d603eac788c83299c15b2ea6e8f3b9b87 (patch)
treefa6297089f8c5a0a1e0c4e8f88fff0ebdcebe582 /src
parent0ce4bfbfc30b5d1ec1ed340036709dedb4d6bc4f (diff)
downloadxine-lib-8a71715d603eac788c83299c15b2ea6e8f3b9b87.tar.gz
xine-lib-8a71715d603eac788c83299c15b2ea6e8f3b9b87.tar.bz2
Use audio_fifo instead of video_fifo in demux_loop.
CVS patchset: 1895 CVS date: 2002/05/15 22:50:59
Diffstat (limited to 'src')
-rw-r--r--src/demuxers/demux_cda.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/demuxers/demux_cda.c b/src/demuxers/demux_cda.c
index e46b3a412..f0bff2e1a 100644
--- a/src/demuxers/demux_cda.c
+++ b/src/demuxers/demux_cda.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: demux_cda.c,v 1.14 2002/05/15 22:02:48 tmattern Exp $
+ * $Id: demux_cda.c,v 1.15 2002/05/15 22:50:59 tmattern Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -109,7 +109,7 @@ static void *demux_cda_loop (void *this_gen) {
}
/* wait before sending end buffers: user might want to do a new seek */
- while(this->send_end_buffers && this->video_fifo->size(this->video_fifo) &&
+ while(this->send_end_buffers && this->audio_fifo->size(this->audio_fifo) &&
this->status != DEMUX_OK){
pthread_mutex_unlock( &this->mutex );
xine_usec_sleep(100000);
@@ -156,17 +156,14 @@ static void demux_cda_stop (demux_plugin_t *this_gen) {
}
/* Force stop */
- printf ("demux_cda: before input->stop\n");
this->input->stop(this->input);
this->send_end_buffers = 0;
this->status = DEMUX_FINISHED;
- printf ("demux_cda: before pthread_join\n");
pthread_mutex_unlock( &this->mutex );
pthread_join (this->thread, &p);
- printf ("demux_cda: before flush_engine\n");
xine_flush_engine(this->xine);
buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);