buildsystem + xcodeproj: replaced BWToolKit with BGHUDAppKit

[vlc] / src / libvlc-module.c

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 94d60ba7944ce72eb8cf1204527c57d96685169b..64d719c3f0f7650ab04eff39019e2993c786b213 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -847,7 +847,7 @@ static const char *const ppsz_clock_descriptions[] =
 #define VCD_DEV_TEXT N_("VCD device")
 #define CDAUDIO_DEV_TEXT N_("Audio CD device")
 
-#ifdef WIN32
+#if defined( WIN32 ) || defined( __OS2__ )
 # define DVD_DEV_LONGTEXT N_( \
     "This is the default DVD drive (or file) to use. Don't forget the colon " \
     "after the drive letter (e.g. D:)")
@@ -1795,7 +1795,7 @@ vlc_module_begin ()
                  SUB_AUTO_TEXT, SUB_AUTO_LONGTEXT, false )
     add_integer( "sub-autodetect-fuzzy", 3,
                  SUB_FUZZY_TEXT, SUB_FUZZY_LONGTEXT, true )
-#ifdef WIN32
+#if defined( WIN32 ) || defined( __OS2__ )
 #   define SUB_PATH ".\\subtitles"
 #else
 #   define SUB_PATH "./Subtitles, ./subtitles"
@@ -1996,7 +1996,7 @@ vlc_module_begin ()
                                 SOUT_MUX_CACHING_LONGTEXT, true )
 
     set_section( N_("VLM"), NULL )
-    add_string( "vlm-conf", NULL, VLM_CONF_TEXT,
+    add_loadfile( "vlm-conf", NULL, VLM_CONF_TEXT,
                     VLM_CONF_LONGTEXT, true )
 
 
@@ -2018,7 +2018,6 @@ vlc_module_begin ()
                 PACKETIZER_TEXT, PACKETIZER_LONGTEXT, true )
 
     set_subcategory( SUBCAT_SOUT_SAP )
-    add_obsolete_bool( "sap-flow-control" )
     add_integer( "sap-interval", 5, ANN_SAPINTV_TEXT,
                                ANN_SAPINTV_LONGTEXT, true )
 
@@ -2075,11 +2074,6 @@ vlc_module_begin ()
         change_need_restart ()
 
     set_section( N_("Performance options"), NULL )
-    add_obsolete_bool( "minimize-threads" )
-
-    add_obsolete_bool( "use-stream-immediate" )
-
-    add_obsolete_bool( "auto-adjust-pts-delay" )
 
 #ifdef LIBVLC_USE_PTHREAD
 # ifndef __APPLE__
@@ -2202,8 +2196,6 @@ vlc_module_begin ()
     add_bool( "interact", true, INTERACTION_TEXT,
               INTERACTION_LONGTEXT, false )
 
-    add_obsolete_bool( "show-intf" );
-
     add_bool ( "stats", true, STATS_TEXT, STATS_LONGTEXT, true )
         change_need_restart ()