First attempt to libcdio VCD working under new regime. It is still

[vlc] / modules / access / vcdx / vcd.c

diff --git a/modules/access/vcdx/vcd.c b/modules/access/vcdx/vcd.c
index 52db0a87fe1fb36750343a0f3da8569b0694772b..6cd87fa4d0e457c0d4ba546342c769bfaee76afc 100644 (file)
--- a/modules/access/vcdx/vcd.c
+++ b/modules/access/vcdx/vcd.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * vcd.c : VCD input module for vlc
  *****************************************************************************
- * Copyright (C) 2000,2003 VideoLAN
+ * Copyright (C) 2000, 2003, 2004 VideoLAN
  * $Id$
  *
  * Authors: Rocky Bernstein <rocky@panix.com>
@@ -34,12 +34,12 @@
 /*****************************************************************************
  * Exported prototypes
  *****************************************************************************/
-int  E_(Open)         ( vlc_object_t * );
-void E_(Close)        ( vlc_object_t * );
+int  E_(VCDOpen)      ( vlc_object_t * );
+void E_(VCDClose)     ( vlc_object_t * );
 int  E_(OpenIntf)     ( vlc_object_t * );
 void E_(CloseIntf)    ( vlc_object_t * );
-int  E_(InitVCD)      ( vlc_object_t * );
-void E_(EndVCD)       ( vlc_object_t * );
+int  E_(VCDInit)      ( vlc_object_t * );
+void E_(VCDEnd)       ( vlc_object_t * );
 
 int  E_(DebugCallback) ( vlc_object_t *p_this, const char *psz_name,
                          vlc_value_t oldval, vlc_value_t val,
@@ -90,12 +90,9 @@ int  E_(DebugCallback) ( vlc_object_t *p_this, const char *psz_name,
 vlc_module_begin();
     add_usage_hint( N_("vcdx://[device-or-file][@{P,S,T}num]") );
     set_description( _("Video CD (VCD 1.0, 1.1, 2.0, SVCD, HQVCD) input") );
-    set_capability( "access", 85 /* slightly higher than vcd */ );
-    set_callbacks( E_(Open), E_(Close) );
-    add_shortcut( "vcd" );
+    set_capability( "access2", 55 /* slightly lower than vcd */ );
+    set_callbacks( E_(VCDOpen), E_(VCDClose) );
     add_shortcut( "vcdx" );
-    set_category( CAT_INPUT );
-    set_subcategory( SUBCAT_INPUT_ACCESS );
 
     /* Configuration options */
     add_integer ( MODULE_STRING "-debug", 0, E_(DebugCallback),
@@ -123,11 +120,11 @@ vlc_module_begin();
 #ifdef FIXED
     add_submodule();
         set_capability( "demux", 0 );
-        set_callbacks( E_(InitVCD), E_(EndVCD) );
-#endif
-
+        set_callbacks( E_(VCDInit), E_(VCDEnd) );
     add_submodule();
         set_capability( "interface", 0 );
         set_callbacks( E_(OpenIntf), E_(CloseIntf) );
+#endif
+
 vlc_module_end();