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

config: remove advanced from add_loadfile()

parent 776811e9
......@@ -373,7 +373,7 @@ VLC_METADATA_EXPORTS
#define add_password(name, value, text, longtext) \
add_string_inner(CONFIG_ITEM_PASSWORD, name, text, longtext, value)
#define add_loadfile( name, value, text, longtext, advc ) \
#define add_loadfile(name, value, text, longtext) \
add_string_inner(CONFIG_ITEM_LOADFILE, name, text, longtext, value)
#define add_savefile( name, value, text, longtext, advc ) \
......
......@@ -723,8 +723,7 @@ vlc_module_begin ()
set_subcategory( SUBCAT_INPUT_ACCESS )
set_callbacks(Open, Close)
add_loadfile( "cd-audio", CD_DEVICE, CDAUDIO_DEV_TEXT,
CDAUDIO_DEV_LONGTEXT, false )
add_loadfile("cd-audio", CD_DEVICE, CDAUDIO_DEV_TEXT, CDAUDIO_DEV_LONGTEXT)
add_usage_hint( N_("[cdda:][device][@[track]]") )
add_integer( "cdda-track", 0 , NULL, NULL, true )
......
......@@ -76,7 +76,7 @@ static void Close( vlc_object_t * );
vlc_module_begin()
set_shortname( N_( "DCP" ) )
add_shortcut( "dcp" )
add_loadfile( "kdm", "", KDM_HELP_TEXT, KDM_HELP_LONG_TEXT, false )
add_loadfile("kdm", "", KDM_HELP_TEXT, KDM_HELP_LONG_TEXT)
set_description( N_( "Digital Cinema Package module" ) )
set_capability( "access", 0 )
set_category( CAT_INPUT )
......
......@@ -113,7 +113,7 @@ vlc_module_begin ()
#endif
#ifdef SCREEN_MOUSE
add_loadfile( "screen-mouse-image", "", MOUSE_TEXT, MOUSE_LONGTEXT, true )
add_loadfile("screen-mouse-image", "", MOUSE_TEXT, MOUSE_LONGTEXT)
#endif
#ifdef _WIN32
......
......@@ -278,12 +278,12 @@ vlc_module_begin ()
set_subcategory( SUBCAT_INPUT_ACCESS )
set_section( N_( "Video input" ), NULL )
add_loadfile( CFG_PREFIX "dev", "/dev/video0",
VIDEO_DEVICE_TEXT, VIDEO_DEVICE_LONGTEXT, false )
add_loadfile(CFG_PREFIX "dev", "/dev/video0",
VIDEO_DEVICE_TEXT, VIDEO_DEVICE_LONGTEXT)
change_safe()
#ifdef ZVBI_COMPILED
add_loadfile( CFG_PREFIX "vbidev", NULL,
VBI_DEVICE_TEXT, VBI_DEVICE_LONGTEXT, false )
add_loadfile(CFG_PREFIX "vbidev", NULL,
VBI_DEVICE_TEXT, VBI_DEVICE_LONGTEXT)
#endif
add_string( CFG_PREFIX "standard", "",
STANDARD_TEXT, STANDARD_LONGTEXT, false )
......@@ -315,8 +315,8 @@ vlc_module_begin ()
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, false )
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,
......
......@@ -86,13 +86,15 @@ vlc_module_begin()
change_safe()
add_password(CFG_PREFIX "password", NULL, RFB_PASSWORD, RFB_PASSWORD)
change_safe()
add_loadfile( CFG_PREFIX "x509-ca", NULL, RFB_CA_TEXT, RFB_CA_LONGTEXT, true )
add_loadfile(CFG_PREFIX "x509-ca", NULL, RFB_CA_TEXT, RFB_CA_LONGTEXT)
change_safe()
add_loadfile( CFG_PREFIX "x509-crl", NULL, RFB_CRL_TEXT, RFB_CRL_LONGTEXT, true )
add_loadfile(CFG_PREFIX "x509-crl", NULL, RFB_CRL_TEXT, RFB_CRL_LONGTEXT)
change_safe()
add_loadfile( CFG_PREFIX "x509-client-cert", NULL, RFB_CERT_TEXT, RFB_CERT_LONGTEXT, true )
add_loadfile(CFG_PREFIX "x509-client-cert", NULL,
RFB_CERT_TEXT, RFB_CERT_LONGTEXT)
change_safe()
add_loadfile( CFG_PREFIX "x509-client-key", NULL, RFB_KEY_TEXT, RFB_KEY_LONGTEXT, true )
add_loadfile(CFG_PREFIX "x509-client-key", NULL,
RFB_KEY_TEXT, RFB_KEY_LONGTEXT)
change_safe()
add_float( CFG_PREFIX "fps", 5, RFB_FPS, RFB_FPS_LONGTEXT, true )
......
......@@ -131,10 +131,10 @@ vlc_module_begin ()
INDEXURL_TEXT, INDEXURL_LONGTEXT, false )
add_string( SOUT_CFG_PREFIX "key-uri", NULL,
KEYURI_TEXT, KEYURI_TEXT, true )
add_loadfile( SOUT_CFG_PREFIX "key-file", NULL,
KEYFILE_TEXT, KEYFILE_LONGTEXT, true )
add_loadfile( SOUT_CFG_PREFIX "key-loadfile", NULL,
KEYLOADFILE_TEXT, KEYLOADFILE_LONGTEXT, true )
add_loadfile(SOUT_CFG_PREFIX "key-file", NULL,
KEYFILE_TEXT, KEYFILE_LONGTEXT)
add_loadfile(SOUT_CFG_PREFIX "key-loadfile", NULL,
KEYLOADFILE_TEXT, KEYLOADFILE_LONGTEXT)
set_callbacks( Open, Close )
vlc_module_end ()
......
......@@ -69,8 +69,7 @@ vlc_module_begin()
set_callbacks(Open, Close)
add_bool(CFG_PREFIX "headphones", false,
HEADPHONES_TEXT, HEADPHONES_LONGTEXT, true)
add_loadfile("hrtf-file", NULL,
HRTF_FILE_TEXT, HRTF_FILE_LONGTEXT, true)
add_loadfile("hrtf-file", NULL, HRTF_FILE_TEXT, HRTF_FILE_LONGTEXT)
add_shortcut("ambisonics")
add_submodule()
......
......@@ -61,7 +61,7 @@ vlc_module_begin()
set_subcategory(SUBCAT_INPUT_ACODEC)
set_callbacks(Open, Close)
add_loadfile(CFG_PREFIX "soundfont", "",
SOUNDFONT_TEXT, SOUNDFONT_LONGTEXT, false)
SOUNDFONT_TEXT, SOUNDFONT_LONGTEXT)
vlc_module_end()
......
......@@ -73,8 +73,7 @@ vlc_module_begin ()
set_category (CAT_INPUT)
set_subcategory (SUBCAT_INPUT_ACODEC)
set_callbacks (Open, Close)
add_loadfile ("soundfont", "",
SOUNDFONT_TEXT, SOUNDFONT_LONGTEXT, false)
add_loadfile("soundfont", "", SOUNDFONT_TEXT, SOUNDFONT_LONGTEXT)
add_bool ("synth-chorus", true, CHORUS_TEXT, CHORUS_TEXT, false)
add_float ("synth-gain", .5, GAIN_TEXT, GAIN_LONGTEXT, false)
change_float_range (0., 10.)
......
......@@ -514,8 +514,7 @@ static int WindowControl( vout_window_t *pWnd, int query, va_list args )
vlc_module_begin ()
set_category( CAT_INTERFACE )
set_subcategory( SUBCAT_INTERFACE_MAIN )
add_loadfile( "skins2-last", "", SKINS2_LAST, SKINS2_LAST_LONG,
true )
add_loadfile("skins2-last", "", SKINS2_LAST, SKINS2_LAST_LONG)
add_string( "skins2-config", "", SKINS2_CONFIG, SKINS2_CONFIG_LONG,
true )
change_private ()
......
......@@ -67,8 +67,8 @@ static int FindMeta( vlc_object_t * );
vlc_module_begin ()
set_shortname( N_( "Folder" ) )
set_description( N_("Folder meta data") )
add_loadfile( "album-art-filename", NULL,
N_("Album art filename"), N_("Filename to look for album art in current directory"), false );
add_loadfile("album-art-filename", NULL, N_("Album art filename"),
N_("Filename to look for album art in current directory"))
set_capability( "art finder", 90 )
set_callbacks( FindMeta, NULL )
vlc_module_end ()
......
......@@ -70,11 +70,9 @@ vlc_module_begin ()
set_subcategory( SUBCAT_VIDEO_VFILTER )
set_capability( "sub source", 0 )
add_loadfile( "overlay-input", NULL, INPUT_TEXT, INPUT_LONGTEXT,
false )
add_loadfile("overlay-input", NULL, INPUT_TEXT, INPUT_LONGTEXT)
/* Note: add_loadfile as O_WRONLY w/o O_CREAT, i.e. FIFO must exist */
add_loadfile( "overlay-output", NULL, OUTPUT_TEXT, OUTPUT_LONGTEXT,
false )
add_loadfile("overlay-output", NULL, OUTPUT_TEXT, OUTPUT_LONGTEXT)
add_shortcut( "overlay" )
set_callbacks( Create, Destroy )
......
......@@ -94,7 +94,7 @@ vlc_module_begin ()
set_shortname( N_("Logo overlay") )
add_shortcut( "logo" )
add_loadfile( CFG_PREFIX "file", NULL, FILE_TEXT, FILE_LONGTEXT, false )
add_loadfile(CFG_PREFIX "file", NULL, FILE_TEXT, FILE_LONGTEXT)
add_integer( CFG_PREFIX "x", -1, POSX_TEXT, POSX_LONGTEXT, true )
add_integer( CFG_PREFIX "y", -1, POSY_TEXT, POSY_LONGTEXT, true )
/* default to 1000 ms per image, continuously cycle through them */
......
......@@ -146,7 +146,7 @@ vlc_module_begin ()
set_subcategory( SUBCAT_VIDEO_SUBPIC )
add_string( CFG_PREFIX "marquee", "VLC", MSG_TEXT, MSG_LONGTEXT,
false )
add_loadfile( CFG_PREFIX "file", NULL, FILE_TEXT, FILE_LONGTEXT, true )
add_loadfile(CFG_PREFIX "file", NULL, FILE_TEXT, FILE_LONGTEXT)
set_section( N_("Position"), NULL )
add_integer( CFG_PREFIX "x", 0, POSX_TEXT, POSX_LONGTEXT, true )
......
......@@ -151,8 +151,9 @@ vlc_module_begin ()
add_font( "freetype-font", DEFAULT_FAMILY, FONT_TEXT, FAMILY_LONGTEXT, false )
add_font( "freetype-monofont", DEFAULT_MONOSPACE_FAMILY, MONOSPACE_FONT_TEXT, FAMILY_LONGTEXT, false )
#else
add_loadfile( "freetype-font", DEFAULT_FONT_FILE, FONT_TEXT, FONT_LONGTEXT, false )
add_loadfile( "freetype-monofont", DEFAULT_MONOSPACE_FONT_FILE, MONOSPACE_FONT_TEXT, FONT_LONGTEXT, false )
add_loadfile("freetype-font", DEFAULT_FONT_FILE, FONT_TEXT, FONT_LONGTEXT)
add_loadfile("freetype-monofont", DEFAULT_MONOSPACE_FONT_FILE,
MONOSPACE_FONT_TEXT, FONT_LONGTEXT)
#endif
/* opacity valid on 0..255, with default 255 = fully opaque */
......
......@@ -70,8 +70,7 @@ vlc_module_begin ()
add_shortcut( "alphamask", "mask" )
set_callbacks( Create, Destroy )
add_loadfile( CFG_PREFIX "mask", NULL, MASK_TEXT,
MASK_LONGTEXT, false )
add_loadfile(CFG_PREFIX "mask", NULL, MASK_TEXT, MASK_LONGTEXT)
vlc_module_end ()
static const char *const ppsz_filter_options[] = {
......
......@@ -85,14 +85,14 @@ vlc_module_begin ()
ALPHA_LONGTEXT, false )
set_section( N_("Base image"), NULL )
add_loadfile( CFG_PREFIX "base-image", NULL, BASE_IMAGE_TEXT,
BASE_IMAGE_LONGTEXT, false )
add_loadfile(CFG_PREFIX "base-image", NULL,
BASE_IMAGE_TEXT, BASE_IMAGE_LONGTEXT)
add_string( CFG_PREFIX "base-chroma", "I420", BASE_CHROMA_TEXT,
BASE_CHROMA_LONGTEXT, false )
set_section( N_("Blend image"), NULL )
add_loadfile( CFG_PREFIX "blend-image", NULL, BLEND_IMAGE_TEXT,
BLEND_IMAGE_LONGTEXT, false )
add_loadfile(CFG_PREFIX "blend-image", NULL,
BLEND_IMAGE_TEXT, BLEND_IMAGE_LONGTEXT)
add_string( CFG_PREFIX "blend-chroma", "YUVA", BLEND_CHROMA_TEXT,
BLEND_CHROMA_LONGTEXT, false )
......
......@@ -72,8 +72,7 @@ vlc_module_begin ()
set_category( CAT_VIDEO )
set_subcategory( SUBCAT_VIDEO_VFILTER )
add_loadfile( CFG_PREFIX "mask", NULL,
MASK_TEXT, MASK_LONGTEXT, false )
add_loadfile(CFG_PREFIX "mask", NULL, MASK_TEXT, MASK_LONGTEXT)
add_integer( CFG_PREFIX "x", 0, POSX_TEXT, POSX_LONGTEXT, false )
add_integer( CFG_PREFIX "y", 0, POSY_TEXT, POSY_LONGTEXT, false )
......
......@@ -264,7 +264,7 @@ vlc_module_begin()
AR_INDEX_TEXT, AR_INDEX_LONGTEXT, true)
change_integer_list(rgi_ar_values, rgsz_ar_text)
add_loadfile(VIDEO_CFG_PREFIX "nosignal-image", NULL,
NOSIGNAL_IMAGE_TEXT, NOSIGNAL_IMAGE_LONGTEXT, true)
NOSIGNAL_IMAGE_TEXT, NOSIGNAL_IMAGE_LONGTEXT)
add_submodule ()
......
......@@ -80,8 +80,7 @@ vlc_module_begin ()
set_shortname("Framebuffer")
set_category(CAT_VIDEO)
set_subcategory(SUBCAT_VIDEO_VOUT)
add_loadfile(FB_DEV_VAR, "/dev/fb0", DEVICE_TEXT, DEVICE_LONGTEXT,
false)
add_loadfile(FB_DEV_VAR, "/dev/fb0", DEVICE_TEXT, DEVICE_LONGTEXT)
add_bool("fb-tty", true, TTY_TEXT, TTY_LONGTEXT, true)
add_string( "fb-chroma", NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true )
add_obsolete_string("fb-aspect-ratio")
......
......@@ -96,7 +96,8 @@ vlc_module_begin ()
add_string("direct3d9-shader", "", PIXEL_SHADER_TEXT, PIXEL_SHADER_LONGTEXT, true)
change_string_cb(FindShadersCallback)
add_loadfile("direct3d9-shader-file", NULL, PIXEL_SHADER_FILE_TEXT, PIXEL_SHADER_FILE_LONGTEXT, false)
add_loadfile("direct3d9-shader-file", NULL,
PIXEL_SHADER_FILE_TEXT, PIXEL_SHADER_FILE_LONGTEXT)
set_capability("vout display", 280)
add_shortcut("direct3d9", "direct3d")
......
......@@ -104,15 +104,15 @@ vlc_module_begin ()
set_category( CAT_AUDIO )
set_subcategory( SUBCAT_AUDIO_VISUAL )
#ifndef HAVE_PROJECTM2
add_loadfile( "projectm-config", "/usr/share/projectM/config.inp",
CONFIG_TEXT, CONFIG_LONGTEXT, true )
add_loadfile("projectm-config", "/usr/share/projectM/config.inp",
CONFIG_TEXT, CONFIG_LONGTEXT)
#else
add_directory( "projectm-preset-path", PRESET_PATH,
PRESET_PATH_TXT, PRESET_PATH_LONGTXT, true )
add_loadfile( "projectm-title-font", FONT_PATH,
TITLE_FONT_TXT, TITLE_FONT_LONGTXT, true )
add_loadfile( "projectm-menu-font", FONT_PATH_MENU,
MENU_FONT_TXT, MENU_FONT_LONGTXT, true )
add_loadfile("projectm-title-font", FONT_PATH,
TITLE_FONT_TXT, TITLE_FONT_LONGTXT)
add_loadfile("projectm-menu-font", FONT_PATH_MENU,
MENU_FONT_TXT, MENU_FONT_LONGTXT)
#endif
add_integer( "projectm-width", 800, WIDTH_TEXT, WIDTH_LONGTEXT,
false )
......
......@@ -1681,8 +1681,7 @@ vlc_module_begin ()
TEXTRENDERER_LONGTEXT, true )
set_section( N_("Subtitles") , NULL )
add_loadfile( "sub-file", NULL, SUB_FILE_TEXT,
SUB_FILE_LONGTEXT, false )
add_loadfile("sub-file", NULL, SUB_FILE_TEXT, SUB_FILE_LONGTEXT)
change_safe()
add_bool( "sub-autodetect-file", true,
SUB_AUTO_TEXT, SUB_AUTO_LONGTEXT, false )
......@@ -1781,10 +1780,8 @@ vlc_module_begin ()
set_section( N_( "Default devices") , NULL )
add_loadfile( "dvd", DVD_DEVICE, DVD_DEV_TEXT, DVD_DEV_LONGTEXT,
false )
add_loadfile( "vcd", VCD_DEVICE, VCD_DEV_TEXT, VCD_DEV_LONGTEXT,
false )
add_loadfile("dvd", DVD_DEVICE, DVD_DEV_TEXT, DVD_DEV_LONGTEXT)
add_loadfile("vcd", VCD_DEVICE, VCD_DEV_TEXT, VCD_DEV_LONGTEXT)
set_section( N_( "Network settings" ), NULL )
......@@ -1803,9 +1800,9 @@ vlc_module_begin ()
add_string( "rtsp-host", NULL, RTSP_HOST_TEXT, RTSP_HOST_LONGTEXT, true )
add_integer( "rtsp-port", 554, RTSP_PORT_TEXT, RTSP_PORT_LONGTEXT, true )
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)
add_obsolete_string( "sout-http-cert" ) /* since 2.0.0 */
add_loadfile( "http-key", NULL, HTTP_KEY_TEXT, KEY_LONGTEXT, true )
add_loadfile("http-key", NULL, HTTP_KEY_TEXT, KEY_LONGTEXT)
add_obsolete_string( "sout-http-key" ) /* since 2.0.0 */
add_obsolete_string( "http-ca" ) /* since 3.0.0 */
add_obsolete_string( "sout-http-ca" ) /* since 2.0.0 */
......@@ -1977,9 +1974,7 @@ vlc_module_begin ()
SOUT_MUX_CACHING_LONGTEXT, true )
set_section( N_("VLM"), NULL )
add_loadfile( "vlm-conf", NULL, VLM_CONF_TEXT,
VLM_CONF_LONGTEXT, true )
add_loadfile("vlm-conf", NULL, VLM_CONF_TEXT, VLM_CONF_LONGTEXT)
set_subcategory( SUBCAT_SOUT_STREAM )
......
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