4 files changed, 4 insertions, 72 deletions
diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c
index fe78c43d4..9effea450 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.18 2001/06/14 10:48:24 guenter Exp $
+ * $Id: audio_decoder.c,v 1.19 2001/06/16 14:34:49 guenter Exp $
  *
  *
  * functions that implement audio decoding
@@ -181,19 +181,6 @@ void audio_decoder_init (xine_t *this) {
   pthread_create (&this->audio_thread, NULL, audio_decoder_loop, this) ;
 }
 
-void audio_decoder_stop (xine_t *this) {
-
-  if (this->audio_fifo) {
-
-    this->audio_fifo->clear(this->audio_fifo);
-
-    if (this->cur_audio_decoder_plugin) {
-      this->cur_audio_decoder_plugin->close (this->cur_audio_decoder_plugin);
-      this->cur_audio_decoder_plugin = NULL;
-    }
-  }
-}
-
 void audio_decoder_shutdown (xine_t *this) {
 
   buf_element_t *buf;
diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c
index 028e3546d..adb5876e5 100644
--- a/src/xine-engine/video_decoder.c
+++ b/src/xine-engine/video_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: video_decoder.c,v 1.22 2001/06/14 10:48:24 guenter Exp $
+ * $Id: video_decoder.c,v 1.23 2001/06/16 14:34:49 guenter Exp $
  *
  */
 
@@ -141,15 +141,6 @@ void video_decoder_init (xine_t *this) {
   pthread_create (&this->video_thread, NULL, video_decoder_loop, this) ;
 }
 
-void video_decoder_stop (xine_t *this) {
-  this->video_fifo->clear(this->video_fifo);
-
-  if (this->cur_video_decoder_plugin) {
-    this->cur_video_decoder_plugin->close (this->cur_video_decoder_plugin);
-    this->cur_video_decoder_plugin = NULL;
-  }
-}
-
 void video_decoder_shutdown (xine_t *this) {
 
   buf_element_t *buf;
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index ebced5169..46e00783b 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.23 2001/06/14 09:19:44 guenter Exp $
+ * $Id: xine.c,v 1.24 2001/06/16 14:34:49 guenter Exp $
  *
  * top-level xine functions
  *
@@ -67,9 +67,6 @@ void xine_notify_stream_finished (xine_t *this) {
   
 }
 
-/*
- *
- */
 void xine_stop (xine_t *this) {
 
   if (!this->cur_input_plugin) 
@@ -89,9 +86,6 @@ void xine_stop (xine_t *this) {
     this->cur_input_plugin = NULL;
   }
 
-  video_decoder_stop (this);
-  audio_decoder_stop (this);
-
   this->spu_fifo->clear(this->spu_fifo);
 
   this->metronom->stop_clock (this->metronom);
@@ -167,9 +161,6 @@ static int find_demuxer(xine_t *this, const char *MRL) {
   return 0;
 }
 
-/*
- *
- */
 static void xine_play_internal (xine_t *this, char *MRL, 
 				int spos, off_t pos) {
 
@@ -273,9 +264,6 @@ static void xine_play_internal (xine_t *this, char *MRL,
   printf ("xine: play_internal done.\n");
 }
 
-/*
- *
- */
 void xine_play (xine_t *this, char *MRL, int spos) {
 
   pthread_mutex_lock (&this->xine_lock);
@@ -286,9 +274,6 @@ void xine_play (xine_t *this, char *MRL, int spos) {
   pthread_mutex_unlock (&this->xine_lock);
 }
 
-/*
- *
- */
 int xine_eject (xine_t *this) {
   
   if(this->cur_input_plugin == NULL) 
@@ -308,9 +293,6 @@ int xine_eject (xine_t *this) {
   return 0;
 }
 
-/*
- *
- */
 void xine_exit (xine_t *this) {
 
   /*
@@ -344,9 +326,6 @@ void xine_exit (xine_t *this) {
   printf ("xine_exit: bye!\n");
 }
 
-/*
- *
- */
 void xine_pause (xine_t *this) {
 
   pthread_mutex_lock (&this->xine_lock);
@@ -386,9 +365,6 @@ void xine_pause (xine_t *this) {
   pthread_mutex_unlock (&this->xine_lock);
 }
 
-/*
- *
- */
 xine_t *xine_init (vo_driver_t *vo, 
 		   ao_functions_t *ao,
 		   gui_status_callback_func_t gui_status_callback,
@@ -458,17 +434,11 @@ xine_t *xine_init (vo_driver_t *vo,
   return this;
 }
 
-/*
- *
- */
 int xine_get_audio_channel (xine_t *this) {
 
   return this->audio_channel;
 }
 
-/*
- *
- */
 void xine_select_audio_channel (xine_t *this, int channel) {
 
   pthread_mutex_lock (&this->xine_lock);
@@ -480,17 +450,11 @@ void xine_select_audio_channel (xine_t *this, int channel) {
   pthread_mutex_unlock (&this->xine_lock);
 }
 
-/*
- *
- */
 int xine_get_spu_channel (xine_t *this) {
 
   return this->spu_channel;
 }
 
-/*
- *
- */
 void xine_select_spu_channel (xine_t *this, int channel) {
 
   pthread_mutex_lock (&this->xine_lock);
@@ -500,9 +464,6 @@ void xine_select_spu_channel (xine_t *this, int channel) {
   pthread_mutex_unlock (&this->xine_lock);
 }
 
-/*
- *
- */
 int xine_get_current_position (xine_t *this) {
 
   off_t len;
@@ -526,9 +487,6 @@ int xine_get_current_position (xine_t *this) {
   return (int) share;
 }
 
-/*
- *
- */
 int xine_get_status(xine_t *this) {
 
   return this->status;
diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h
index 7a787907b..c3277499a 100644
--- a/src/xine-engine/xine_internal.h
+++ b/src/xine-engine/xine_internal.h
@@ -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_internal.h,v 1.21 2001/06/10 23:10:52 heikos Exp $
+ * $Id: xine_internal.h,v 1.22 2001/06/16 14:34:49 guenter Exp $
  *
  */
 
@@ -289,8 +289,6 @@ void xine_notify_stream_finished (xine_t *this);
 
 void video_decoder_init (xine_t *this);
 
-void video_decoder_stop (xine_t *this);
-
 /*
  * quit video thread
  */
@@ -304,8 +302,6 @@ void video_decoder_shutdown (xine_t *this);
 
 void audio_decoder_init (xine_t *this);
 
-void audio_decoder_stop (xine_t *this);
-
 /*
  * quit audio thread
  */