/* When a thread waits on a condition in debug mode, delay to wait before
* outputting an error message (in second) */
-#define THREAD_COND_TIMEOUT 15
+#define THREAD_COND_TIMEOUT 1
/* 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
/* 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)
/* 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
/* 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)
#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