[vlc-commits] Remove old deprecated aliases and replace new one with obsolete items

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Oct  2 15:22:16 2011 +0300| [334e9ba0800bb46718dbb07979db8723a7f03118] | committer: 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.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=334e9ba0800bb46718dbb07979db8723a7f03118
---

 modules/access/dtv/access.c    |    6 +++---
 modules/audio_output/directx.c |    1 -
 src/libvlc-module.c            |   11 ++++-------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/modules/access/dtv/access.c b/modules/access/dtv/access.c
index 0f36d30..adbfc94 100644
--- a/modules/access/dtv/access.c
+++ b/modules/access/dtv/access.c
@@ -364,14 +364,14 @@ vlc_module_begin ()
 #endif
     add_integer ("dvb-lnb-low", 0, LNB_LOW_TEXT, LNB_LONGTEXT, true)
         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)
         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,
                  LNB_SWITCH_TEXT, LNB_SWITCH_LONGTEXT, true)
         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__
     add_integer ("dvb-satno", 0, SATNO_TEXT, SATNO_LONGTEXT, true)
         change_integer_list (satno_vlc, satno_user)
diff --git a/modules/audio_output/directx.c b/modules/audio_output/directx.c
index 012d622..f3a2ba2 100644
--- a/modules/audio_output/directx.c
+++ b/modules/audio_output/directx.c
@@ -133,7 +133,6 @@ vlc_module_begin ()
 
     add_string( "directx-audio-device-name", "default",
              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_action_add( ReloadDirectXDevices, N_("Refresh list") )
     add_bool( "directx-audio-float32", false, FLOAT_TEXT,
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 212c08e..3724bbc 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1667,9 +1667,6 @@ vlc_module_begin ()
               VIDEO_ON_TOP_LONGTEXT, false )
     add_bool( "video-wallpaper", false, WALLPAPER_TEXT,
               WALLPAPER_LONGTEXT, false )
-#ifdef WIN32
-        add_deprecated_alias( "directx-wallpaper" ) /* since 1.1.0 */
-#endif
     add_bool( "disable-screensaver", true, SS_TEXT, SS_LONGTEXT,
               true )
 
@@ -1882,13 +1879,13 @@ vlc_module_begin ()
     add_integer( "rtsp-port", 8554, RTSP_PORT_TEXT, RTSP_PORT_LONGTEXT, true )
         change_integer_range( 1, 65535 )
     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_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_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_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 )
     add_string( "socks", NULL,