Minor name-change tidying up.

modules/access/vcdx/access.c

@@ -4,7 +4,7 @@
  *         to go here.
  *****************************************************************************
  * Copyright (C) 2000,2003 VideoLAN
- * $Id: access.c,v 1.4 2003/11/23 14:34:19 rocky Exp $
+ * $Id: access.c,v 1.5 2003/11/26 01:28:52 rocky Exp $
  *
  * Authors: Rocky Bernstein <rocky@panix.com> 
  *          Johan Bilien <jobi@via.ecp.fr>
@@ -161,7 +161,7 @@ vcd_log_handler (vcd_log_level_t level, const char message[])
  */
 
 /*****************************************************************************
-  VCDOpen: open VCD.
+  Open: open VCD.
   read in meta-information about VCD: the number of tracks, segments, 
   entries, size and starting information. Then set up state variables so
   that we read/seek starting at the location specified.
@@ -170,7 +170,7 @@ vcd_log_handler (vcd_log_level_t level, const char message[])
   and VLC_EGENERIC for some other error.
  *****************************************************************************/
 int 
-E_(VCDOpen) ( vlc_object_t *p_this )
+E_(Open) ( vlc_object_t *p_this )
 {
     input_thread_t *        p_input = (input_thread_t *)p_this;
     thread_vcd_data_t *     p_vcd;
@@ -300,10 +300,10 @@ E_(VCDOpen) ( vlc_object_t *p_this )
 }
 
 /*****************************************************************************
- * VCDClose: closes VCD releasing allocated memory.
+ * Close: closes VCD releasing allocated memory.
  *****************************************************************************/
 void 
-E_(VCDClose) ( vlc_object_t *p_this )
+E_(Close) ( vlc_object_t *p_this )
 {
     input_thread_t *   p_input = (input_thread_t *)p_this;
     thread_vcd_data_t *p_vcd = (thread_vcd_data_t *)p_input->p_access_data;

modules/access/vcdx/intf.c

@@ -2,7 +2,7 @@
  * intf.c: Video CD interface to handle user interaction and still time
  *****************************************************************************
  * Copyright (C) 2002,2003 VideoLAN
- * $Id: intf.c,v 1.6 2003/11/25 03:55:12 rocky Exp $
+ * $Id: intf.c,v 1.7 2003/11/26 01:28:52 rocky Exp $
  *
  * Authors: Rocky Bernstein <rocky@panix.com>
  *   from DVD code by Stphane Borel <stef@via.ecp.fr>
@@ -25,10 +25,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
-#include <unistd.h>
-
 #include <vlc/vlc.h>
 #include <vlc/intf.h>
 

modules/access/vcdx/vcd.c

@@ -2,7 +2,7 @@
  * vcd.c : VCD input module for vlc
  *****************************************************************************
  * Copyright (C) 2000,2003 VideoLAN
- * $Id: vcd.c,v 1.8 2003/11/23 17:18:00 rocky Exp $
+ * $Id: vcd.c,v 1.9 2003/11/26 01:28:52 rocky Exp $
  *
  * Authors: Rocky Bernstein <rocky@panix.com> 
  *
@@ -34,10 +34,10 @@
 /*****************************************************************************
  * Exported prototypes
  *****************************************************************************/
-int  E_(VCDOpen)      ( vlc_object_t * );
-void E_(VCDClose)     ( vlc_object_t * );
-int  E_(VCDOpenIntf)  ( vlc_object_t * );
-void E_(VCDCloseIntf) ( vlc_object_t * );
+int  E_(Open)         ( vlc_object_t * );
+void E_(Close)        ( 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 * );
 
@@ -76,10 +76,10 @@ 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]") );
+    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_(VCDOpen), E_(VCDClose) );
+    set_callbacks( E_(Open), E_(Close) );
     add_shortcut( "vcd" );
     add_shortcut( "vcdx" );
 
@@ -106,6 +106,6 @@ vlc_module_begin();
 
     add_submodule();
         set_capability( "interface", 0 );
-        set_callbacks( E_(VCDOpenIntf), E_(VCDCloseIntf) );
+        set_callbacks( E_(OpenIntf), E_(CloseIntf) );
 vlc_module_end();
 

modules/access/vcdx/vcd.h

 /*****************************************************************************
- * vcd.h : VCD input module for vlc
+ * vcd.h : VCD input module header for vlc
  *          using libcdio, libvcd and libvcdinfo
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: vcd.h,v 1.2 2003/11/20 02:17:33 rocky Exp $
+ * $Id: vcd.h,v 1.3 2003/11/26 01:28:52 rocky Exp $
  *
  * Authors: Rocky Bernstein <rocky@panix.com> 
  *