X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_config.h;h=1293190361a7ad678aa7ef9f69cd473f3520a94f;hb=226a9890d4e876a1b2ecd841b0780dc3d83e184e;hp=41f9d89d37568528f5c605ad1420e35583d27d45;hpb=2cb472dba008f7d877ffe6bae9c5575253365282;p=vlc

diff --git a/include/vlc_config.h b/include/vlc_config.h
index 41f9d89d37..1293190361 100644
--- a/include/vlc_config.h
+++ b/include/vlc_config.h
@@ -22,6 +22,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#if !defined( __LIBVLC__ )
+  #error You are not libvlc or one of its plugins. You cannot include this file
+#endif
+
 /* Conventions regarding names of symbols and variables
  * ----------------------------------------------------
  *
@@ -42,20 +46,7 @@
 
 /* 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"
+#define THREAD_COND_TIMEOUT             3
 
 /*****************************************************************************
  * Interface configuration
@@ -72,6 +63,10 @@
  * Input thread configuration
  *****************************************************************************/
 
+#define DEFAULT_INPUT_ACTIVITY 1
+#define DIRECTORY_ACTIVITY 100
+#define TRANSCODE_ACTIVITY 10
+
 /* Used in ErrorThread */
 #define INPUT_IDLE_SLEEP                ((mtime_t)(0.100*CLOCK_FREQ))
 
@@ -92,18 +87,21 @@
 
 /* DVD and VCD devices */
 #if !defined( WIN32 ) && !defined( UNDER_CE )
-#   define VCD_DEVICE "/dev/cdrom"
-#   define CDAUDIO_DEVICE "/dev/cdrom"
+#   define CD_DEVICE      "/dev/cdrom"
+#   define DVD_DEVICE     "/dev/dvd"
 #else
-#   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