use empty .gitignore files to track empty folders

[vlc] / include / vlc_config.h

diff --git a/include/vlc_config.h b/include/vlc_config.h
index 51561cc5e5780ecea3750a891a30cdce65e89567..3617fa7c3998b09702958235404239d178107799 100644 (file)
--- a/include/vlc_config.h
+++ b/include/vlc_config.h
@@ -87,18 +87,21 @@
 
 /* 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
-#   define VCD_DEVICE "D:"
-#   define CDAUDIO_DEVICE "D:"
+#   define CD_DEVICE      "D:"
+#   define DVD_DEVICE     NULL
 #endif
+#define VCD_DEVICE        CD_DEVICE
+#define CDAUDIO_DEVICE    CD_DEVICE
 
 /*****************************************************************************
  * Audio configuration
  *****************************************************************************/
 
 /* Volume */
+/* If you are coding an interface, please see src/audio_output/intf.c */
 #define AOUT_VOLUME_DEFAULT             256
 #define AOUT_VOLUME_STEP                32
 #define AOUT_VOLUME_MAX                 1024
@@ -112,7 +115,7 @@
 
 /* Buffers which arrive in advance of more than AOUT_MAX_ADVANCE_TIME
  * will be considered as bogus and be trashed */
-#define AOUT_MAX_ADVANCE_TIME           (mtime_t)(DEFAULT_PTS_DELAY * 3)
+#define AOUT_MAX_ADVANCE_TIME           (mtime_t)(DEFAULT_PTS_DELAY * 5)
 
 /* Buffers which arrive in advance of more than AOUT_MAX_PREPARE_TIME
  * will cause the calling thread to sleep */