Remove 0.9.x deprecated aliases, add deprecation version where missing

diff --git a/modules/access/dtv/access.c b/modules/access/dtv/access.c
index 750c5398fb16c3e18cdd9818fd40521c6e2f592c..0f36d3085ad8bb496c24d51138d2ad0461eccaa4 100644 (file)
--- 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")
+        add_deprecated_alias ("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")
+        add_deprecated_alias ("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")
+        add_deprecated_alias ("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/alsa.c b/modules/audio_output/alsa.c
index f4ca1fce0666a3678bc549a50e83f79585b75ddb..00f8f548436b1274c2a9c973641180c7b7b6bc59 100644 (file)
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -82,7 +82,6 @@ vlc_module_begin ()
     set_category( CAT_AUDIO )
     set_subcategory( SUBCAT_AUDIO_AOUT )
     add_string ("alsa-audio-device", "default", N_("ALSA device"), NULL, false)
-        add_deprecated_alias( "alsadev" )   /* deprecated since 0.9.3 */
         change_string_list( ppsz_devices, ppsz_devices_text, FindDevicesCallback )
         change_action_add( FindDevicesCallback, N_("Refresh list") )
 

diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c
index 40785644be04f19b780842c3871a2dd31ebc64c3..54d4865b13f04bacc4008ae1acb79823fae573fc 100644 (file)
--- a/modules/audio_output/oss.c
+++ b/modules/audio_output/oss.c
@@ -103,7 +103,6 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_AUDIO_AOUT )
     add_loadfile( "oss-audio-device", "/dev/dsp",
                   N_("OSS DSP device"), NULL, false )
-        add_deprecated_alias( "dspdev" )   /* deprecated since 0.9.3 */
 
     set_capability( "audio output", 100 )
     add_shortcut( "oss" )

diff --git a/modules/audio_output/portaudio.c b/modules/audio_output/portaudio.c
index 3d5069a4176f5fb11b074b8736530aae6d106f3d..6bc6c699facd449fe91fc58234a1bb28d19f2997 100644 (file)
--- a/modules/audio_output/portaudio.c
+++ b/modules/audio_output/portaudio.c
@@ -114,7 +114,6 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_AUDIO_AOUT )
     add_integer( "portaudio-audio-device", 0,
                  DEVICE_TEXT, DEVICE_LONGTEXT, false )
-        add_deprecated_alias( "portaudio-device" )   /* deprecated since 0.9.3 */
     set_capability( "audio output", 0 )
     set_callbacks( Open, Close )
 vlc_module_end ()

diff --git a/modules/audio_output/waveout.c b/modules/audio_output/waveout.c
index 4f365006487550b8122ed78b92c086922123ed66..f5a1975f1c77a654966da93e355a195322df02d1 100644 (file)
--- a/modules/audio_output/waveout.c
+++ b/modules/audio_output/waveout.c
@@ -95,7 +95,6 @@ vlc_module_begin ()
 
     add_string( "waveout-audio-device", "wavemapper",
                  DEVICE_TEXT, DEVICE_LONG, false )
-       add_deprecated_alias( "waveout-dev" )   /* deprecated since 0.9.3 */
        change_string_list( ppsz_adev, ppsz_adev_text, ReloadWaveoutDevices )
        change_action_add( ReloadWaveoutDevices, N_("Refresh list") )
 

diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c
index 203a6e05ccbe29fda59f8e34608eada55353eded..ed73a7bd5801f79abe2029f055af949e2eb245da 100644 (file)
--- a/modules/video_filter/mosaic.c
+++ b/modules/video_filter/mosaic.c
@@ -199,10 +199,8 @@ vlc_module_begin ()
 
     add_integer( CFG_PREFIX "borderw", 0,
                  BORDERW_TEXT, BORDERW_LONGTEXT, true )
