Commit 334e9ba0 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove old deprecated aliases and replace new one with obsolete items

add_deprecated_alias does not work at all, so lets avoid it. Anyway,
the remaining affected configuration items are not very commonly used.
This works around #5266.
parent 0be0fafa
...@@ -364,14 +364,14 @@ vlc_module_begin () ...@@ -364,14 +364,14 @@ vlc_module_begin ()
#endif #endif
add_integer ("dvb-lnb-low", 0, LNB_LOW_TEXT, LNB_LONGTEXT, true) add_integer ("dvb-lnb-low", 0, LNB_LOW_TEXT, LNB_LONGTEXT, true)
change_integer_range (0, 0x7fffffff) change_integer_range (0, 0x7fffffff)
add_deprecated_alias ("dvb-lnb-lof1") /* since 1.2.0 */ add_obsolete_integer ("dvb-lnb-lof1") /* since 1.2.0 */
add_integer ("dvb-lnb-high", 0, LNB_HIGH_TEXT, LNB_LONGTEXT, true) add_integer ("dvb-lnb-high", 0, LNB_HIGH_TEXT, LNB_LONGTEXT, true)
change_integer_range (0, 0x7fffffff) change_integer_range (0, 0x7fffffff)
add_deprecated_alias ("dvb-lnb-lof2") /* since 1.2.0 */ add_obsolete_integer ("dvb-lnb-lof2") /* since 1.2.0 */
add_integer ("dvb-lnb-switch", 11700000, add_integer ("dvb-lnb-switch", 11700000,
LNB_SWITCH_TEXT, LNB_SWITCH_LONGTEXT, true) LNB_SWITCH_TEXT, LNB_SWITCH_LONGTEXT, true)
change_integer_range (0, 0x7fffffff) change_integer_range (0, 0x7fffffff)
add_deprecated_alias ("dvb-lnb-slof") /* since 1.2.0 */ add_obsolete_integer ("dvb-lnb-slof") /* since 1.2.0 */
#ifdef __linux__ #ifdef __linux__
add_integer ("dvb-satno", 0, SATNO_TEXT, SATNO_LONGTEXT, true) add_integer ("dvb-satno", 0, SATNO_TEXT, SATNO_LONGTEXT, true)
change_integer_list (satno_vlc, satno_user) change_integer_list (satno_vlc, satno_user)
......
...@@ -133,7 +133,6 @@ vlc_module_begin () ...@@ -133,7 +133,6 @@ vlc_module_begin ()
add_string( "directx-audio-device-name", "default", add_string( "directx-audio-device-name", "default",
DEVICE_TEXT, DEVICE_LONGTEXT, false ) DEVICE_TEXT, DEVICE_LONGTEXT, false )
add_deprecated_alias( "directx-audio-device" ) /* Since 1.1.0 */
change_string_list( ppsz_adev, ppsz_adev_text, ReloadDirectXDevices ) change_string_list( ppsz_adev, ppsz_adev_text, ReloadDirectXDevices )
change_action_add( ReloadDirectXDevices, N_("Refresh list") ) change_action_add( ReloadDirectXDevices, N_("Refresh list") )
add_bool( "directx-audio-float32", false, FLOAT_TEXT, add_bool( "directx-audio-float32", false, FLOAT_TEXT,
......
...@@ -1667,9 +1667,6 @@ vlc_module_begin () ...@@ -1667,9 +1667,6 @@ vlc_module_begin ()
VIDEO_ON_TOP_LONGTEXT, false ) VIDEO_ON_TOP_LONGTEXT, false )
add_bool( "video-wallpaper", false, WALLPAPER_TEXT, add_bool( "video-wallpaper", false, WALLPAPER_TEXT,
WALLPAPER_LONGTEXT, false ) WALLPAPER_LONGTEXT, false )
#ifdef WIN32
add_deprecated_alias( "directx-wallpaper" ) /* since 1.1.0 */
#endif
add_bool( "disable-screensaver", true, SS_TEXT, SS_LONGTEXT, add_bool( "disable-screensaver", true, SS_TEXT, SS_LONGTEXT,
true ) true )
...@@ -1882,13 +1879,13 @@ vlc_module_begin () ...@@ -1882,13 +1879,13 @@ vlc_module_begin ()
add_integer( "rtsp-port", 8554, RTSP_PORT_TEXT, RTSP_PORT_LONGTEXT, true ) add_integer( "rtsp-port", 8554, RTSP_PORT_TEXT, RTSP_PORT_LONGTEXT, true )
change_integer_range( 1, 65535 ) change_integer_range( 1, 65535 )
add_loadfile( "http-cert", NULL, HTTP_CERT_TEXT, CERT_LONGTEXT, true ) add_loadfile( "http-cert", NULL, HTTP_CERT_TEXT, CERT_LONGTEXT, true )
add_deprecated_alias( "sout-http-cert" ) /* since 1.2.0 */ add_obsolete_string( "sout-http-cert" ) /* since 1.2.0 */
add_loadfile( "http-key", NULL, HTTP_KEY_TEXT, KEY_LONGTEXT, true ) add_loadfile( "http-key", NULL, HTTP_KEY_TEXT, KEY_LONGTEXT, true )
add_deprecated_alias( "sout-http-key" ) /* since 1.2.0 */ add_obsolete_string( "sout-http-key" ) /* since 1.2.0 */
add_loadfile( "http-ca", NULL, HTTP_CA_TEXT, CA_LONGTEXT, true ) add_loadfile( "http-ca", NULL, HTTP_CA_TEXT, CA_LONGTEXT, true )
add_deprecated_alias( "sout-http-ca" ) /* since 1.2.0 */ add_obsolete_string( "sout-http-ca" ) /* since 1.2.0 */
add_loadfile( "http-crl", NULL, HTTP_CRL_TEXT, CRL_LONGTEXT, true ) add_loadfile( "http-crl", NULL, HTTP_CRL_TEXT, CRL_LONGTEXT, true )
add_deprecated_alias( "sout-http-crl" ) /* since 1.2.0 */ add_obsolete_string( "sout-http-crl" ) /* since 1.2.0 */
set_section( N_( "Socks proxy") , NULL ) set_section( N_( "Socks proxy") , NULL )
add_string( "socks", NULL, add_string( "socks", NULL,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment