From: Rémi Denis-Courmont Date: Fri, 22 Oct 2010 17:56:06 +0000 (+0300) Subject: add_loadfile: remove callback parameter X-Git-Tag: 1.2.0-pre1~5040 X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=989310c9237b9679c8381aeb165055150f269690 add_loadfile: remove callback parameter --- diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h index 4ab2768c65..5a1ec86cd9 100644 --- a/include/vlc_plugin.h +++ b/include/vlc_plugin.h @@ -307,7 +307,7 @@ enum vlc_module_properties add_string_inner( CONFIG_ITEM_PASSWORD, name, text, longtext, advc, \ value ) -#define add_loadfile( name, value, p_callback, text, longtext, advc ) \ +#define add_loadfile( name, value, text, longtext, advc ) \ add_string_inner( CONFIG_ITEM_LOADFILE, name, text, longtext, advc, \ value ) diff --git a/modules/access/screen/screen.c b/modules/access/screen/screen.c index 2cb00a0a13..639b8c7304 100644 --- a/modules/access/screen/screen.c +++ b/modules/access/screen/screen.c @@ -111,7 +111,7 @@ vlc_module_begin () #endif #ifdef SCREEN_MOUSE - add_loadfile( "screen-mouse-image", "", NULL, MOUSE_TEXT, MOUSE_LONGTEXT, + add_loadfile( "screen-mouse-image", "", MOUSE_TEXT, MOUSE_LONGTEXT, true ) #endif diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c index 93cd37cc35..3727891886 100644 --- a/modules/audio_output/oss.c +++ b/modules/audio_output/oss.c @@ -106,7 +106,7 @@ vlc_module_begin () set_category( CAT_AUDIO ) set_subcategory( SUBCAT_AUDIO_AOUT ) - add_loadfile( "oss-audio-device", "/dev/dsp", NULL, + add_loadfile( "oss-audio-device", "/dev/dsp", N_("OSS DSP device"), NULL, false ) add_deprecated_alias( "dspdev" ) /* deprecated since 0.9.3 */ add_bool( "oss-buggy", false, NULL, BUGGY_TEXT, BUGGY_LONGTEXT, true ) diff --git a/modules/codec/fluidsynth.c b/modules/codec/fluidsynth.c index c750e14cda..129aab87ad 100644 --- a/modules/codec/fluidsynth.c +++ b/modules/codec/fluidsynth.c @@ -60,7 +60,7 @@ vlc_module_begin () set_category (CAT_INPUT) set_subcategory (SUBCAT_INPUT_ACODEC) set_callbacks (Open, Close) - add_loadfile ("soundfont", "", NULL, + add_loadfile ("soundfont", "", SOUNDFONT_TEXT, SOUNDFONT_LONGTEXT, false); vlc_module_end () diff --git a/modules/gui/fbosd.c b/modules/gui/fbosd.c index ace7ed5efb..5358027eab 100644 --- a/modules/gui/fbosd.c +++ b/modules/gui/fbosd.c @@ -180,7 +180,7 @@ vlc_module_begin () set_category( CAT_INTERFACE ) set_subcategory( SUBCAT_INTERFACE_MAIN ) - add_loadfile( "fbosd-dev", "/dev/fb0", NULL, DEVICE_TEXT, DEVICE_LONGTEXT, + add_loadfile( "fbosd-dev", "/dev/fb0", DEVICE_TEXT, DEVICE_LONGTEXT, false ) add_string( "fbosd-aspect-ratio", "", ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, true ) diff --git a/modules/gui/skins2/src/skin_main.cpp b/modules/gui/skins2/src/skin_main.cpp index 2bf4ea8839..419a904aac 100644 --- a/modules/gui/skins2/src/skin_main.cpp +++ b/modules/gui/skins2/src/skin_main.cpp @@ -478,7 +478,7 @@ static int onTaskBarChange( vlc_object_t *pObj, const char *pVariable, vlc_module_begin () set_category( CAT_INTERFACE ) set_subcategory( SUBCAT_INTERFACE_MAIN ) - add_loadfile( "skins2-last", "", NULL, SKINS2_LAST, SKINS2_LAST_LONG, + add_loadfile( "skins2-last", "", SKINS2_LAST, SKINS2_LAST_LONG, true ) change_autosave () add_string( "skins2-config", "", SKINS2_CONFIG, SKINS2_CONFIG_LONG, diff --git a/modules/meta_engine/folder.c b/modules/meta_engine/folder.c index 50d0cc1713..42860e8e62 100644 --- a/modules/meta_engine/folder.c +++ b/modules/meta_engine/folder.c @@ -65,7 +65,7 @@ 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, NULL, + add_loadfile( "album-art-filename", NULL, N_("Album art filename"), N_("Filename to look for album art in current directory"), false ); set_capability( "art finder", 90 ) set_callbacks( FindMeta, NULL ) diff --git a/modules/stream_out/raop.c b/modules/stream_out/raop.c index 019dfbb993..17c74839d4 100644 --- a/modules/stream_out/raop.c +++ b/modules/stream_out/raop.c @@ -168,7 +168,7 @@ vlc_module_begin(); HOST_TEXT, HOST_LONGTEXT, false ) add_password( SOUT_CFG_PREFIX "password", NULL, PASSWORD_TEXT, PASSWORD_LONGTEXT, false ) - add_loadfile( SOUT_CFG_PREFIX "password-file", NULL, NULL, + add_loadfile( SOUT_CFG_PREFIX "password-file", NULL, PASSWORD_FILE_TEXT, PASSWORD_FILE_LONGTEXT, false ) add_integer_with_range( SOUT_CFG_PREFIX "volume", 100, 0, 255, NULL, VOLUME_TEXT, VOLUME_LONGTEXT, false ) diff --git a/modules/video_filter/atmo/atmo.cpp b/modules/video_filter/atmo/atmo.cpp index 151e1c9f08..bbb19f6d10 100644 --- a/modules/video_filter/atmo/atmo.cpp +++ b/modules/video_filter/atmo/atmo.cpp @@ -381,7 +381,7 @@ add_string(CFG_PREFIX "serialdev", "COM1", on win32 the executeable external driver application for automatic start if needed */ -add_loadfile(CFG_PREFIX "atmowinexe", NULL, NULL, +add_loadfile(CFG_PREFIX "atmowinexe", NULL, ATMOWINEXE_TEXT, ATMOWINEXE_LONGTEXT, false ) #else add_string(CFG_PREFIX "serialdev", "/dev/ttyUSB0", @@ -583,15 +583,15 @@ effects with this...) the images MUST not compressed, should have 24-bit per pixel, or a simple 256 color grayscale palette */ set_section( N_("Change gradients" ), 0 ) -add_loadfile(CFG_PREFIX "gradient_zone_0", NULL, NULL, +add_loadfile(CFG_PREFIX "gradient_zone_0", NULL, ZONE_0_GRADIENT_TEXT, ZONE_X_GRADIENT_LONG_TEXT, true ) -add_loadfile(CFG_PREFIX "gradient_zone_1", NULL, NULL, +add_loadfile(CFG_PREFIX "gradient_zone_1", NULL, ZONE_1_GRADIENT_TEXT, ZONE_X_GRADIENT_LONG_TEXT, true ) -add_loadfile(CFG_PREFIX "gradient_zone_2", NULL, NULL, +add_loadfile(CFG_PREFIX "gradient_zone_2", NULL, ZONE_2_GRADIENT_TEXT, ZONE_X_GRADIENT_LONG_TEXT, true ) -add_loadfile(CFG_PREFIX "gradient_zone_3", NULL, NULL, +add_loadfile(CFG_PREFIX "gradient_zone_3", NULL, ZONE_3_GRADIENT_TEXT, ZONE_X_GRADIENT_LONG_TEXT, true ) -add_loadfile(CFG_PREFIX "gradient_zone_4", NULL, NULL, +add_loadfile(CFG_PREFIX "gradient_zone_4", NULL, ZONE_4_GRADIENT_TEXT, ZONE_X_GRADIENT_LONG_TEXT, true ) add_directory(CFG_PREFIX "gradient_path", NULL, NULL, GRADIENT_PATH_TEXT, GRADIENT_PATH_LONGTEXT, false ) diff --git a/modules/video_filter/blendbench.c b/modules/video_filter/blendbench.c index d322b72057..6a8821cbee 100644 --- a/modules/video_filter/blendbench.c +++ b/modules/video_filter/blendbench.c @@ -84,13 +84,13 @@ vlc_module_begin () ALPHA_LONGTEXT, false ) set_section( N_("Base image"), NULL ) - add_loadfile( CFG_PREFIX "base-image", NULL, NULL, BASE_IMAGE_TEXT, + add_loadfile( CFG_PREFIX "base-image", NULL, BASE_IMAGE_TEXT, BASE_IMAGE_LONGTEXT, false ) 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, NULL, BLEND_IMAGE_TEXT, + add_loadfile( CFG_PREFIX "blend-image", NULL, BLEND_IMAGE_TEXT, BLEND_IMAGE_LONGTEXT, false ) add_string( CFG_PREFIX "blend-chroma", "YUVA", BLEND_CHROMA_TEXT, BLEND_CHROMA_LONGTEXT, false ) diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay.c b/modules/video_filter/dynamicoverlay/dynamicoverlay.c index 4637dcfc19..d389893bc6 100644 --- a/modules/video_filter/dynamicoverlay/dynamicoverlay.c +++ b/modules/video_filter/dynamicoverlay/dynamicoverlay.c @@ -70,10 +70,10 @@ vlc_module_begin () set_subcategory( SUBCAT_VIDEO_VFILTER ) set_capability( "sub filter", 0 ) - add_loadfile( "overlay-input", NULL, NULL, INPUT_TEXT, INPUT_LONGTEXT, + add_loadfile( "overlay-input", NULL, INPUT_TEXT, INPUT_LONGTEXT, false ) /* Note: add_loadfile as O_WRONLY w/o O_CREAT, i.e. FIFO must exist */ - add_loadfile( "overlay-output", NULL, NULL, OUTPUT_TEXT, OUTPUT_LONGTEXT, + add_loadfile( "overlay-output", NULL, OUTPUT_TEXT, OUTPUT_LONGTEXT, false ) add_shortcut( "overlay" ) diff --git a/modules/video_filter/erase.c b/modules/video_filter/erase.c index 1282031e23..2ed1818e88 100644 --- a/modules/video_filter/erase.c +++ b/modules/video_filter/erase.c @@ -72,7 +72,7 @@ vlc_module_begin () set_category( CAT_VIDEO ) set_subcategory( SUBCAT_VIDEO_VFILTER ) - add_loadfile( CFG_PREFIX "mask", NULL, NULL, + add_loadfile( CFG_PREFIX "mask", NULL, MASK_TEXT, MASK_LONGTEXT, false ) add_integer( CFG_PREFIX "x", 0, NULL, POSX_TEXT, POSX_LONGTEXT, false ) add_integer( CFG_PREFIX "y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, false ) diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c index 158e87d016..f7bed3939f 100644 --- a/modules/video_filter/logo.c +++ b/modules/video_filter/logo.c @@ -93,7 +93,7 @@ vlc_module_begin () set_shortname( N_("Logo overlay") ) add_shortcut( "logo" ) - add_loadfile( CFG_PREFIX "file", NULL, NULL, FILE_TEXT, FILE_LONGTEXT, false ) + add_loadfile( CFG_PREFIX "file", NULL, FILE_TEXT, FILE_LONGTEXT, false ) add_integer( CFG_PREFIX "x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, true ) add_integer( CFG_PREFIX "y", -1, NULL, POSY_TEXT, POSY_LONGTEXT, true ) /* default to 1000 ms per image, continuously cycle through them */ diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c index a6fb818b00..48bf9385aa 100644 --- a/modules/video_output/fb.c +++ b/modules/video_output/fb.c @@ -83,7 +83,7 @@ vlc_module_begin () set_shortname("Framebuffer") set_category(CAT_VIDEO) set_subcategory(SUBCAT_VIDEO_VOUT) - add_loadfile(FB_DEV_VAR, "/dev/fb0", NULL, DEVICE_TEXT, DEVICE_LONGTEXT, + add_loadfile(FB_DEV_VAR, "/dev/fb0", DEVICE_TEXT, DEVICE_LONGTEXT, false) add_bool("fb-tty", true, NULL, TTY_TEXT, TTY_LONGTEXT, true) add_string( "fb-chroma", NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true ) diff --git a/modules/visualization/projectm.cpp b/modules/visualization/projectm.cpp index 9c6b4dd99d..4bc22722fb 100644 --- a/modules/visualization/projectm.cpp +++ b/modules/visualization/projectm.cpp @@ -70,10 +70,10 @@ vlc_module_begin () set_category( CAT_AUDIO ) set_subcategory( SUBCAT_AUDIO_VISUAL ) #ifndef HAVE_PROJECTM2 - add_loadfile( "projectm-config", "/usr/share/projectM/config.inp", NULL, + add_loadfile( "projectm-config", "/usr/share/projectM/config.inp", CONFIG_TEXT, CONFIG_LONGTEXT, true ) #else - add_loadfile( "projectm-preset-path", "/usr/share/projectM/presets", NULL, + add_loadfile( "projectm-preset-path", "/usr/share/projectM/presets", PRESET_PATH_TXT, PRESET_PATH_LONGTXT, true ) add_font( "projectm-title-font", "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf", TITLE_FONT_TXT, TITLE_FONT_LONGTXT, true ) diff --git a/src/libvlc-module.c b/src/libvlc-module.c index 352fd30cd9..bff8677b51 100644 --- a/src/libvlc-module.c +++ b/src/libvlc-module.c @@ -1579,7 +1579,7 @@ const char vlc_usage[] = N_( * add_usage_hint( N_(text), b_advanced_option ) * add_string( option_name, value, N_(text), N_(longtext), b_advanced_option ) - * add_loadfile( option_name, psz_value, p_callback, N_(text), N_(longtext) ) + * add_loadfile( option_name, psz_value, N_(text), N_(longtext) ) * add_savefile( option_name, psz_value, N_(text), N_(longtext) ) * add_module( option_name, psz_value, i_capability, p_callback, * N_(text), N_(longtext) ) @@ -1796,7 +1796,7 @@ vlc_module_begin () TEXTRENDERER_LONGTEXT, true ) set_section( N_("Subtitles") , NULL ) - add_loadfile( "sub-file", NULL, NULL, SUB_FILE_TEXT, + add_loadfile( "sub-file", NULL, SUB_FILE_TEXT, SUB_FILE_LONGTEXT, false ) change_safe() add_bool( "sub-autodetect-file", true, NULL, @@ -1878,11 +1878,11 @@ vlc_module_begin () set_section( N_( "Default devices") , NULL ) - add_loadfile( "dvd", DVD_DEVICE, NULL, DVD_DEV_TEXT, DVD_DEV_LONGTEXT, + add_loadfile( "dvd", DVD_DEVICE, DVD_DEV_TEXT, DVD_DEV_LONGTEXT, false ) - add_loadfile( "vcd", VCD_DEVICE, NULL, VCD_DEV_TEXT, VCD_DEV_LONGTEXT, + add_loadfile( "vcd", VCD_DEVICE, VCD_DEV_TEXT, VCD_DEV_LONGTEXT, false ) - add_loadfile( "cd-audio", CDAUDIO_DEVICE, NULL, CDAUDIO_DEV_TEXT, + add_loadfile( "cd-audio", CDAUDIO_DEVICE, CDAUDIO_DEV_TEXT, CDAUDIO_DEV_LONGTEXT, false ) set_section( N_( "Network settings" ), NULL )