bring back all the demuxers

CVS patchset: 2650
CVS date: 2002/09/10 15:07:13

1 files changed, 12 insertions, 10 deletions

diff --git a/src/demuxers/demux_cda.c b/src/demuxers/demux_cda.c
index f8c6bbbb5..19311f007 100644
--- a/src/demuxers/demux_cda.c
+++ b/src/demuxers/demux_cda.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_cda.c,v 1.23 2002/09/05 22:18:51 mroi Exp $
+ * $Id: demux_cda.c,v 1.24 2002/09/10 15:07:13 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -290,17 +290,9 @@ static int demux_cda_get_stream_length (demux_plugin_t *this_gen) {
 /*
  *
  */
-static void *init_demuxer_plugin(int iface, xine_t *xine) {
+static void *init_demuxer_plugin(xine_t *xine, void *data) {
   demux_cda_t *this;
   
-  if (iface != 10) {
-    printf (_("demux_cda: plugin doesn't support plugin API version %d.\n"
-	      "           this means there's a version mismatch between xine and this "
-	      "           demuxer plugin.\nInstalling current demux plugins should help.\n"),
-	    iface);
-    return NULL;
-  }
-
   this         = (demux_cda_t *) xine_xmalloc(sizeof(demux_cda_t));
   this->config = xine->config;
   this->xine   = xine;
@@ -320,3 +312,13 @@ static void *init_demuxer_plugin(int iface, xine_t *xine) {
   
   return &this->demux_plugin;
 }
+
+/*
+ * exported plugin catalog entry
+ */
+
+plugin_info_t xine_plugin_info[] = {
+  /* type, API, "name", version, special_info, init_function */  
+  { PLUGIN_DEMUX, 10, "cda", XINE_VERSION_CODE, NULL, init_demuxer_plugin },
+  { PLUGIN_NONE, 0, "", 0, NULL, NULL }
+};