Set default DVD defice
authorRémi Denis-Courmont <rem@videolan.org>
Wed, 28 Nov 2007 18:38:36 +0000 (18:38 +0000)
committerRémi Denis-Courmont <rem@videolan.org>
Wed, 28 Nov 2007 18:38:36 +0000 (18:38 +0000)
include/vlc_config.h
src/libvlc-module.c

index 51561cc..323b948 100644 (file)
 
 /* DVD and VCD devices */
 #if !defined( WIN32 ) && !defined( UNDER_CE )
 
 /* DVD and VCD devices */
 #if !defined( WIN32 ) && !defined( UNDER_CE )
-#   define VCD_DEVICE "/dev/cdrom"
-#   define CDAUDIO_DEVICE "/dev/cdrom"
+#   define CD_DEVICE      "dev/cdrom"
+#   define DVD_DEVICE     "/dev/dvd"
 #else
 #else
-#   define VCD_DEVICE "D:"
-#   define CDAUDIO_DEVICE "D:"
+#   define CD_DEVICE      "D:"
+#   define DVD_DEVICE     CD_DEVICE
 #endif
 #endif
+#define VCD_DEVICE        CD_DEVICE
+#define CDAUDIO_DEVICE    CD_DEVICE
 
 /*****************************************************************************
  * Audio configuration
 
 /*****************************************************************************
  * Audio configuration
index 7d18170..515365d 100644 (file)
@@ -1613,7 +1613,7 @@ vlc_module_begin();
 
     set_section( N_( "Default devices") , NULL );
 
 
     set_section( N_( "Default devices") , NULL );
 
-    add_file( "dvd", NULL, NULL, DVD_DEV_TEXT, DVD_DEV_LONGTEXT,
+    add_file( "dvd", DVD_DEVICE, NULL, DVD_DEV_TEXT, DVD_DEV_LONGTEXT,
               VLC_FALSE );
     add_file( "vcd", VCD_DEVICE, NULL, VCD_DEV_TEXT, VCD_DEV_LONGTEXT,
               VLC_FALSE );
               VLC_FALSE );
     add_file( "vcd", VCD_DEVICE, NULL, VCD_DEV_TEXT, VCD_DEV_LONGTEXT,
               VLC_FALSE );