-        add_deprecated_alias( CFG_PREFIX "vborder" )
     add_integer( CFG_PREFIX "borderh", 0,
                  BORDERH_TEXT, BORDERH_LONGTEXT, true )
-        add_deprecated_alias( CFG_PREFIX "hborder" )
 
     add_integer( CFG_PREFIX "position", 0,
                  POS_TEXT, POS_LONGTEXT, false )

diff --git a/modules/video_filter/postproc.c b/modules/video_filter/postproc.c
index 00eb7cc4164e21178cc4bbb5f7501dbd663335d4..bb4a1d7c34e2999b82677551b0cab0c14286060d 100644 (file)
--- a/modules/video_filter/postproc.c
+++ b/modules/video_filter/postproc.c
@@ -85,11 +85,9 @@ vlc_module_begin ()
 
     add_integer_with_range( FILTER_PREFIX "q", PP_QUALITY_MAX, 0,
                             PP_QUALITY_MAX, Q_TEXT, Q_LONGTEXT, false )
-        add_deprecated_alias( "ffmpeg-pp-q" )
         change_safe()
     add_string( FILTER_PREFIX "name", "default", NAME_TEXT,
                 NAME_LONGTEXT, true )
-        add_deprecated_alias( "ffmpeg-pp-name" )
 vlc_module_end ()
 
 static const char *const ppsz_filter_options[] = {

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index f15ca9199a72d7ab1c544cdddc13e097f0072a77..5b085b3e5eba41ce3aeea5703a35cbdfba377ccf 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1644,9 +1644,6 @@ vlc_module_begin ()
         change_safe ()
     add_bool( "embedded-video", 1, EMBEDDED_TEXT, EMBEDDED_LONGTEXT,
               true )
-#ifdef __APPLE__
-       add_deprecated_alias( "macosx-embedded" ) /*deprecated since 0.9.0 */
-#endif
     add_bool( "xlib", true, "", "", true )
         change_private ()
     add_bool( "drop-late-frames", 1, DROP_LATE_FRAMES_TEXT,
@@ -1671,7 +1668,7 @@ vlc_module_begin ()
     add_bool( "video-wallpaper", false, WALLPAPER_TEXT,
               WALLPAPER_LONGTEXT, false )
 #ifdef WIN32
-        add_deprecated_alias( "directx-wallpaper" )
+        add_deprecated_alias( "directx-wallpaper" ) /* since 1.1.0 */
 #endif
     add_bool( "disable-screensaver", true, SS_TEXT, SS_LONGTEXT,
               true )
@@ -1756,7 +1753,7 @@ vlc_module_begin ()
                 VIDEO_FILTER_TEXT, VIDEO_FILTER_LONGTEXT, false )
     add_module_list_cat( "video-splitter", SUBCAT_VIDEO_VFILTER, NULL,
                         VIDEO_SPLITTER_TEXT, VIDEO_SPLITTER_LONGTEXT, false )
-    add_deprecated_alias( "vout-filter" )
+    add_deprecated_alias( "vout-filter" ) /* since 1.2.0 */
 #if 0
     add_string( "pixel-ratio", "1", PIXEL_RATIO_TEXT, PIXEL_RATIO_TEXT )
 #endif
@@ -2480,7 +2477,6 @@ vlc_module_begin ()
 
     add_key( "key-toggle-fullscreen", KEY_TOGGLE_FULLSCREEN, TOGGLE_FULLSCREEN_KEY_TEXT,
              TOGGLE_FULLSCREEN_KEY_LONGTEXT, false )
-       add_deprecated_alias( "key-fullscreen" ) /*deprecated since 0.9.0 */
     add_key( "key-leave-fullscreen", KEY_LEAVE_FULLSCREEN, LEAVE_FULLSCREEN_KEY_TEXT,
              LEAVE_FULLSCREEN_KEY_LONGTEXT, false )
     add_key( "key-play-pause", KEY_PLAY_PAUSE, PLAY_PAUSE_KEY_TEXT,