X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_config.h;h=316179a38d8a9d5ab01512a2818b5e1dbcbdbc32;hb=688f0a8d8913f20ac5d3e27bf4f2bbe35c9f5de7;hp=06302cf32c0464314075d32f35e6a9235e2768a7;hpb=85b29bdc288a1573d43bd524908be5748a9b3640;p=vlc diff --git a/include/vlc_config.h b/include/vlc_config.h index 06302cf32c..316179a38d 100644 --- a/include/vlc_config.h +++ b/include/vlc_config.h @@ -2,7 +2,7 @@ * vlc_config.h: limits and configuration * Defines all compilation-time configuration constants and size limits ***************************************************************************** - * Copyright (C) 1999-2003 VideoLAN (Centrale Réseaux) and its contributors + * Copyright (C) 1999-2003 the VideoLAN team * * Authors: Vincent Seguin * Samuel Hocevar @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /* Conventions regarding names of symbols and variables @@ -40,23 +40,6 @@ * status */ #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) */ -#define THREAD_COND_TIMEOUT 1 - -/* The configuration file and directory */ -#ifdef SYS_BEOS -# 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 -# define CONFIG_DIR ".vlc" -#endif -#define CONFIG_FILE "vlcrc" -#define PLUGINSCACHE_DIR "cache" - /***************************************************************************** * Interface configuration *****************************************************************************/ @@ -72,6 +55,9 @@ * Input thread configuration *****************************************************************************/ +#define DEFAULT_INPUT_ACTIVITY 1 +#define TRANSCODE_ACTIVITY 10 + /* Used in ErrorThread */ #define INPUT_IDLE_SLEEP ((mtime_t)(0.100*CLOCK_FREQ)) @@ -92,20 +78,21 @@ /* DVD and VCD devices */ #if !defined( WIN32 ) && !defined( UNDER_CE ) -# define DVD_DEVICE "/dev/dvd" -# define VCD_DEVICE "/dev/cdrom" -# define CDAUDIO_DEVICE "/dev/cdrom" +# define CD_DEVICE "/dev/cdrom" +# define DVD_DEVICE "/dev/dvd" #else -# define DVD_DEVICE "D:" -# define VCD_DEVICE "D:" -# define CDAUDIO_DEVICE "D:" +# define CD_DEVICE "D:" +# define DVD_DEVICE NULL #endif +#define VCD_DEVICE CD_DEVICE +#define CDAUDIO_DEVICE CD_DEVICE /***************************************************************************** * Audio configuration *****************************************************************************/ /* Volume */ +/* If you are coding an interface, please see src/audio_output/intf.c */ #define AOUT_VOLUME_DEFAULT 256 #define AOUT_VOLUME_STEP 32 #define AOUT_VOLUME_MAX 1024 @@ -119,7 +106,7 @@ /* 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) +#define AOUT_MAX_ADVANCE_TIME (mtime_t)(DEFAULT_PTS_DELAY * 5) /* Buffers which arrive in advance of more than AOUT_MAX_PREPARE_TIME * will cause the calling thread to sleep */ @@ -156,11 +143,7 @@ /* Video heap size - remember that a decompressed picture is big * (~1 Mbyte) before using huge values */ -#ifdef OPTIMIZE_MEMORY -# define VOUT_MAX_PICTURES 5 -#else -# define VOUT_MAX_PICTURES 8 -#endif +#define VOUT_MAX_PICTURES 8 /* Minimum number of direct pictures the video output will accept without * creating additional pictures in system memory */