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

remove unnecessary option longtext

where identical to shorttext, or near enough.

bad because:
 - wastes resources.
 - useless tooltips in prefs GUI (poor UX) - tooltip longtext should add
   something of value.
 - useless repetition of text in certain help output.

in some cases they differed only in full-stop, creating unnecessary extra
burden on translators.
parent a0a76660
......@@ -61,8 +61,8 @@ vlc_module_begin ()
set_help (HELP_TEXT)
add_obsolete_string ("alsa-format") /* since 2.1.0 */
add_bool ("alsa-stereo", true, STEREO_TEXT, STEREO_TEXT, true)
add_integer ("alsa-samplerate", 48000, RATE_TEXT, RATE_TEXT, true)
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)
add_shortcut ("alsa")
......
......@@ -280,14 +280,14 @@ vlc_module_begin ()
change_safe ()
set_section (N_("Terrestrial reception parameters"), NULL)
add_integer ("dvb-bandwidth", 0, BANDWIDTH_TEXT, BANDWIDTH_TEXT, true)
add_integer ("dvb-bandwidth", 0, BANDWIDTH_TEXT, NULL, true)
change_integer_list (bandwidth_vlc, bandwidth_user)
change_safe ()
add_integer ("dvb-transmission", 0,
TRANSMISSION_TEXT, TRANSMISSION_TEXT, true)
TRANSMISSION_TEXT, NULL, true)
change_integer_list (transmission_vlc, transmission_user)
change_safe ()
add_string ("dvb-guard", "", GUARD_TEXT, GUARD_TEXT, true)
add_string ("dvb-guard", "", GUARD_TEXT, NULL, true)
change_string_list (guard_vlc, guard_user)
change_safe ()
......@@ -300,10 +300,10 @@ vlc_module_begin ()
CODE_RATE_LP_TEXT, CODE_RATE_LONGTEXT, true)
change_string_list (code_rate_vlc, code_rate_user)
change_safe ()
add_integer ("dvb-hierarchy", -1, HIERARCHY_TEXT, HIERARCHY_TEXT, true)
add_integer ("dvb-hierarchy", -1, HIERARCHY_TEXT, NULL, true)
change_integer_list (hierarchy_vlc, hierarchy_user)
change_safe ()
add_integer ("dvb-plp-id", 0, PLP_ID_TEXT, PLP_ID_TEXT, false)
add_integer ("dvb-plp-id", 0, PLP_ID_TEXT, NULL, false)
change_integer_range (0, 255)
change_safe ()
......@@ -361,18 +361,18 @@ vlc_module_begin ()
change_safe ()
set_section (N_("DVB-S2 parameters"), NULL)
add_integer ("dvb-stream", 0, STREAM_ID_TEXT, STREAM_ID_TEXT, false)
add_integer ("dvb-stream", 0, STREAM_ID_TEXT, NULL, false)
change_integer_range (0, 255)
change_safe ()
add_integer ("dvb-pilot", -1, PILOT_TEXT, PILOT_TEXT, true)
add_integer ("dvb-pilot", -1, PILOT_TEXT, NULL, true)
change_integer_list (auto_off_on_vlc, auto_off_on_user)
change_safe ()
add_integer ("dvb-rolloff", -1, ROLLOFF_TEXT, ROLLOFF_TEXT, true)
add_integer ("dvb-rolloff", -1, ROLLOFF_TEXT, NULL, true)
change_integer_list (rolloff_vlc, rolloff_user)
change_safe ()
set_section (N_("ISDB-S parameters"), NULL)
add_integer ("dvb-ts-id", 0, TS_ID_TEXT, TS_ID_TEXT, false)
add_integer ("dvb-ts-id", 0, TS_ID_TEXT, NULL, false)
change_integer_range (0, 0xffff)
change_safe ()
......@@ -410,7 +410,7 @@ vlc_module_begin ()
change_integer_list (auto_off_on_vlc, auto_off_on_user)
#endif
#ifdef _WIN32
add_integer ("dvb-network-id", 0, NETID_TEXT, NETID_TEXT, true)
add_integer ("dvb-network-id", 0, NETID_TEXT, NULL, true)
add_integer ("dvb-azimuth", 0, AZIMUTH_TEXT, AZIMUTH_LONGTEXT, true)
add_integer ("dvb-elevation", 0, ELEVATION_TEXT, ELEVATION_LONGTEXT, true)
add_integer ("dvb-longitude", 0, LONGITUDE_TEXT, LONGITUDE_LONGTEXT, true)
......
......@@ -109,19 +109,16 @@ vlc_module_begin ()
set_capability( "access", 300 )
set_callbacks( Open, Close )
add_bool( "rtsp-tcp", false,
N_("Use RTP over RTSP (TCP)"),
N_("Use RTP over RTSP (TCP)"), true )
N_("Use RTP over RTSP (TCP)"), nullptr, true )
change_safe()
add_integer( "rtp-client-port", -1,
N_("Client port"),
N_("Port to use for the RTP source of the session"), true )
add_bool( "rtsp-mcast", false,
N_("Force multicast RTP via RTSP"),
N_("Force multicast RTP via RTSP"), true )
N_("Force multicast RTP via RTSP"), nullptr, true )
change_safe()
add_bool( "rtsp-http", false,
N_("Tunnel RTSP and RTP over HTTP"),
N_("Tunnel RTSP and RTP over HTTP"), true )
N_("Tunnel RTSP and RTP over HTTP"), nullptr, true )
change_safe()
add_integer( "rtsp-http-port", 80,
N_("HTTP tunnel port"),
......
......@@ -95,7 +95,7 @@ vlc_module_begin()
change_safe()
add_float( CFG_PREFIX "fps", 5, RDP_FPS, RDP_FPS_LONGTEXT, true )
add_bool( CFG_PREFIX "encrypt", false, RDP_ENCRYPT, RDP_ENCRYPT, true )
add_bool( CFG_PREFIX "encrypt", false, RDP_ENCRYPT, NULL, true )
change_safe()
set_callbacks( Open, Close )
......
......@@ -72,7 +72,7 @@ vlc_module_begin()
set_subcategory(SUBCAT_INPUT_ACCESS)
add_obsolete_integer("satip-buffer") /* obsolete since 4.0.0 */
add_bool("satip-multicast", false, MULTICAST_TEXT, MULTICAST_LONGTEXT, true)
add_string("satip-host", "", SATIP_HOST_TEXT, SATIP_HOST_TEXT, true)
add_string("satip-host", "", SATIP_HOST_TEXT, NULL, true)
change_safe()
add_shortcut("rtsp", "satip")
vlc_module_end()
......
......@@ -104,8 +104,8 @@ vlc_module_begin ()
#ifdef SCREEN_SUBSCREEN
add_integer( "screen-top", 0, TOP_TEXT, TOP_LONGTEXT, true )
add_integer( "screen-left", 0, LEFT_TEXT, LEFT_LONGTEXT, true )
add_integer( "screen-width", 0, WIDTH_TEXT, WIDTH_TEXT, true )
add_integer( "screen-height", 0, HEIGHT_TEXT, HEIGHT_TEXT, true )
add_integer( "screen-width", 0, WIDTH_TEXT, NULL, true )
add_integer( "screen-height", 0, HEIGHT_TEXT, NULL, true )
add_bool( "screen-follow-mouse", false, FOLLOW_MOUSE_TEXT,
FOLLOW_MOUSE_LONGTEXT, false )
......
......@@ -442,7 +442,7 @@ vlc_module_begin ()
add_integer( SRT_PARAM_PAYLOAD_SIZE, SRT_DEFAULT_PAYLOAD_SIZE,
N_( "SRT maximum payload size (bytes)" ), NULL, true )
add_integer( SRT_PARAM_KEY_LENGTH, SRT_DEFAULT_KEY_LENGTH,
SRT_KEY_LENGTH_TEXT, SRT_KEY_LENGTH_TEXT, false )
SRT_KEY_LENGTH_TEXT, NULL, false )
change_integer_list( srt_key_lengths, srt_key_length_names )
add_string(SRT_PARAM_STREAMID, "",
N_(" SRT Stream ID"), NULL, false)
......
......@@ -46,7 +46,7 @@ vlc_module_begin ()
set_capability ("access", 0)
set_callback(Open)
add_string ("timecode-fps", "25/1", FPS_TEXT, FPS_TEXT, false)
add_string ("timecode-fps", "25/1", FPS_TEXT, NULL, false)
change_string_list (fps_values, fps_texts)
change_safe ()
vlc_module_end ()
......
......@@ -82,9 +82,9 @@ vlc_module_begin()
set_description( N_("VNC client access") )
set_capability( "access", 0 )
add_string( CFG_PREFIX "user", NULL, RFB_USER, RFB_USER, false )
add_string( CFG_PREFIX "user", NULL, RFB_USER, NULL, false )
change_safe()
add_password(CFG_PREFIX "password", NULL, RFB_PASSWORD, RFB_PASSWORD)
add_password(CFG_PREFIX "password", NULL, RFB_PASSWORD, NULL)
change_safe()
add_loadfile(CFG_PREFIX "x509-ca", NULL, RFB_CA_TEXT, RFB_CA_LONGTEXT)
change_safe()
......
......@@ -128,8 +128,7 @@ vlc_module_begin()
set_category(CAT_SOUT)
set_subcategory(SUBCAT_SOUT_ACO)
add_shortcut("http-put")
add_string(SOUT_CFG_PREFIX"user", NULL, N_("Username"), N_("Username"),
true)
add_password(SOUT_CFG_PREFIX"pwd", NULL, N_("Password"), N_("Password"))
add_string(SOUT_CFG_PREFIX"user", NULL, N_("Username"), NULL, true)
add_password(SOUT_CFG_PREFIX"pwd", NULL, N_("Password"), NULL)
set_callbacks(Open, Close)
vlc_module_end()
......@@ -120,7 +120,7 @@ vlc_module_begin ()
add_bool( SOUT_CFG_PREFIX "delsegs", true,
DELSEGS_TEXT, DELSEGS_LONGTEXT, true )
add_bool( SOUT_CFG_PREFIX "ratecontrol", false,
RATECONTROL_TEXT, RATECONTROL_TEXT, true )
RATECONTROL_TEXT, NULL, true )
add_bool( SOUT_CFG_PREFIX "caching", false,
NOCACHE_TEXT, NOCACHE_LONGTEXT, true )
add_bool( SOUT_CFG_PREFIX "generate-iv", false,
......@@ -130,7 +130,7 @@ vlc_module_begin ()
add_string( SOUT_CFG_PREFIX "index-url", NULL,
INDEXURL_TEXT, INDEXURL_LONGTEXT, false )
add_string( SOUT_CFG_PREFIX "key-uri", NULL,
KEYURI_TEXT, KEYURI_TEXT, true )
KEYURI_TEXT, NULL, true )
add_loadfile(SOUT_CFG_PREFIX "key-file", NULL,
KEYFILE_TEXT, KEYFILE_LONGTEXT)
add_loadfile(SOUT_CFG_PREFIX "key-loadfile", NULL,
......
......@@ -457,7 +457,7 @@ vlc_module_begin()
SRT_DEFAULT_BANDWIDTH_OVERHEAD_LIMIT,
N_( "SRT maximum bandwidth ceiling (bytes)" ), NULL, true )
add_integer( SRT_PARAM_KEY_LENGTH, SRT_DEFAULT_KEY_LENGTH, SRT_KEY_LENGTH_TEXT,
SRT_KEY_LENGTH_TEXT, false )
NULL, false )
change_integer_list( srt_key_lengths, srt_key_length_names )
add_string(SRT_PARAM_STREAMID, "",
N_(" SRT Stream ID"), NULL, false)
......
......@@ -102,7 +102,7 @@ vlc_module_begin ()
AUDIO_CHAN_TEXT, AUDIO_CHAN_LONGTEXT, false)
change_integer_list (channels, channels_text)
add_integer("alsa-passthrough", PASSTHROUGH_NONE, PASSTHROUGH_TEXT,
PASSTHROUGH_TEXT, false)
NULL, false)
change_integer_list(passthrough_modes, passthrough_modes_text)
add_sw_gain ()
set_capability( "audio output", 150 )
......
......@@ -46,15 +46,15 @@ vlc_module_begin ()
set_callbacks (Open, Close)
add_string ("amem-format", "S16N",
N_("Sample format"), N_("Sample format"), false)
N_("Sample format"), NULL, false)
change_string_list( format_list, format_list )
change_private()
add_integer ("amem-rate", 44100,
N_("Sample rate"), N_("Sample rate"), false)
N_("Sample rate"), NULL, false)
change_integer_range (1, AMEM_SAMPLE_RATE_MAX)
change_private()
add_integer ("amem-channels", 2,
N_("Channels count"), N_("Channels count"), false)
N_("Channels count"), NULL, false)
change_integer_range (1, AMEM_CHAN_MAX)
change_private()
......
......@@ -43,10 +43,7 @@
#define AOUT_VOLUME_MAX 512
#define VOLUME_TEXT N_("Audio volume")
#define VOLUME_LONGTEXT VOLUME_TEXT
#define DEVICE_TEXT N_("Last audio device")
#define DEVICE_LONGTEXT DEVICE_TEXT
static int Open (vlc_object_t *);
static void Close (vlc_object_t *);
......@@ -59,9 +56,9 @@ vlc_module_begin ()
set_subcategory(SUBCAT_AUDIO_AOUT)
set_callbacks(Open, Close)
add_integer("auhal-volume", AOUT_VOLUME_DEFAULT,
VOLUME_TEXT, VOLUME_LONGTEXT, true)
VOLUME_TEXT, NULL, true)
change_integer_range(0, AOUT_VOLUME_MAX)
add_string("auhal-audio-device", "", DEVICE_TEXT, DEVICE_LONGTEXT, true)
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 */
......
......@@ -116,7 +116,7 @@ vlc_module_begin ()
add_savefile("audiofile-file", "audiofile.wav", FILE_TEXT, FILE_LONGTEXT)
add_string( "audiofile-format", "s16",
FORMAT_TEXT, FORMAT_TEXT, true )
FORMAT_TEXT, NULL, true )
change_string_list( format_list, format_list )
add_integer( "audiofile-channels", 0,
CHANNELS_TEXT, CHANNELS_LONGTEXT, true )
......
......@@ -105,7 +105,7 @@ vlc_module_begin ()
AUTO_CONNECT_LONGTEXT, false )
add_string( CONNECT_REGEX_OPTION, "system", CONNECT_REGEX_TEXT,
CONNECT_REGEX_LONGTEXT, false )
add_string( "jack-name", "", JACK_NAME_TEXT, JACK_NAME_TEXT, false)
add_string( "jack-name", "", JACK_NAME_TEXT, NULL, false)
add_sw_gain( )
set_callbacks( Open, Close )
......
......@@ -96,7 +96,7 @@ vlc_module_begin ()
set_callbacks(InitSubtitleDec, EndSubtitleDec)
add_obsolete_bool( "ffmpeg-dr" ) /* removed since 2.1.0 */
add_bool( "avcodec-dr", true, DR_TEXT, DR_TEXT, true )
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,
......@@ -197,7 +197,7 @@ vlc_module_begin ()
add_integer( ENC_CFG_PREFIX "rc-buffer-size", 0,
ENC_RC_BUF_TEXT, ENC_RC_BUF_LONGTEXT, true )
add_float( ENC_CFG_PREFIX "rc-buffer-aggressivity", 1.0,
ENC_RC_BUF_AGGR_TEXT, ENC_RC_BUF_AGGR_LONGTEXT, true )
ENC_RC_BUF_AGGR_TEXT, NULL, true )
add_float( ENC_CFG_PREFIX "i-quant-factor", 0,
ENC_IQUANT_FACTOR_TEXT, ENC_IQUANT_FACTOR_LONGTEXT, true )
add_integer( ENC_CFG_PREFIX "noise-reduction", 0,
......@@ -205,9 +205,9 @@ vlc_module_begin ()
add_bool( ENC_CFG_PREFIX "mpeg4-matrix", false,
ENC_MPEG4_MATRIX_TEXT, ENC_MPEG4_MATRIX_LONGTEXT, true )
add_integer( ENC_CFG_PREFIX "qmin", 0,
ENC_QMIN_TEXT, ENC_QMIN_LONGTEXT, true )
ENC_QMIN_TEXT, NULL, true )
add_integer( ENC_CFG_PREFIX "qmax", 0,
ENC_QMAX_TEXT, ENC_QMAX_LONGTEXT, true )
ENC_QMAX_TEXT, NULL, true )
add_bool( ENC_CFG_PREFIX "trellis", false,
ENC_TRELLIS_TEXT, ENC_TRELLIS_LONGTEXT, true )
add_float( ENC_CFG_PREFIX "qscale", 3,
......
......@@ -142,8 +142,6 @@ int ffmpeg_OpenCodec( decoder_t *p_dec, AVCodecContext *, const AVCodec * );
"control, but will cause a delay in the stream." )
#define ENC_RC_BUF_AGGR_TEXT N_( "Rate control buffer aggressiveness" )
#define ENC_RC_BUF_AGGR_LONGTEXT N_( "Rate control "\
"buffer aggressiveness." )
#define ENC_IQUANT_FACTOR_TEXT N_( "I quantization factor" )
#define ENC_IQUANT_FACTOR_LONGTEXT N_( \
......@@ -174,12 +172,8 @@ int ffmpeg_OpenCodec( decoder_t *p_dec, AVCodecContext *, const AVCodec * );
"threshold to ease the encoder's task." )
#define ENC_QMIN_TEXT N_( "Minimum video quantizer scale" )
#define ENC_QMIN_LONGTEXT N_( "Minimum video " \
"quantizer scale." )
#define ENC_QMAX_TEXT N_( "Maximum video quantizer scale" )
#define ENC_QMAX_LONGTEXT N_( "Maximum video " \
"quantizer scale." )
#define ENC_TRELLIS_TEXT N_( "Trellis quantization" )
#define ENC_TRELLIS_LONGTEXT N_( "Enable trellis " \
......
......@@ -73,15 +73,15 @@ vlc_module_begin ()
set_subcategory (SUBCAT_INPUT_ACODEC)
set_callbacks (Open, Close)
add_loadfile("soundfont", "", SOUNDFONT_TEXT, SOUNDFONT_LONGTEXT)
add_bool ("synth-chorus", true, CHORUS_TEXT, CHORUS_TEXT, false)
add_bool ("synth-chorus", true, CHORUS_TEXT, NULL, false)
add_float ("synth-gain", .5, GAIN_TEXT, GAIN_LONGTEXT, false)
change_float_range (0., 10.)
add_integer ("synth-polyphony", 256,
POLYPHONY_TEXT, POLYPHONY_LONGTEXT, false)
change_integer_range (1, 65535)
add_bool ("synth-reverb", true, REVERB_TEXT, REVERB_TEXT, true)
add_bool ("synth-reverb", true, REVERB_TEXT, NULL, true)
add_integer ("synth-sample-rate", 44100,
SAMPLE_RATE_TEXT, SAMPLE_RATE_TEXT, true)
SAMPLE_RATE_TEXT, NULL, true)
change_integer_range (22050, 96000)
vlc_module_end ()
......
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