/*****************************************************************************
* Debugging options - define or undefine symbols
*****************************************************************************/
-#ifdef DEBUG
-/* General debugging support, which depends of the DEBUG define, is determined
+#ifdef TRACE
+/* General trace support, which depends of the TRACE define, is determined
* in the Makefile */
/* Modules specific debugging - this will produce a lot of output, but can be
* useful to track a bug */
-//#define DEBUG_INTF
-//#define DEBUG_INPUT
-//#define DEBUG_AUDIO
-#define DEBUG_VOUT
-#define DEBUG_VPAR
-
-/* Debugging log file - if defined, a file can be used to store all messages. If
- * DEBUG_LOG_ONLY is defined, debug messages will only be printed to the log and
+//#define TRACE_INTF
+//#define TRACE_INPUT
+//#define TRACE_AUDIO
+#define TRACE_VOUT
+#define TRACE_VPAR
+
+/* Trace log file - if defined, a file can be used to store all messages. If
+ * TRACE_LOG_ONLY is defined, debug messages will only be printed to the log and
* will not appear on the screen */
-#define DEBUG_LOG "vlc-debug.log"
-#define DEBUG_LOG_ONLY
+#define TRACE_LOG "vlc-trace.log"
+#define TRACE_LOG_ONLY
#endif
/* Environment variable containing the display method */
#define INTF_METHOD_VAR "vlc_intf"
+#define INTF_METHOD_DEFAULT "gtk"
/* Environment variable used to store startup script name and default value */
#define INTF_INIT_SCRIPT_VAR "vlcrc"
/* Maximum number of channels */
#define INTF_MAX_CHANNELS 10
+/* Default search path for interface file browser */
+#define INTF_PATH_VAR "vlc_search_path"
+#define INTF_PATH_DEFAULT ""
+
/*****************************************************************************
* Input thread configuration
*****************************************************************************/
-/* Environment variable containing the display method */
+/* Environment variable containing the input method */
#define INPUT_METHOD_VAR "vlc_input"
+#define INPUT_METHOD_DEFAULT "ps"
/* XXX?? */
#define INPUT_IDLE_SLEEP ((int)(0.100*CLOCK_FREQ))
/* Maximum length of a hostname or source name */
#define INPUT_MAX_SOURCE_LENGTH 100
+/* Default network protocol */
+#define INPUT_NETWORK_PROTOCOL_VAR "vlc_network_protocol"
+#define INPUT_NETWORK_PROTOCOL_DEFAULT "ts"
+
/* 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"
#define INPUT_PORT_DEFAULT 1234
+/* Default broadcast address */
+#define INPUT_BCAST_ADRR_VAR "vlc_broadcast_addr"
+#define INPUT_BCAST_ADDR_DEFAULT "138.195.143.255"
+
/* Broadcast mode */
#define INPUT_BROADCAST_VAR "vlc_broadcast"
#define INPUT_BROADCAST_DEFAULT 0
* mark it to be presented */
#define DEFAULT_PTS_DELAY (mtime_t)(.2*CLOCK_FREQ)
+/* DVD defaults */
#define INPUT_DVD_DEVICE_VAR "vlc_dvd_device"
#define INPUT_DVD_DEVICE_DEFAULT "/dev/dvd"
#define INPUT_TITLE_VAR "vlc_input_title"
#define INPUT_CHAPTER_VAR "vlc_input_chapter"
+#define INPUT_ANGLE_VAR "vlc_input_angle"
#define INPUT_AUDIO_VAR "vlc_input_audio"
#define INPUT_CHANNEL_VAR "vlc_input_channel"
#define INPUT_SUBTITLE_VAR "vlc_input_subtitle"
+/* VCD defaults */
+#define INPUT_VCD_DEVICE_VAR "vlc_vcd_device"
+#define INPUT_VCD_DEVICE_DEFAULT "/dev/cdrom"
+
/*****************************************************************************
* Audio configuration
*****************************************************************************/
+/* Maximum number of audio output threads */
+#define AOUT_MAX_THREADS 10
+
/* Environment variable containing the audio output method */
#define AOUT_METHOD_VAR "vlc_aout"
+#define AOUT_METHOD_DEFAULT "dsp"
/* Environment variable used to store dsp device name, and default value */
#define AOUT_DSP_VAR "vlc_dsp"
#define AOUT_STEREO_VAR "vlc_stereo"
#define AOUT_STEREO_DEFAULT 1
+/* Environment variable for spdif mode */
+#define AOUT_SPDIF_VAR "vlc_spdif"
+#define AOUT_SPDIF_DEFAULT 0
+
+/* Environment variable containing the AC3 downmix method */
+#define DOWNMIX_METHOD_VAR "vlc_downmix"
+
+/* Environment variable containing the AC3 IMDCT method */
+#define IMDCT_METHOD_VAR "vlc_imdct"
+
/* Volume */
#define VOLUME_DEFAULT 512
#define VOLUME_STEP 128
* Video configuration
*****************************************************************************/
+/* Maximum number of video output threads */
+#define VOUT_MAX_THREADS 10
+
/*
* Default settings for video output threads
*/
/* Environment variable containing the display method */
#define VOUT_METHOD_VAR "vlc_vout"
+#define VOUT_METHOD_DEFAULT "x11"
/* Environment variable containing the motion compensation method */
#define MOTION_METHOD_VAR "vlc_motion"
#define VOUT_WIDTH_DEFAULT 720
#define VOUT_HEIGHT_DEFAULT 576
+#define VOUT_DEPTH_VAR "vlc_depth"
+#define VOUT_DEPTH_DEFAULT 15
+
+#define VOUT_FULLSCREEN_VAR "vlc_fullscreen"
+#define VOUT_FULLSCREEN_DEFAULT 0
+
+#define VOUT_FULLSCREEN_DEPTH_VAR "vlc_fullscreen_depth"
+#define VOUT_FULLSCREEN_DEPTH_DEFAULT 32
+
/* Maximum width of a scaled source picture - this should be relatively high,
* since higher stream values will result in no display at all. */
#define VOUT_MAX_WIDTH 4096
#define VOUT_OVERLAY_DEFAULT 0
/* Default gamma */
-#define VOUT_GAMMA 0.
+#define VOUT_GAMMA_VAR "vlc_gamma"
+#define VOUT_GAMMA_DEFAULT 0.
/* Default fonts */
#define VOUT_DEFAULT_FONT "default8x9.psf"
#define INTF_MSG_QSIZE 64
/* Interface warnig message level */
-#define INTF_WARNING_VAR "warning_level"
-#define INTF_WARNING_DEFAULT 12
+#define INTF_WARNING_VAR "vlc_warning_level"
+#define INTF_WARNING_DEFAULT 0
/* 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
+#define INTF_MSG_QUEUE
#endif
/* Format of the header for debug messages. The arguments following this header
* message function was called */
#define INTF_MSG_DBG_FORMAT "## %s:%s(),%i: "
-/* Maximal number of arguments on a command line, including the function name */
+/* Max number of arguments on a command line, including the function name */
#define INTF_MAX_ARGS 20
/* Maximal size of a command line in a script */
/* Maximal number of commands which can be saved in history list */
#define INTF_CONSOLE_MAX_HISTORY 20
+/****************************************************************************
+ * Playlist defaults
+ ****************************************************************************/
+
+/* Launch on start-up */
+#define PLAYLIST_STARTUP_VAR "vlc_playlist_on_start_up"
+#define PLAYLIST_STARTUP_DEFAULT 0
+
+/* Enqueue drag'n dropped item */
+#define PLAYLIST_ENQUEUE_VAR "vlc_playlist_enqueue"
+#define PLAYLIST_ENQUEUE_DEFAULT 0
+
+/* Loop on playlist end */
+#define PLAYLIST_LOOP_VAR "vlc_playlist_loop"
+#define PLAYLIST_LOOP_DEFAULT 0
+