Fix warning

[vlc] / include / vlc_config.h

diff --git a/include/vlc_config.h b/include/vlc_config.h
index debf4225a0d692db46a924c03ce5a0b98c087a6e..1a67c39d41e6087be118d6df097adfd9988bb63b 100644 (file)
--- a/include/vlc_config.h
+++ b/include/vlc_config.h
@@ -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
@@ -45,9 +45,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 +72,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 +96,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