* ALL: changed "struct foo_s" into "struct foo_t" to make greppers happy.

[vlc] / include / config.h

diff --git a/include/config.h b/include/config.h
index 9ac8c1a0e1639c0ffe6a322f1e70022c826662de..e90ddd42e7739a770fac2bbf854f73f8bbe03967 100644 (file)
--- a/include/config.h
+++ b/include/config.h
@@ -41,7 +41,7 @@
 
 /* When creating or destroying threads in blocking mode, delay to poll thread
  * status */
-#define THREAD_SLEEP                    ((int)(0.010*CLOCK_FREQ))
+#define THREAD_SLEEP                    ((mtime_t)(0.010*CLOCK_FREQ))
 
 /* When a thread waits on a condition in debug mode, delay to wait before
  * outputting an error message (in second) */
@@ -51,9 +51,9 @@
 #ifdef SYS_BEOS
 #  define CONFIG_DIR                    "config/settings"
 #elif defined( WIN32 )
-#  define CONFIG_DIR                   "videolan"
+#  define CONFIG_DIR                   "vlc"
 #else
-#  define CONFIG_DIR                    ".videolan"
+#  define CONFIG_DIR                    ".vlc"
 #endif
 #define CONFIG_FILE                     "vlcrc"
 
@@ -62,7 +62,7 @@
  *****************************************************************************/
 
 /* Base delay in micro second for interface sleeps */
-#define INTF_IDLE_SLEEP                 ((int)(0.050*CLOCK_FREQ))
+#define INTF_IDLE_SLEEP                 ((mtime_t)(0.050*CLOCK_FREQ))
 
 /* Step for changing gamma, and minimum and maximum values */
 #define INTF_GAMMA_STEP                 .1
@@ -73,7 +73,7 @@
  *****************************************************************************/
 
 /* XXX?? */
-#define INPUT_IDLE_SLEEP                ((int)(0.100*CLOCK_FREQ))
+#define INPUT_IDLE_SLEEP                ((mtime_t)(0.100*CLOCK_FREQ))
 
 /*
  * General limitations
@@ -105,7 +105,16 @@
 
 /* Duration between the time we receive the data packet, and the time we will
  * mark it to be presented */
-#define DEFAULT_PTS_DELAY               (mtime_t)(.35*CLOCK_FREQ)
+#define DEFAULT_PTS_DELAY               (mtime_t)(.45*CLOCK_FREQ)
+
+/* DVD and VCD devices */
+#ifndef WIN32
+#  define DVD_DEVICE "/dev/dvd"
+#  define VCD_DEVICE "/dev/cdrom"
+#else
+#  define DVD_DEVICE "D"
+#  define VCD_DEVICE "D"
+#endif
 
 /*****************************************************************************
  * Audio configuration
@@ -116,8 +125,9 @@
 
 /* Volume */
 #define VOLUME_DEFAULT                  256
-#define VOLUME_STEP                     128
+#define VOLUME_STEP                     32
 #define VOLUME_MAX                      1024
+#define VOLUME_MIN                      0
 
 /* Number of audio output frames contained in an audio output fifo.
  * (AOUT_FIFO_SIZE + 1) must be a power of 2, in order to optimise the
@@ -191,7 +201,11 @@
  * late, the thread will perform an idle loop. This time should be
  * at least VOUT_IDLE_SLEEP plus the time required to render a few
  * images, to avoid trashing of decoded images */
-#define VOUT_DISPLAY_DELAY              ((int)(0.500*CLOCK_FREQ))
+#define VOUT_DISPLAY_DELAY              ((int)(0.200*CLOCK_FREQ))
+
+/* 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))
 
 /* Delay (in microseconds) before an idle screen is displayed */
 #define VOUT_IDLE_DELAY                 (5*CLOCK_FREQ)
@@ -200,13 +214,13 @@
 #define VOUT_FPS_SAMPLES                20
 
 /* Better be in advance when awakening than late... */
-#define VOUT_MWAIT_TOLERANCE            ((int)(0.020*CLOCK_FREQ))
+#define VOUT_MWAIT_TOLERANCE            ((mtime_t)(0.020*CLOCK_FREQ))
 
 /* Time to sleep when waiting for a buffer (from vout or the video fifo).
  * It should be approximately the time needed to perform a complete picture
  * loop. Since it only happens when the video heap is full, it does not need
  * to be too low, even if it blocks the decoder. */
-#define VOUT_OUTMEM_SLEEP               ((int)(0.020*CLOCK_FREQ))
+#define VOUT_OUTMEM_SLEEP               ((mtime_t)(0.020*CLOCK_FREQ))
 
 /* The default video output window title */
 #define VOUT_TITLE                      "VideoLAN Client " VERSION
@@ -215,7 +229,7 @@
  * Video parser configuration
  *****************************************************************************/
 
-#define VPAR_IDLE_SLEEP                 ((int)(0.010*CLOCK_FREQ))
+#define VPAR_IDLE_SLEEP                 ((mtime_t)(0.010*CLOCK_FREQ))
 
 /* Optimization level, from 0 to 2 - 1 is generally a good compromise. Remember
  * that raising this level dramatically lengthens the compilation time. */
@@ -232,7 +246,7 @@
  * Video decoder configuration
  *****************************************************************************/
 
-#define VDEC_IDLE_SLEEP                 ((int)(0.100*CLOCK_FREQ))
+#define VDEC_IDLE_SLEEP                 ((mtime_t)(0.100*CLOCK_FREQ))
 
 /* Maximum range of values out of the IDCT + motion compensation. */
 #define VDEC_CROPRANGE                  2048
@@ -253,4 +267,7 @@
 
 /* Maximal size of the message queue - in case of overflow, all messages in the
  * queue are printed, but not sent to the threads */
-#define INTF_MSG_QSIZE                  256
+#define VLC_MSG_QSIZE                   256
+
+/* Maximal depth of the object tree output by vlc_dumpstructure */
+#define MAX_DUMPSTRUCTURE_DEPTH         100