From 316cb8a157dd55fda5e43fc6884e7bed5d334597 Mon Sep 17 00:00:00 2001
From: Miguel Freitas <miguelfreitas@users.sourceforge.net>
Date: Mon, 28 Oct 2002 11:19:51 +0000
Subject: do not flush on xine_handle_stream_end

CVS patchset: 3064
CVS date: 2002/10/28 11:19:51
---
 src/xine-engine/demux.c | 4 +---
 src/xine-engine/xine.c  | 3 ++-
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/xine-engine/demux.c b/src/xine-engine/demux.c
index 1fb4dac2c..7ccfaa8b4 100644
--- a/src/xine-engine/demux.c
+++ b/src/xine-engine/demux.c
@@ -226,7 +226,7 @@ int xine_demux_stop_thread (xine_stream_t *stream) {
   pthread_mutex_unlock( &stream->demux_lock );
 
 #ifdef LOG
-  printf ("demux: joining thread %d\n", stream->demux_thread );
+  printf ("demux: joining thread %ld\n", stream->demux_thread );
 #endif
   
   /* FIXME: counter_lock isn't meant to protect demux_thread update.
@@ -240,7 +240,5 @@ int xine_demux_stop_thread (xine_stream_t *stream) {
   
   pthread_mutex_unlock (&stream->counter_lock);
     
-  xine_demux_flush_engine(stream);
-  
   return 0;
 }
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 8bf736c54..02f4abf9b 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.178 2002/10/28 03:24:43 miguelfreitas Exp $
+ * $Id: xine.c,v 1.179 2002/10/28 11:19:51 miguelfreitas Exp $
  *
  * top-level xine functions
  *
@@ -165,6 +165,7 @@ static void xine_stop_internal (xine_stream_t *stream) {
   if (stream->demux_plugin) {
     
     xine_demux_stop_thread( stream );
+    xine_demux_flush_engine( stream );
 
     /*
      * wait until engine has really stopped
-- 
cgit v1.2.3