diff --git a/modules/access/dtv/access.c b/modules/access/dtv/access.c
index 83d318c6f9e306c85e9fbaa7582ce93509747915..4f1ef75937e95edb236b2f873e175ca91ba8f92c 100644
--- a/modules/access/dtv/access.c
+++ b/modules/access/dtv/access.c
@@ -391,14 +391,11 @@ vlc_module_begin ()
#endif
add_integer ("dvb-lnb-low", 0, LNB_LOW_TEXT, LNB_LONGTEXT, true)
change_integer_range (0, 0x7fffffff)
- add_obsolete_integer ("dvb-lnb-lof1") /* since 2.0.0 */
add_integer ("dvb-lnb-high", 0, LNB_HIGH_TEXT, LNB_LONGTEXT, true)
change_integer_range (0, 0x7fffffff)
- add_obsolete_integer ("dvb-lnb-lof2") /* since 2.0.0 */
add_integer ("dvb-lnb-switch", 11700000,
LNB_SWITCH_TEXT, LNB_SWITCH_LONGTEXT, true)
change_integer_range (0, 0x7fffffff)
- add_obsolete_integer ("dvb-lnb-slof") /* since 2.0.0 */
#ifdef HAVE_LINUX_DVB
add_integer ("dvb-satno", 0, SATNO_TEXT, SATNO_LONGTEXT, true)
change_integer_list (satno_vlc, satno_user)
diff --git a/modules/access/udp.c b/modules/access/udp.c
index 66f33b696d3f1ad45973cb488421a074c6240752..1b825cf624ad8ae927d39f6088c945bcd826e024 100644
--- a/modules/access/udp.c
+++ b/modules/access/udp.c
@@ -239,7 +239,6 @@ vlc_module_begin()
set_category(CAT_INPUT)
set_subcategory(SUBCAT_INPUT_ACCESS)
- add_obsolete_integer("server-port") /* since 2.0.0 */
add_obsolete_integer("udp-buffer") /* since 3.0.0 */
add_integer("udp-timeout", -1, TIMEOUT_TEXT, NULL, true)
diff --git a/modules/access/v4l2/v4l2.c b/modules/access/v4l2/v4l2.c
index 35038f76e6d8a3e369d58523f6682d20648550d4..46db7a627bdce9aa5f64b901fe4cf58721eb38a6 100644
--- a/modules/access/v4l2/v4l2.c
+++ b/modules/access/v4l2/v4l2.c
@@ -300,7 +300,6 @@ vlc_module_begin ()
AUDIO_INPUT_LONGTEXT, true )
change_integer_range( -1, 0xFFFFFFFE )
change_safe()
- add_obsolete_integer( CFG_PREFIX "io" ) /* since 2.0.0 */
add_integer( CFG_PREFIX "width", 0, WIDTH_TEXT, SIZE_LONGTEXT, false )
change_integer_range( 0, VOUT_MAX_WIDTH )
change_safe()
@@ -355,7 +354,6 @@ vlc_module_begin ()
add_integer( CFG_PREFIX "auto-white-balance", -1,
AUTOWHITEBALANCE_TEXT, AUTOWHITEBALANCE_LONGTEXT, true )
change_integer_list( tristate_vlc, tristate_user )
- add_obsolete_integer( CFG_PREFIX"do-white-balance" ) /* since 2.0.0 */
add_integer( CFG_PREFIX "red-balance", -1, REDBALANCE_TEXT,
REDBALANCE_LONGTEXT, true )
add_integer( CFG_PREFIX "blue-balance", -1, BLUEBALANCE_TEXT,
diff --git a/modules/gui/macosx/main/macosx.m b/modules/gui/macosx/main/macosx.m
index fb8e8544c2cc4f2d1e5910708d84bf0a6d84e707..5b7d192ca5ba4899eac91ca5cbf3dbd7bf134501 100644
--- a/modules/gui/macosx/main/macosx.m
+++ b/modules/gui/macosx/main/macosx.m
@@ -165,8 +165,6 @@ vlc_module_begin()
add_bool("macosx-appleremote-prevnext", false, USE_APPLE_REMOTE_PREVNEXT_TEXT, USE_APPLE_REMOTE_PREVNEXT_LONGTEXT, false)
add_bool("macosx-mediakeys", true, USE_MEDIAKEYS_TEXT, USE_MEDIAKEYS_LONGTEXT, false)
- add_obsolete_bool("macosx-stretch") /* since 2.0.0 */
- add_obsolete_bool("macosx-eq-keep") /* since 2.0.0 */
add_obsolete_bool("macosx-autosave-volume") /* since 2.1.0 */
add_obsolete_bool("macosx-show-sidebar") /* since 3.0.1 */
add_obsolete_bool("macosx-interfacestyle") /* since 4.0.0 */
diff --git a/modules/gui/qt/qt.cpp b/modules/gui/qt/qt.cpp
index f420461fdc960ada465cea3ff2b388c8158a1344..2c79b84280a11afdd94386b0e86df28cae6e2bf7 100644
--- a/modules/gui/qt/qt.cpp
+++ b/modules/gui/qt/qt.cpp
@@ -379,10 +379,6 @@ vlc_module_begin ()
add_integer_with_range( "qt-fs-sensitivity", 3, 0, 4000, FULLSCREEN_CONTROL_PIXELS,
nullptr, true)
- add_obsolete_bool( "qt-adv-options" ) /* Since 2.0.0 */
- add_obsolete_bool( "qt-volume-complete" ) /* Since 2.0.0 */
- add_obsolete_integer( "qt-startvolume" ) /* Since 2.0.0 */
-
add_integer( "qt-auto-raise", MainInterface::RAISE_VIDEO, AUTORAISE_ON_PLAYBACK_TEXT,
AUTORAISE_ON_PLAYBACK_LONGTEXT, false )
change_integer_list( i_raise_list, psz_raise_list_text )
diff --git a/modules/services_discovery/sap.c b/modules/services_discovery/sap.c
index da3c1a65cdae6c22a644d97109ec3c67df7808a0..a4ef6e8b648ac139aeaf5206caf4b3ffb4e0b0aa 100644
--- a/modules/services_discovery/sap.c
+++ b/modules/services_discovery/sap.c
@@ -643,8 +643,6 @@ vlc_module_begin()
set_subcategory(SUBCAT_PLAYLIST_SD)
add_string("sap-addr", NULL, SAP_ADDR_TEXT, SAP_ADDR_LONGTEXT, true)
- add_obsolete_bool("sap-ipv4") /* since 2.0.0 */
- add_obsolete_bool("sap-ipv6") /* since 2.0.0 */
add_integer("sap-timeout", 1800,
SAP_TIMEOUT_TEXT, SAP_TIMEOUT_LONGTEXT, true)
add_obsolete_bool("sap-parse") /* since 4.0.0 */
diff --git a/modules/video_output/xcb/x11.c b/modules/video_output/xcb/x11.c
index f48471f0c5cc0550684a12f94b608be3ee86b051..b61d1b83bd9e7f8ee0143766c105083557c42898 100644
--- a/modules/video_output/xcb/x11.c
+++ b/modules/video_output/xcb/x11.c
@@ -358,6 +358,4 @@ vlc_module_begin()
set_subcategory(SUBCAT_VIDEO_VOUT)
set_callback_display(Open, 100)
add_shortcut("xcb-x11", "x11")
-
- add_obsolete_bool("x11-shm") /* obsoleted since 2.0.0 */
vlc_module_end()
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 70129e207827a62a3ddfb38ed3c983e5fae18cac..3d9039e6f8791ec3d3720af791dd5d6dbc7a8c80 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1554,7 +1554,6 @@ vlc_module_begin ()
VOLUME_STEP_LONGTEXT, true )
change_float_range( 1., AOUT_VOLUME_DEFAULT )
add_bool( "volume-save", true, VOLUME_SAVE_TEXT, NULL, true )
- add_obsolete_integer( "aout-rate" ) /* since 2.0.0 */
#if defined(__ANDROID__) || defined(__APPLE__) || defined(_WIN32)
add_bool( "spdif", false, SPDIF_TEXT, SPDIF_LONGTEXT, true )
#else
@@ -1866,8 +1865,6 @@ vlc_module_begin ()
set_section( N_( "Network settings" ), NULL )
add_integer( "mtu", MTU_DEFAULT, MTU_TEXT, MTU_LONGTEXT, true )
- add_obsolete_bool( "ipv6" ) /* since 2.0.0 */
- add_obsolete_bool( "ipv4" ) /* since 2.0.0 */
add_integer( "ipv4-timeout", 5 * 1000, TIMEOUT_TEXT,
TIMEOUT_LONGTEXT, true )
change_integer_range( 0, INT_MAX )
@@ -1881,13 +1878,9 @@ vlc_module_begin ()
add_integer( "rtsp-port", 554, RTSP_PORT_TEXT, RTSP_PORT_LONGTEXT, true )
change_integer_range( 1, 65535 )
add_loadfile("http-cert", NULL, HTTP_CERT_TEXT, CERT_LONGTEXT)
- add_obsolete_string( "sout-http-cert" ) /* since 2.0.0 */
add_loadfile("http-key", NULL, HTTP_KEY_TEXT, KEY_LONGTEXT)
- add_obsolete_string( "sout-http-key" ) /* since 2.0.0 */
add_obsolete_string( "http-ca" ) /* since 3.0.0 */
- add_obsolete_string( "sout-http-ca" ) /* since 2.0.0 */
add_obsolete_string( "http-crl" ) /* since 3.0.0 */
- add_obsolete_string( "sout-http-crl" ) /* since 2.0.0 */
#ifdef _WIN32
add_string( "http-proxy", NULL, PROXY_TEXT, PROXY_LONGTEXT,
@@ -1941,46 +1934,18 @@ vlc_module_begin ()
CACHING_TEXT, CACHING_LONGTEXT, true )
change_integer_range( 0, 60000 )
change_safe()
- add_obsolete_integer( "vdr-caching" ) /* 2.0.0 */
add_integer( "live-caching", MS_FROM_VLC_TICK(DEFAULT_PTS_DELAY),
CAPTURE_CACHING_TEXT, CAPTURE_CACHING_LONGTEXT, true )
change_integer_range( 0, 60000 )
change_safe()
- add_obsolete_integer( "alsa-caching" ) /* 2.0.0 */
- add_obsolete_integer( "dshow-caching" ) /* 2.0.0 */
- add_obsolete_integer( "dv-caching" ) /* 2.0.0 */
- add_obsolete_integer( "dvb-caching" ) /* 2.0.0 */
- add_obsolete_integer( "eyetv-caching" ) /* 2.0.0 */
- add_obsolete_integer( "jack-input-caching" ) /* 2.0.0 */
- add_obsolete_integer( "linsys-hdsdi-caching" ) /* 2.0.0 */
- add_obsolete_integer( "linsys-sdi-caching" ) /* 2.0.0 */
- add_obsolete_integer( "oss-caching" ) /* 2.0.0 */
- add_obsolete_integer( "screen-caching" ) /* 2.0.0 */
- add_obsolete_integer( "v4l2-caching" ) /* 2.0.0 */
add_integer( "disc-caching", MS_FROM_VLC_TICK(DEFAULT_PTS_DELAY),
DISC_CACHING_TEXT, DISC_CACHING_LONGTEXT, true )
change_integer_range( 0, 60000 )
change_safe()
- add_obsolete_integer( "bd-caching" ) /* 2.0.0 */
- add_obsolete_integer( "bluray-caching" ) /* 2.0.0 */
- add_obsolete_integer( "cdda-caching" ) /* 2.0.0 */
- add_obsolete_integer( "dvdnav-caching" ) /* 2.0.0 */
- add_obsolete_integer( "dvdread-caching" ) /* 2.0.0 */
- add_obsolete_integer( "vcd-caching" ) /* 2.0.0 */
add_integer( "network-caching", 1000,
NETWORK_CACHING_TEXT, NETWORK_CACHING_LONGTEXT, true )
change_integer_range( 0, 60000 )
change_safe()
- add_obsolete_integer( "ftp-caching" ) /* 2.0.0 */
- add_obsolete_integer( "http-caching" ) /* 2.0.0 */
- add_obsolete_integer( "mms-caching" ) /* 2.0.0 */
- add_obsolete_integer( "realrtsp-caching" ) /* 2.0.0 */
- add_obsolete_integer( "rtp-caching" ) /* 2.0.0 */
- add_obsolete_integer( "rtsp-caching" ) /* 2.0.0 */
- add_obsolete_integer( "sftp-caching" ) /* 2.0.0 */
- add_obsolete_integer( "smb-caching" ) /* 2.0.0 */
- add_obsolete_integer( "tcp-caching" ) /* 2.0.0 */
- add_obsolete_integer( "udp-caching" ) /* 2.0.0 */
add_integer( "cr-average", 40, CR_AVERAGE_TEXT,
CR_AVERAGE_LONGTEXT, true )
@@ -2067,7 +2032,6 @@ vlc_module_begin ()
ACCESS_OUTPUT_TEXT, ACCESS_OUTPUT_LONGTEXT)
add_integer( "ttl", -1, TTL_TEXT, TTL_LONGTEXT, true )
add_string( "miface", NULL, MIFACE_TEXT, MIFACE_LONGTEXT, true )
- add_obsolete_string( "miface-addr" ) /* since 2.0.0 */
add_integer( "dscp", 0, DSCP_TEXT, DSCP_LONGTEXT, true )
set_subcategory( SUBCAT_SOUT_PACKETIZER )
@@ -2076,24 +2040,8 @@ vlc_module_begin ()
set_subcategory( SUBCAT_SOUT_VOD )
-/* CPU options */
- set_category( CAT_ADVANCED )
-#if defined( __i386__ ) || defined( __x86_64__ )
- add_obsolete_bool( "mmx" ) /* since 2.0.0 */
- add_obsolete_bool( "3dn" ) /* since 2.0.0 */
- add_obsolete_bool( "mmxext" ) /* since 2.0.0 */
- add_obsolete_bool( "sse" ) /* since 2.0.0 */
- add_obsolete_bool( "sse2" ) /* since 2.0.0 */
- add_obsolete_bool( "sse3" ) /* since 2.0.0 */
- add_obsolete_bool( "ssse3" ) /* since 2.0.0 */
- add_obsolete_bool( "sse41" ) /* since 2.0.0 */
- add_obsolete_bool( "sse42" ) /* since 2.0.0 */
-#endif
-#if defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ )
- add_obsolete_bool( "altivec" ) /* since 2.0.0 */
-#endif
-
/* Advanced options */
+ set_category( CAT_ADVANCED )
set_subcategory( SUBCAT_ADVANCED_MISC )
add_category_hint(N_("Advanced"), NULL)
set_section( N_("Special modules"), NULL )
@@ -2108,7 +2056,6 @@ vlc_module_begin ()
add_bool( "plugins-scan", true, PLUGINS_SCAN_TEXT,
PLUGINS_SCAN_LONGTEXT, true )
change_volatile ()
- add_obsolete_string( "plugin-path" ) /* since 2.0.0 */
#endif
add_obsolete_string( "data-path" ) /* since 2.1.0 */
add_string( "keystore", NULL, KEYSTORE_TEXT,