* fixes for the Qt plugin compilation under Debian

[vlc] / include / config.h.in

diff --git a/include/config.h.in b/include/config.h.in
index d1da688834ce7e57e489b22dec0ea1e52d0d6d81..77fd91fa3fa2a45167e69cc04c914dc96ee8fbbe 100644 (file)
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -78,7 +78,7 @@
  * in the Makefile */
 
 /* Modules specific debugging - this will produce a lot of output, but can be
- * usefull to track a bug */
+ * useful to track a bug */
 //#define DEBUG_INTF
 //#define DEBUG_INPUT
 //#define DEBUG_AUDIO
@@ -113,7 +113,7 @@
  */
 
 /* Size of the FIFO. FIFO_SIZE+1 must be a power of 2 */
-#define FIFO_SIZE                       511
+#define FIFO_SIZE                       1023
 
 /*
  * Paths
@@ -128,6 +128,9 @@
  * Interface configuration
  *****************************************************************************/
 
+/* Environment variable containing the display method */
+#define INTF_METHOD_VAR                 "vlc_intf"
+
 /* Environment variable used to store startup script name and default value */
 #define INTF_INIT_SCRIPT_VAR            "vlcrc"
 #define INTF_INIT_SCRIPT_DEFAULT        ".vlcrc"
@@ -146,13 +149,6 @@
 /* Maximum number of channels */
 #define INTF_MAX_CHANNELS               10
 
-/*
- * X11 settings
- */
-
-/* Title of the X11 window */
-#define VOUT_TITLE                      "VideoLAN Client"
-
 /*****************************************************************************
  * Input thread configuration
  *****************************************************************************/
@@ -183,6 +179,7 @@
 /* Default remote server */
 #define INPUT_SERVER_VAR                "vlc_server"
 #define INPUT_SERVER_DEFAULT            "138.195.143.220"
+#define INPUT_BCAST_ADDR                "138.195.143.255"
 
 /* Default input port */
 #define INPUT_PORT_VAR                  "vlc_server_port"
@@ -208,17 +205,20 @@
 
 /* Delay between vlan changes - this is required to avoid flooding the VLAN
  * server */
-#define INPUT_VLAN_CHANGE_DELAY         (5*CLOCK_FREQ)
+#define INPUT_VLAN_CHANGE_DELAY         (mtime_t)(5*CLOCK_FREQ)
 
 /* Duration between the time we receive the data packet, and the time we will
  * mark it to be presented */
-#define DEFAULT_PTS_DELAY               (.2*CLOCK_FREQ)
+#define DEFAULT_PTS_DELAY               (mtime_t)(.2*CLOCK_FREQ)
 
 #define INPUT_DVD_DEVICE_VAR            "vlc_dvd_device"
 #define INPUT_DVD_DEVICE_DEFAULT        "/dev/dvd"
-#define INPUT_DVD_AUDIO_VAR             "vlc_dvd_audio"
-#define INPUT_DVD_CHANNEL_VAR           "vlc_dvd_channel"
-#define INPUT_DVD_SUBTITLE_VAR          "vlc_dvd_subtitle"
+
+#define INPUT_TITLE_VAR                 "vlc_input_title"
+#define INPUT_CHAPTER_VAR               "vlc_input_chapter"
+#define INPUT_AUDIO_VAR                 "vlc_input_audio"
+#define INPUT_CHANNEL_VAR               "vlc_input_channel"
+#define INPUT_SUBTITLE_VAR              "vlc_input_subtitle"
 
 /*****************************************************************************
  * Audio configuration
@@ -372,12 +372,8 @@
 #define VOUT_FB_DEV_VAR                 "vlc_fb_dev"
 #define VOUT_FB_DEV_DEFAULT             "/dev/fb0"
 
-/* Some frame buffers aren't able to support double buffering.
- * We don't want to lose one frame out of 2, so we may set the
- * FB_NOYPAN
- */
-// #define FB_NOYPAN
-   
+/* The default video output window title */
+#define VOUT_TITLE                      "VideoLAN Client @VLC_VERSION@"
 
 /*****************************************************************************
  * Video parser configuration
@@ -449,9 +445,9 @@
 #define INTF_WARNING_VAR                "warning_level"
 #define INTF_WARNING_DEFAULT            12
 
-/* Define to enable messages queues - disabling messages queue can be usefull
- * when debugging, since it allows messages which would not otherwise be printed,
- * due to a crash, to be printed anyway */
+/* Define to enable messages queues - disabling messages queue can be useful
+ * when debugging, since it allows messages which would not be printed
+ * due to a crash to be printed anyway */
 #ifndef DEBUG
 #define INTF_MSG_QUEUE
 #endif