diff options
| -rw-r--r-- | src/xine-engine/audio_decoder.c | 6 | ||||
| -rw-r--r-- | src/xine-engine/audio_out.c | 6 | ||||
| -rw-r--r-- | src/xine-engine/load_plugins.c | 10 | ||||
| -rw-r--r-- | src/xine-engine/xine.c | 3 |
4 files changed, 10 insertions, 15 deletions
diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c index 64aedf762..68ab6e0ea 100644 --- a/src/xine-engine/audio_decoder.c +++ b/src/xine-engine/audio_decoder.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: audio_decoder.c,v 1.100 2003/01/09 02:44:39 miguelfreitas Exp $ + * $Id: audio_decoder.c,v 1.101 2003/01/13 23:02:41 miguelfreitas Exp $ * * * functions that implement audio decoding @@ -384,10 +384,6 @@ void audio_decoder_shutdown (xine_stream_t *stream) { pthread_join (stream->audio_thread, &p); } - if(stream->audio_out) { - stream->audio_out->exit (stream->audio_out); - stream->audio_out = NULL; - } if (stream->audio_fifo) { stream->audio_fifo->dispose (stream->audio_fifo); stream->audio_fifo = NULL; diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c index 3ec9d422b..02303da4f 100644 --- a/src/xine-engine/audio_out.c +++ b/src/xine-engine/audio_out.c @@ -17,7 +17,7 @@ * along with self program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_out.c,v 1.99 2003/01/11 19:06:52 guenter Exp $ + * $Id: audio_out.c,v 1.100 2003/01/13 23:02:51 miguelfreitas Exp $ * * 22-8-2001 James imported some useful AC3 sections from the previous alsa driver. * (c) 2001 Andy Lo A Foe <andy@alsaplayer.org> @@ -757,11 +757,11 @@ int xine_get_next_audio_frame (xine_audio_port_t *this_gen, audio_buffer_t *buf; xine_stream_t *stream; - while (!stream) { + do { stream = xine_list_first_content(this->streams); if (!stream) xine_usec_sleep (1000); - } + } while( !stream ); pthread_mutex_lock (&this->out_fifo->mutex); diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index 2f3034176..f61c3f101 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.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: load_plugins.c,v 1.133 2003/01/13 17:43:11 mroi Exp $ + * $Id: load_plugins.c,v 1.134 2003/01/13 23:02:58 miguelfreitas Exp $ * * * Load input/demux/audio_out/video_out/codec plugins @@ -1445,14 +1445,14 @@ xine_audio_port_t *xine_new_framegrab_audio_port (xine_t *this) { return port; } -void xine_close_audio_driver (xine_t *this, xine_audio_port_t *driver) { +void xine_close_audio_driver (xine_t *this, xine_audio_port_t *ao_port) { - /* FIXME : implement */ + ao_port->exit(ao_port); } -void xine_close_video_driver (xine_t *this, xine_video_port_t *driver) { +void xine_close_video_driver (xine_t *this, xine_video_port_t *vo_port) { - /* FIXME : implement */ + vo_port->exit(vo_port); } diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index 086b018e6..dfabc315b 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.219 2003/01/13 17:47:35 mroi Exp $ + * $Id: xine.c,v 1.220 2003/01/13 23:03:13 miguelfreitas Exp $ * * top-level xine functions * @@ -919,7 +919,6 @@ void xine_dispose (xine_stream_t *stream) { video_decoder_shutdown (stream); stream->osd_renderer->close( stream->osd_renderer ); - stream->video_out->exit (stream->video_out); stream->video_fifo->dispose (stream->video_fifo); pthread_mutex_destroy (&stream->frontend_lock); |