Remove old obsolete variables.

diff --git a/modules/access/http.c b/modules/access/http.c
index b45485835d3556cbf019dcd785bff8a01630a860..39a587839ae5d30f79449c0226a8d21972acd155 100644 (file)
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -143,8 +143,6 @@ vlc_module_begin ()
     add_bool( "http-use-IE-proxy", false, USE_IE_PROXY_TEXT,
               USE_IE_PROXY_LONGTEXT, true )
 #endif
-    add_obsolete_string("http-user")
-    add_obsolete_string("http-pwd")
     /* 'itpc' = iTunes Podcast */
     add_shortcut( "http", "https", "unsv", "itpc", "icyx" )
     set_callbacks( Open, Close )

diff --git a/modules/access_output/udp.c b/modules/access_output/udp.c
index 5f0f4a9b966d4a10dbac6cd5c5509c092ef5b016..482c391a4891203cce03cce1d85c8b3d9d307426 100644 (file)
--- a/modules/access_output/udp.c
+++ b/modules/access_output/udp.c
@@ -81,8 +81,6 @@ vlc_module_begin ()
     add_integer( SOUT_CFG_PREFIX "caching", DEFAULT_PTS_DELAY / 1000, CACHING_TEXT, CACHING_LONGTEXT, true )
     add_integer( SOUT_CFG_PREFIX "group", 1, GROUP_TEXT, GROUP_LONGTEXT,
                                  true )
-    add_obsolete_integer( SOUT_CFG_PREFIX "late" )
-    add_obsolete_bool( SOUT_CFG_PREFIX "raw" )
 
     set_capability( "sout access", 0 )
     add_shortcut( "udp" )

diff --git a/modules/codec/dvbsub.c b/modules/codec/dvbsub.c
index 432f9b0bb18ee300080af6a30a1fc8648cae7492..11055fb12f8e2a0a9d6cf188b5d38de0e5ba587c 100644 (file)
--- a/modules/codec/dvbsub.c
+++ b/modules/codec/dvbsub.c
@@ -135,7 +135,6 @@ vlc_module_begin ()
 
     add_integer( ENC_CFG_PREFIX "x", -1, ENC_POSX_TEXT, ENC_POSX_LONGTEXT, false )
     add_integer( ENC_CFG_PREFIX "y", -1, ENC_POSY_TEXT, ENC_POSY_LONGTEXT, false )
-    add_obsolete_integer( ENC_CFG_PREFIX "timeout" ) /* Suppressed since 0.8.5 */
 vlc_module_end ()
 
 static const char *const ppsz_enc_options[] = { "x", "y", NULL };

diff --git a/modules/control/http/http.c b/modules/control/http/http.c
index bc087a5474e74f41787dac13a0023a5b8cfb3789..59eba58672d2ad305b2397823692393e398fd182 100644 (file)
--- a/modules/control/http/http.c
+++ b/modules/control/http/http.c
@@ -72,7 +72,6 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_INTERFACE_MAIN )
         add_string ( "http-host", NULL, HOST_TEXT, HOST_LONGTEXT, true )
         add_string ( "http-src",  NULL, SRC_TEXT,  SRC_LONGTEXT,  true )
-        add_obsolete_string ( "http-charset" )
 #if defined( HAVE_FORK ) || defined( WIN32 )
         add_string ( "http-handlers", NULL, HANDLERS_TEXT, HANDLERS_LONGTEXT, true )
 #endif

diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c
index f5c2b12357db32e58b8d2b2efd650c984db21bda..520c9147ef186be6ed600281cdd211eba47d2950 100644 (file)
--- a/modules/misc/gnutls.c
+++ b/modules/misc/gnutls.c
@@ -91,9 +91,6 @@ vlc_module_begin ()
     set_category( CAT_ADVANCED )
     set_subcategory( SUBCAT_ADVANCED_MISC )
 
-    add_obsolete_bool( "tls-check-cert" )
-    add_obsolete_bool( "tls-check-hostname" )
-
     add_submodule ()
         set_description( N_("GnuTLS server") )
         set_capability( "tls server", 1 )
@@ -101,7 +98,6 @@ vlc_module_begin ()
         set_subcategory( SUBCAT_ADVANCED_MISC )
         set_callbacks( OpenServer, CloseServer )
 
-        add_obsolete_integer( "gnutls-dh-bits" )
         add_integer( "gnutls-cache-timeout", CACHE_TIMEOUT,
                     CACHE_TIMEOUT_TEXT, CACHE_TIMEOUT_LONGTEXT, true )
         add_integer( "gnutls-cache-size", CACHE_SIZE, CACHE_SIZE_TEXT,

diff --git a/modules/mux/mpjpeg.c b/modules/mux/mpjpeg.c
index 1de2ec4cbe4774a494931613af5b5a17c00da41c..8d5817529b520787addc7597f1fd4e4b0e86d9ed 100644 (file)
--- a/modules/mux/mpjpeg.c
+++ b/modules/mux/mpjpeg.c
@@ -46,7 +46,6 @@ vlc_module_begin ()
     set_shortname( "MPJPEG" )
     set_description( N_("Multipart JPEG muxer") )
     set_capability( "sout mux", 5 )
-    add_obsolete_string( SOUT_CFG_PREFIX "separator" )
     set_category( CAT_SOUT )
     set_subcategory( SUBCAT_SOUT_MUX )
     set_callbacks( Open, Close )

diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c
index c518b98dad22eee2eb28fd76d75a0c5d0d9da244..07866390d9dd0835a50b44205fd92accea301daf 100644 (file)
--- a/modules/stream_out/standard.c
+++ b/modules/stream_out/standard.c
@@ -129,8 +129,6 @@ vlc_module_begin ()
                                         true )
     add_string( SOUT_CFG_PREFIX "phone", "", PHONE_TEXT, PHONE_LONGTEXT,
                                         true )
-    add_obsolete_bool( SOUT_CFG_PREFIX "sap-ipv6" )
-
     set_callbacks( Open, Close )
 vlc_module_end ()
 

diff --git a/modules/video_filter/marq.c b/modules/video_filter/marq.c
index 6f754cb0c0faa3137fde19494242d4e0b78d5499..c4e8e4b84f5059806d02fa438a11b23acc88a707 100644 (file)
--- a/modules/video_filter/marq.c
+++ b/modules/video_filter/marq.c
@@ -177,13 +177,6 @@ vlc_module_begin ()
                  REFRESH_LONGTEXT, false )
 
     add_shortcut( "time" )
-    add_obsolete_string( "time-format" )
-    add_obsolete_string( "time-x" )
-    add_obsolete_string( "time-y" )
-    add_obsolete_string( "time-position" )
-    add_obsolete_string( "time-opacity" )
-    add_obsolete_string( "time-color" )
-    add_obsolete_string( "time-size" )
 vlc_module_end ()
 
 static const char *const ppsz_filter_options[] = {

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 94d60ba7944ce72eb8cf1204527c57d96685169b..8cdc2b52ab3620b49edac6d476888ada1fcbc8f0 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -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 ()