X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_config.h;h=64d902739ada68fe42bee6501e4398bf79651a88;hb=90d92ef9a9dcdecf8d8aa2d9c17c31f5000dc749;hp=4ec6edb3f7ed6ab3004e4a9a3bd478bc4f8bf23a;hpb=6bb8e8f4fd0d1c479fa53bddf92a7a3f21d77123;p=vlc

diff --git a/include/vlc_config.h b/include/vlc_config.h
index 4ec6edb3f7..64d902739a 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
+ * Copyright (C) 1999-2003 the VideoLAN team
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -19,9 +19,13 @@
  *
  * 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.
  *****************************************************************************/
 
+#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
  * ----------------------------------------------------
  *
@@ -45,9 +49,9 @@
 #define THREAD_COND_TIMEOUT             1
 
 /* The configuration file and directory */
-#ifdef SYS_BEOS
+#if defined (SYS_BEOS)
 #  define CONFIG_DIR                    "config/settings/VideoLAN Client"
-#elif SYS_DARWIN
+#elif defined (__APPLE__)
 #  define CONFIG_DIR                    "Library/Preferences/VLC"
 #elif defined( WIN32 ) || defined( UNDER_CE )
 #  define CONFIG_DIR                    "vlc"
@@ -72,6 +76,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,11 +100,9 @@
 
 /* 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"
 #else
-#   define DVD_DEVICE "D:"
 #   define VCD_DEVICE "D:"
 #   define CDAUDIO_DEVICE "D:"
 #endif
@@ -189,7 +195,7 @@
 
 /* Pictures which are VOUT_BOGUS_DELAY or more in advance probably have
  * a bogus PTS and won't be displayed */
-#define VOUT_BOGUS_DELAY                ((mtime_t)(DEFAULT_PTS_DELAY * 3))
+#define VOUT_BOGUS_DELAY                ((mtime_t)(DEFAULT_PTS_DELAY * 30))
 
 /* Delay (in microseconds) before an idle screen is displayed */
 #define VOUT_IDLE_DELAY                 (5*CLOCK_FREQ)