* include/vlc_common.h:

[vlc] / include / vlc_config.h

diff --git a/include/vlc_config.h b/include/vlc_config.h
index 91278bb58e2384db0f7fc724d0a30df3112e78aa..a12a2fcc5471cc5ca047de7ee9a57c541c2df8b4 100644 (file)
--- a/include/vlc_config.h
+++ b/include/vlc_config.h
@@ -49,7 +49,9 @@
 
 /* The configuration file and directory */
 #ifdef SYS_BEOS
-#  define CONFIG_DIR                    "config/settings"
+#  define CONFIG_DIR                    "config/settings/VideoLAN Client"
+#elif SYS_DARWIN
+#  define CONFIG_DIR                    "Library/Preferences/VLC"
 #elif defined( WIN32 ) || defined( UNDER_CE )
 #  define CONFIG_DIR                    "vlc"
 #else
@@ -118,9 +120,11 @@
 #if !defined( WIN32 ) && !defined( UNDER_CE )
 #   define DVD_DEVICE "/dev/dvd"
 #   define VCD_DEVICE "/dev/cdrom"
+#   define CDAUDIO_DEVICE "/dev/cdrom"
 #else
 #   define DVD_DEVICE "D:"
 #   define VCD_DEVICE "D:"
+#   define CDAUDIO_DEVICE "D:"
 #endif
 
 /*****************************************************************************
@@ -142,6 +146,10 @@
 /* Max number of inputs */
 #define AOUT_MAX_INPUTS                 5
 
+/* 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)
+
 /* Buffers which arrive in advance of more than AOUT_MAX_PREPARE_TIME
  * will cause the calling thread to sleep */
 #define AOUT_MAX_PREPARE_TIME           (mtime_t)(.5*CLOCK_FREQ)
@@ -152,7 +160,7 @@
 
 /* Max acceptable delay between the coded PTS and the actual presentation
  * time, without resampling */
-#define AOUT_PTS_TOLERANCE              (mtime_t)(.02*CLOCK_FREQ)
+#define AOUT_PTS_TOLERANCE              (mtime_t)(.04*CLOCK_FREQ)
 
 /* Max acceptable resampling (in %) */
 #define AOUT_MAX_RESAMPLING             10
@@ -196,10 +204,6 @@
  * joined. */
 #define VOUT_MAX_AREAS                  5
 
-/* Default fonts */
-#define VOUT_DEFAULT_FONT               "default8x9.psf"
-#define VOUT_LARGE_FONT                 "default8x16.psf"
-
 /* Statistics are displayed every n loops (=~ pictures) */
 #define VOUT_STATS_NB_LOOPS             100
 
@@ -220,7 +224,7 @@
 
 /* Pictures which are VOUT_BOGUS_DELAY or more in advance probably have
  * a bogus PTS and won't be displayed */
-#define VOUT_BOGUS_DELAY                ((int)(0.800*CLOCK_FREQ))
+#define VOUT_BOGUS_DELAY                ((mtime_t)(DEFAULT_PTS_DELAY * 3))
 
 /* Delay (in microseconds) before an idle screen is displayed */
 #define VOUT_IDLE_DELAY                 (5*CLOCK_FREQ)
@@ -238,7 +242,7 @@
 #define VOUT_OUTMEM_SLEEP               ((mtime_t)(0.020*CLOCK_FREQ))
 
 /* The default video output window title */
-#define VOUT_TITLE                      "VideoLAN Client " VERSION
+#define VOUT_TITLE                      "VLC"
 
 /*****************************************************************************
  * Video parser configuration