Commit 98a3ec28 authored by Lyndon Brown's avatar Lyndon Brown Committed by Jean-Baptiste Kempf
Browse files

purge options made obsolete during v2.1 development

parent 3ef8a8c2
......@@ -60,7 +60,6 @@ vlc_module_begin ()
set_subcategory (SUBCAT_INPUT_ACCESS)
set_help (HELP_TEXT)
add_obsolete_string ("alsa-format") /* since 2.1.0 */
add_bool ("alsa-stereo", true, STEREO_TEXT, NULL, true)
add_integer ("alsa-samplerate", 48000, RATE_TEXT, NULL, true)
change_integer_list (rate_values, rate_names)
......
......@@ -311,13 +311,11 @@ vlc_module_begin ()
change_safe()
add_string( CFG_PREFIX "fps", "60", FPS_TEXT, FPS_LONGTEXT, false )
change_safe()
add_obsolete_bool( CFG_PREFIX "use-libv4l2" ) /* since 2.1.0 */
set_section( N_( "Tuner" ), NULL )
add_loadfile(CFG_PREFIX "radio-dev", "/dev/radio0",
RADIO_DEVICE_TEXT, RADIO_DEVICE_LONGTEXT)
change_safe()
add_obsolete_integer( CFG_PREFIX "tuner" ) /* since 2.1.0 */
add_integer( CFG_PREFIX "tuner-frequency", -1, FREQUENCY_TEXT,
FREQUENCY_LONGTEXT, true )
change_integer_range( -1, 0xFFFFFFFE )
......
......@@ -61,7 +61,6 @@ vlc_module_begin ()
add_string("auhal-audio-device", "", DEVICE_TEXT, NULL, true)
add_string("auhal-warned-devices", "", NULL, NULL, true)
change_private()
add_obsolete_integer("macosx-audio-device") /* since 2.1.0 */
vlc_module_end ()
#pragma mark -
......
......@@ -74,7 +74,6 @@ vlc_module_begin ()
add_string( "directx-audio-device", NULL,
DEVICE_TEXT, DEVICE_LONGTEXT, false )
add_obsolete_string( "directx-audio-device-name")
add_bool( "directx-audio-float32", true, FLOAT_TEXT,
FLOAT_LONGTEXT, true )
add_string( "directx-audio-speaker", "Windows default",
......
......@@ -95,45 +95,31 @@ vlc_module_begin ()
set_capability("spu decoder", 70)
set_callbacks(InitSubtitleDec, EndSubtitleDec)
add_obsolete_bool( "ffmpeg-dr" ) /* removed since 2.1.0 */
add_bool( "avcodec-dr", true, DR_TEXT, NULL, true )
add_bool( "avcodec-corrupted", true, CORRUPTED_TEXT, CORRUPTED_LONGTEXT, false )
add_obsolete_integer ( "ffmpeg-error-resilience" ) /* removed since 2.1.0 */
add_integer ( "avcodec-error-resilience", 1, ERROR_TEXT,
ERROR_LONGTEXT, true )
add_obsolete_integer ( "ffmpeg-workaround-bugs" ) /* removed since 2.1.0 */
add_integer ( "avcodec-workaround-bugs", 1, BUGS_TEXT, BUGS_LONGTEXT,
false )
add_obsolete_bool( "ffmpeg-hurry-up" ) /* removed since 2.1.0 */
add_bool( "avcodec-hurry-up", true, HURRYUP_TEXT, HURRYUP_LONGTEXT,
false )
add_obsolete_integer( "ffmpeg-skip-frame") /* removed since 2.1.0 */
add_integer( "avcodec-skip-frame", 0, SKIP_FRAME_TEXT,
SKIP_FRAME_LONGTEXT, true )
change_integer_list( frame_skip_list, frame_skip_list_text )
add_obsolete_integer( "ffmpeg-skip-idct" ) /* removed since 2.1.0 */
add_integer( "avcodec-skip-idct", 0, SKIP_IDCT_TEXT,
SKIP_IDCT_LONGTEXT, true )
change_integer_range( -1, 4 )
add_obsolete_integer( "ffmpeg-vismv" ) /* removed since 2.1.0 */
add_obsolete_integer( "avcodec-vismv" ) /* removed since 3.0.0 */
add_obsolete_integer ( "ffmpeg-lowres" ) /* removed since 2.1.0 */
add_obsolete_bool( "ffmpeg-fast" ) /* removed since 2.1.0 */
add_obsolete_bool( "avcodec-fast" ) /* removed since 4.0.0 */
add_obsolete_integer ( "ffmpeg-skiploopfilter" ) /* removed since 2.1.0 */
add_integer ( "avcodec-skiploopfilter", 0, SKIPLOOPF_TEXT,
SKIPLOOPF_LONGTEXT, false)
change_safe ()
change_integer_list( nloopf_list, nloopf_list_text )
add_obsolete_integer( "ffmpeg-debug" ) /* removed since 2.1.0 */
add_integer( "avcodec-debug", 0, DEBUG_TEXT, DEBUG_LONGTEXT,
true )
add_obsolete_string( "ffmpeg-codec" ) /* removed since 2.1.0 */
add_string( "avcodec-codec", NULL, CODEC_TEXT, CODEC_LONGTEXT, true )
add_obsolete_bool( "ffmpeg-hw" ) /* removed since 2.1.0 */
add_obsolete_string( "avcodec-hw" ) /* removed since 4.0.0 */
add_obsolete_integer( "ffmpeg-threads" ) /* removed since 2.1.0 */
add_integer( "avcodec-threads", 0, THREADS_TEXT, THREADS_LONGTEXT, true );
add_string( "avcodec-options", NULL, AV_OPTIONS_TEXT, AV_OPTIONS_LONGTEXT, true )
......@@ -147,35 +133,6 @@ vlc_module_begin ()
set_capability( "encoder", 100 )
set_callbacks( InitVideoEnc, EndVideoEnc )
/* removed in 2.1.0 */
add_obsolete_string( "sout-ffmpeg-codec" )
add_obsolete_string( "sout-ffmpeg-hq" )
add_obsolete_integer( "sout-ffmpeg-keyint" )
add_obsolete_integer( "sout-ffmpeg-bframes" )
add_obsolete_bool( "sout-ffmpeg-hurry-up" )
add_obsolete_bool( "sout-ffmpeg-interlace" )
add_obsolete_bool( "sout-ffmpeg-interlace-me" )
add_obsolete_integer( "sout-ffmpeg-vt" )
add_obsolete_bool( "sout-ffmpeg-pre-me" )
add_obsolete_integer( "sout-ffmpeg-rc-buffer-size" )
add_obsolete_float( "sout-ffmpeg-rc-buffer-aggressivity" )
add_obsolete_float( "sout-ffmpeg-i-quant-factor" )
add_obsolete_integer( "sout-ffmpeg-noise-reduction" )
add_obsolete_bool( "sout-ffmpeg-mpeg4-matrix" )
add_obsolete_integer( "sout-ffmpeg-qmin" )
add_obsolete_integer( "sout-ffmpeg-qmax" )
add_obsolete_bool( "sout-ffmpeg-trellis" )
add_obsolete_float( "sout-ffmpeg-qscale" )
add_obsolete_integer( "sout-ffmpeg-strict" )
add_obsolete_float( "sout-ffmpeg-lumi-masking" )
add_obsolete_float( "sout-ffmpeg-dark-masking" )
add_obsolete_float( "sout-ffmpeg-p-masking" )
add_obsolete_float( "sout-ffmpeg-border-masking" )
add_obsolete_integer( "sout-ffmpeg-luma-elim-threshold" )
add_obsolete_integer( "sout-ffmpeg-chroma-elim-threshold" )
add_obsolete_string( "sout-ffmpeg-aac-profile" )
add_string( ENC_CFG_PREFIX "codec", NULL, CODEC_TEXT, CODEC_LONGTEXT, true )
add_string( ENC_CFG_PREFIX "hq", "rd", ENC_HQ_TEXT,
ENC_HQ_LONGTEXT, false )
......
......@@ -45,7 +45,6 @@ vlc_module_begin ()
set_callbacks( avformat_OpenDemux, avformat_CloseDemux )
set_section( N_("Demuxer"), NULL )
add_string( "avformat-format", NULL, FORMAT_TEXT, FORMAT_LONGTEXT, true )
add_obsolete_string("ffmpeg-format") /* removed since 2.1.0 */
add_string( "avformat-options", NULL, AV_OPTIONS_TEXT, AV_OPTIONS_LONGTEXT, true )
#ifdef ENABLE_SOUT
......@@ -56,7 +55,6 @@ vlc_module_begin ()
set_capability( "sout mux", 2 )
set_section( N_("Muxer"), NULL )
add_string( "sout-avformat-mux", NULL, MUX_TEXT, MUX_LONGTEXT, true )
add_obsolete_string("ffmpeg-mux") /* removed since 2.1.0 */
add_string( "sout-avformat-options", NULL, AV_OPTIONS_TEXT, AV_OPTIONS_LONGTEXT, true )
add_bool( "sout-avformat-reset-ts", false, AV_RESET_TS_TEXT, AV_RESET_TS_LONGTEXT, true )
set_callbacks( avformat_OpenMux, avformat_CloseMux )
......
......@@ -164,8 +164,6 @@ vlc_module_begin ()
add_integer_with_range( "ts-generated-pcr-offset", 120, 0, 500,
TS_GENERATED_PCR_OFFSET_TEXT, NULL, true )
add_obsolete_bool( "ts-silent" );
set_capability( "demux", 10 )
set_callbacks( Open, Close )
add_shortcut( "ts" )
......
......@@ -165,7 +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-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 */
add_obsolete_bool("macosx-show-playmode-buttons") /* since 4.0.0 */
......
......@@ -93,7 +93,6 @@ vlc_module_begin ()
add_string( SOUT_CFG_PREFIX "path", "", PATH_TEXT, PATH_LONGTEXT, false )
add_bool( SOUT_CFG_PREFIX "sap", false, SAP_TEXT, SAP_LONGTEXT, true )
add_string( SOUT_CFG_PREFIX "name", "", NAME_TEXT, NAME_LONGTEXT, true )
add_obsolete_string( SOUT_CFG_PREFIX "group" ) /* since 2.1.0 */
add_string( SOUT_CFG_PREFIX "description", "", DESC_TEXT, DESC_LONGTEXT, true )
add_obsolete_string( SOUT_CFG_PREFIX "url" ) /* since 4.0.0 */
add_obsolete_string( SOUT_CFG_PREFIX "email" ) /* since 4.0.0 */
......
......@@ -1549,7 +1549,6 @@ vlc_module_begin ()
change_safe ()
add_float( "gain", 1., GAIN_TEXT, GAIN_LONGTEXT, true )
change_float_range( 0., 8. )
add_obsolete_integer( "volume" ) /* since 2.1.0 */
add_float( "volume-step", AOUT_VOLUME_STEP, VOLUME_STEP_TEXT,
VOLUME_STEP_LONGTEXT, true )
change_float_range( 1., AOUT_VOLUME_DEFAULT )
......@@ -2057,7 +2056,6 @@ vlc_module_begin ()
PLUGINS_SCAN_LONGTEXT, true )
change_volatile ()
#endif
add_obsolete_string( "data-path" ) /* since 2.1.0 */
add_string( "keystore", NULL, KEYSTORE_TEXT,
KEYSTORE_LONGTEXT, true )
......@@ -2190,17 +2188,12 @@ vlc_module_begin ()
false )
change_short('v')
change_volatile ()
add_obsolete_string( "verbose-objects" ) /* since 2.1.0 */
#if !defined(_WIN32) && !defined(__OS2__)
add_obsolete_bool( "daemon" ) /* since 4.0.0 */
change_short('d')
add_obsolete_string( "pidfile" ) /* since 4.0.0 */
#endif
#if defined (_WIN32) || defined (__APPLE__)
add_obsolete_string( "language" ) /* since 2.1.0 */
#endif
add_bool( "color", true, COLOR_TEXT, COLOR_LONGTEXT, true )
change_volatile ()
add_obsolete_bool( "advanced" ) /* since 4.0.0 */
......
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