cleaned up and finished spu_thread removal

CVS patchset: 275
CVS date: 2001/07/14 12:50:33

1 files changed, 19 insertions, 26 deletions

diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c
index 121d92bb0..a1022be17 100644
--- a/src/demuxers/demux_elem.c
+++ b/src/demuxers/demux_elem.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_elem.c,v 1.13 2001/06/21 17:34:23 guenter Exp $
+ * $Id: demux_elem.c,v 1.14 2001/07/14 12:50:34 guenter Exp $
  *
  * demultiplexer for elementary mpeg streams
  * 
@@ -176,7 +176,6 @@ static int demux_mpeg_elem_get_status (demux_plugin_t *this_gen) {
 static void demux_mpeg_elem_start (demux_plugin_t *this_gen,
 				    fifo_buffer_t *video_fifo, 
 				    fifo_buffer_t *audio_fifo,
-				    fifo_buffer_t *spu_fifo,
 				    off_t pos,
 				    gui_get_next_mrl_cb_t next_mrl_cb,
 				    gui_branched_cb_t branched_cb) {
@@ -313,33 +312,27 @@ static void demux_mpeg_elem_close (demux_plugin_t *this) {
  */
 demux_plugin_t *init_demuxer_plugin(int iface, config_values_t *config) {
 
-  demux_mpeg_elem_t *this = malloc (sizeof (demux_mpeg_elem_t));
+  demux_mpeg_elem_t *this;
 
-  xine_debug  = config->lookup_int (config, "xine_debug", 0);
-
-  switch (iface) {
-
-  case 1:
-
-    this->demux_plugin.interface_version = DEMUX_MPEG_ELEM_IFACE_VERSION;
-    this->demux_plugin.open              = demux_mpeg_elem_open;
-    this->demux_plugin.start             = demux_mpeg_elem_start;
-    this->demux_plugin.stop              = demux_mpeg_elem_stop;
-    this->demux_plugin.close             = demux_mpeg_elem_close;
-    this->demux_plugin.get_status        = demux_mpeg_elem_get_status;
-    this->demux_plugin.get_identifier    = demux_mpeg_elem_get_id;
-    
-    return &this->demux_plugin;
-    break;
-
-  default:
-    fprintf(stderr,
-	    "Demuxer plugin doesn't support plugin API version %d.\n"
-	    "PLUGIN DISABLED.\n"
-	    "This means there's a version mismatch between xine and this "
-	    "demuxer plugin.\nInstalling current input plugins should help.\n",
+  if (iface != 2) {
+    printf( "demux_elem: plugin doesn't support plugin API version %d.\n"
+	    "demux_elem: this means there's a version mismatch between xine and this "
+	    "demux_elem: demuxer plugin.\nInstalling current input plugins should help.\n",
 	    iface);
     return NULL;
   }
+
+  this = malloc (sizeof (demux_mpeg_elem_t));
+  xine_debug  = config->lookup_int (config, "xine_debug", 0);
+
+  this->demux_plugin.interface_version = DEMUX_MPEG_ELEM_IFACE_VERSION;
+  this->demux_plugin.open              = demux_mpeg_elem_open;
+  this->demux_plugin.start             = demux_mpeg_elem_start;
+  this->demux_plugin.stop              = demux_mpeg_elem_stop;
+  this->demux_plugin.close             = demux_mpeg_elem_close;
+  this->demux_plugin.get_status        = demux_mpeg_elem_get_status;
+  this->demux_plugin.get_identifier    = demux_mpeg_elem_get_id;
+  
+  return &this->demux_plugin;
 }