diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-10-28 11:19:51 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-10-28 11:19:51 +0000 |
| commit | 316cb8a157dd55fda5e43fc6884e7bed5d334597 (patch) | |
| tree | d1cd4155cbe8970669970da70ccb3ea28f110655 /src | |
| parent | 14ef73ac5771672f9b6a53d05e1d7abf722fd1b1 (diff) | |
| download | xine-lib-316cb8a157dd55fda5e43fc6884e7bed5d334597.tar.gz xine-lib-316cb8a157dd55fda5e43fc6884e7bed5d334597.tar.bz2 | |
do not flush on xine_handle_stream_end
CVS patchset: 3064
CVS date: 2002/10/28 11:19:51
Diffstat (limited to 'src')
| -rw-r--r-- | src/xine-engine/demux.c | 4 | ||||
| -rw-r--r-- | src/xine-engine/xine.c | 3 |
2 files changed, 3 insertions, 4 deletions
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 |