Switch over to using "cd-audio" and "vcd" configuration variables.

diff --git a/modules/access/cdda/access.c b/modules/access/cdda/access.c
index 49555c54bfd33fbcfd2fa4d3870904cb40270f51..6711354507a076067ed38e4a31e5df7b066aa10c 100644 (file)
--- a/modules/access/cdda/access.c
+++ b/modules/access/cdda/access.c
@@ -2,7 +2,7 @@
  * cddax.c : CD digital audio input module for vlc using libcdio
  *****************************************************************************
  * Copyright (C) 2000,2003 VideoLAN
- * $Id: access.c,v 1.13 2003/12/05 02:33:49 rocky Exp $
+ * $Id: access.c,v 1.14 2003/12/11 12:56:25 rocky Exp $
  *
  * Authors: Rocky Bernstein <rocky@panix.com> 
  *          Laurent Aimar <fenrir@via.ecp.fr>
@@ -836,7 +836,7 @@ E_(Open)( vlc_object_t *p_this )
         free( psz_orig );
         return -1;
       }
-      psz_source = config_GetPsz( p_input, MODULE_STRING "-device" );
+      psz_source = config_GetPsz( p_input, "cd-audio" );
       
       if( !psz_source || 0==strlen(psz_source) ) {
         /* Scan for a CD-ROM drive with a CD-DA in it. */

diff --git a/modules/access/cdda/cdda.c b/modules/access/cdda/cdda.c
index 4ff3b951d27b6278770ecb4047c7831b525f7779..fb24a144a3d3b2ea6c1dd1467671e0085a8be727 100644 (file)
--- a/modules/access/cdda/cdda.c
+++ b/modules/access/cdda/cdda.c
@@ -2,7 +2,7 @@
  * cddax.c : CD digital audio input module for vlc using libcdio
  *****************************************************************************
  * Copyright (C) 2000,2003 VideoLAN
- * $Id: cdda.c,v 1.10 2003/12/05 02:33:49 rocky Exp $
+ * $Id: cdda.c,v 1.11 2003/12/11 12:56:25 rocky Exp $
  *
  * Authors: Rocky Bernstein <rocky@panix.com> 
  *          Laurent Aimar <fenrir@via.ecp.fr>
@@ -129,10 +129,6 @@ vlc_module_begin();
                 N_("Caching value in ms"), 
                 CACHING_LONGTEXT, VLC_TRUE );
 
-    add_string( MODULE_STRING "-device", "", NULL, 
-               N_("CD-ROM device name"),
-                DEV_LONGTEXT, VLC_FALSE );
-
     add_string( MODULE_STRING "-title-format", 
                "%T %M", NULL, 
                N_("Format to use in playlist 'title' field when no CDDB"),

diff --git a/modules/access/vcdx/access.c b/modules/access/vcdx/access.c
index ada2d56289c6b6f470c7ffef5fc3d2058b3f90e1..0a94c5e5d1c5dc62d2829db4154250b05f16a8a1 100644 (file)
--- a/modules/access/vcdx/access.c
+++ b/modules/access/vcdx/access.c
@@ -3,8 +3,8 @@
  *         using libcdio, libvcd and libvcdinfo. vlc-specific things tend
  *         to go here.
  *****************************************************************************
- * Copyright (C) 2000,2003 VideoLAN
- * $Id: access.c,v 1.9 2003/12/05 05:01:17 rocky Exp $
+ * Copyright (C) 2000, 2003 VideoLAN
+ * $Id: access.c,v 1.10 2003/12/11 12:56:25 rocky Exp $
  *
  * Authors: Rocky Bernstein <rocky@panix.com> 
  *          Johan Bilien <jobi@via.ecp.fr>
@@ -197,8 +197,10 @@ VCDRead( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
             *p_buf = 0x01;
             dbg_print(INPUT_DBG_STILL, "Handled still event");
 
+#if 1
            p_vcd->p_intf->p_sys->b_still = 1;
            input_SetStatus( p_input, INPUT_STATUS_PAUSE );
+#endif
 
            vlc_mutex_lock( &p_input->stream.stream_lock );
 
@@ -207,9 +209,10 @@ VCDRead( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
 
            vlc_mutex_unlock( &p_input->stream.stream_lock );
 
-            dbg_print(INPUT_DBG_STILL, "Clock manage");
            input_ClockManageControl( p_input, p_pgrm, 0 );
-            dbg_print(INPUT_DBG_STILL, "Clock manage done");
+
+           p_vcd->p_intf->p_sys->b_still = 1;
+           input_SetStatus( p_input, INPUT_STATUS_PAUSE );
 
             return i_read + M2F2_SECTOR_SIZE;
           }
@@ -825,7 +828,7 @@ VCDParse( input_thread_t * p_input, /*out*/ vcdinfo_itemid_t * p_itemid )
       /* No source specified, so figure it out. */
       if( !p_input->psz_access ) return NULL;
       
-      psz_source = config_GetPsz( p_input, MODULE_STRING "-device" );
+      psz_source = config_GetPsz( p_input, "vcd" );
 
       if( !psz_source || 0==strlen(psz_source) ) {
         /* Scan for a CD-ROM drive with a VCD in it. */

diff --git a/modules/access/vcdx/vcd.c b/modules/access/vcdx/vcd.c
index aee102333fd06b440f737823cb51b440849b58c2..9b3072c073248c207abc8396d07bcd39e4f49b50 100644 (file)
--- a/modules/access/vcdx/vcd.c
+++ b/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.10 2003/11/30 13:53:45 rocky Exp $
+ * $Id: vcd.c,v 1.11 2003/12/11 12:56:25 rocky Exp $
  *
  * Authors: Rocky Bernstein <rocky@panix.com> 
  *
@@ -83,13 +83,6 @@ vlc_module_begin();
                  N_("set debug mask for additional debugging."),
                   DEBUG_LONGTEXT, VLC_TRUE );
 
-    add_string( MODULE_STRING "-device", "", NULL, 
-               N_("VCD device name"),
-               N_("Specify the name of the Video Compact Disc device that "
-                   "will be used by default. If you don't specify anything, "
-                  "we'll scan for a suitable VCD device."),
-               VLC_FALSE );
-
     add_bool( MODULE_STRING "-PBC", 0, NULL,
              N_("Use playback control?"),
              N_("If VCD is authored with playback control, use it. "