Commit 40b4d780 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

add_bool: remove callback parameter

parent f7d11175
......@@ -365,7 +365,7 @@ enum vlc_module_properties
add_float( name, value, text, longtext, advc ) \
change_float_range( f_min, f_max )
#define add_bool( name, v, p_callback, text, longtext, advc ) \
#define add_bool( name, v, text, longtext, advc ) \
add_typename_inner( CONFIG_ITEM_BOOL, name, text, longtext, advc ) \
if (v) vlc_config_set (p_config, VLC_CONFIG_VALUE, (int64_t)true);
......
......@@ -96,7 +96,7 @@ vlc_module_begin()
set_capability( "access_demux", 10 )
set_callbacks( DemuxOpen, DemuxClose )
add_bool( CFG_PREFIX "stereo", true, NULL, STEREO_TEXT, STEREO_LONGTEXT,
add_bool( CFG_PREFIX "stereo", true, STEREO_TEXT, STEREO_LONGTEXT,
true )
add_integer( CFG_PREFIX "samplerate", 48000, SAMPLERATE_TEXT,
SAMPLERATE_LONGTEXT, true )
......
......@@ -213,8 +213,8 @@ vlc_module_begin ()
/* dvb-device refers to a frontend within an adapter */
add_integer( "dvb-device", 0, DEVICE_TEXT, DEVICE_LONGTEXT,
true )
add_bool( "dvb-probe", true, NULL, PROBE_TEXT, PROBE_LONGTEXT, true )
add_bool( "dvb-budget-mode", false, NULL, BUDGET_TEXT, BUDGET_LONGTEXT,
add_bool( "dvb-probe", true, PROBE_TEXT, PROBE_LONGTEXT, true )
add_bool( "dvb-budget-mode", false, BUDGET_TEXT, BUDGET_LONGTEXT,
true )
# endif
......@@ -244,7 +244,7 @@ vlc_module_begin ()
true )
add_integer( "dvb-voltage", 13, VOLTAGE_TEXT, VOLTAGE_LONGTEXT,
true )
add_bool( "dvb-high-voltage", false, NULL, HIGH_VOLTAGE_TEXT,
add_bool( "dvb-high-voltage", false, HIGH_VOLTAGE_TEXT,
HIGH_VOLTAGE_LONGTEXT, true )
add_integer( "dvb-tone", -1, TONE_TEXT, TONE_LONGTEXT,
true )
......
......@@ -244,9 +244,9 @@ vlc_module_begin ()
add_float( CFG_PREFIX "fps", 0.0f, FPS_TEXT, FPS_LONGTEXT, true )
add_bool( CFG_PREFIX "config", false, NULL, CONFIG_TEXT, CONFIG_LONGTEXT, true )
add_bool( CFG_PREFIX "config", false, CONFIG_TEXT, CONFIG_LONGTEXT, true )
add_bool( CFG_PREFIX "tuner", false, NULL, TUNER_TEXT, TUNER_LONGTEXT, true )
add_bool( CFG_PREFIX "tuner", false, TUNER_TEXT, TUNER_LONGTEXT, true )
add_integer( CFG_PREFIX "tuner-channel", 0, CHANNEL_TEXT, CHANNEL_LONGTEXT,
true )
......
......@@ -212,8 +212,8 @@ vlc_module_begin ()
change_safe()
add_integer( "dvb-inversion", 2, INVERSION_TEXT, INVERSION_LONGTEXT,
true )
add_bool( "dvb-probe", true, NULL, PROBE_TEXT, PROBE_LONGTEXT, true )
add_bool( "dvb-budget-mode", false, NULL, BUDGET_TEXT, BUDGET_LONGTEXT,
add_bool( "dvb-probe", true, PROBE_TEXT, PROBE_LONGTEXT, true )
add_bool( "dvb-budget-mode", false, BUDGET_TEXT, BUDGET_LONGTEXT,
true )
/* DVB-S (satellite) */
add_string( "dvb-satellite", NULL, SATELLITE_TEXT, SATELLITE_LONGTEXT,
......@@ -222,7 +222,7 @@ vlc_module_begin ()
true )
add_integer( "dvb-voltage", 13, VOLTAGE_TEXT, VOLTAGE_LONGTEXT,
true )
add_bool( "dvb-high-voltage", false, NULL, HIGH_VOLTAGE_TEXT,
add_bool( "dvb-high-voltage", false, HIGH_VOLTAGE_TEXT,
HIGH_VOLTAGE_LONGTEXT, true )
add_integer( "dvb-tone", -1, TONE_TEXT, TONE_LONGTEXT,
true )
......
......@@ -93,7 +93,7 @@ vlc_module_begin ()
ANGLE_LONGTEXT, false )
add_integer( "dvdnav-caching", DEFAULT_PTS_DELAY / 1000,
CACHING_TEXT, CACHING_LONGTEXT, true )
add_bool( "dvdnav-menu", true, NULL,
add_bool( "dvdnav-menu", true,
MENU_TEXT, MENU_LONGTEXT, false )
set_capability( "access_demux", 5 )
add_shortcut( "dvd", "dvdnav", "file" )
......
......@@ -122,17 +122,17 @@ vlc_module_begin ()
add_string( "http-user-agent", NULL, NULL, NULL, false )
change_safe()
change_private()
add_bool( "http-reconnect", false, NULL, RECONNECT_TEXT,
add_bool( "http-reconnect", false, RECONNECT_TEXT,
RECONNECT_LONGTEXT, true )
add_bool( "http-continuous", false, NULL, CONTINUOUS_TEXT,
add_bool( "http-continuous", false, CONTINUOUS_TEXT,
CONTINUOUS_LONGTEXT, true )
change_safe()
add_bool( "http-forward-cookies", true, NULL, FORWARD_COOKIES_TEXT,
add_bool( "http-forward-cookies", true, FORWARD_COOKIES_TEXT,
FORWARD_COOKIES_LONGTEXT, true )
add_integer( "http-max-redirect", 5, MAX_REDIRECT_TEXT,
MAX_REDIRECT_LONGTEXT, true )
#ifdef WIN32
add_bool( "http-use-IE-proxy", false, NULL, USE_IE_PROXY_TEXT,
add_bool( "http-use-IE-proxy", false, USE_IE_PROXY_TEXT,
USE_IE_PROXY_LONGTEXT, true )
#endif
add_obsolete_string("http-user")
......
......@@ -76,9 +76,9 @@ vlc_module_begin ()
add_integer( "jack-input-caching", DEFAULT_PTS_DELAY / 1000,
CACHING_TEXT, CACHING_LONGTEXT, true )
add_bool( "jack-input-use-vlc-pace", false, NULL,
add_bool( "jack-input-use-vlc-pace", false,
PACE_TEXT, PACE_LONGTEXT, true )
add_bool( "jack-input-auto-connect", false, NULL,
add_bool( "jack-input-auto-connect", false,
AUTO_CONNECT_TEXT, AUTO_CONNECT_LONGTEXT, true )
add_shortcut( "jack" )
......
......@@ -58,10 +58,10 @@ vlc_module_begin ()
add_shortcut ("file")
set_callbacks (Open, Close)
#ifdef __APPLE__
add_bool ("file-mmap", true, NULL,
add_bool ("file-mmap", true,
FILE_MMAP_TEXT, FILE_MMAP_LONGTEXT, true)
#else
add_bool ("file-mmap", false, NULL,
add_bool ("file-mmap", false,
FILE_MMAP_TEXT, FILE_MMAP_LONGTEXT, true)
#endif
vlc_module_end ()
......
......@@ -82,7 +82,7 @@ vlc_module_begin ()
add_integer( "mms-timeout", 5000, TIMEOUT_TEXT, TIMEOUT_LONGTEXT,
true )
add_bool( "mms-all", false, NULL, ALL_TEXT, ALL_LONGTEXT, true )
add_bool( "mms-all", false, ALL_TEXT, ALL_LONGTEXT, true )
add_integer( "mms-maxbitrate", 0, BITRATE_TEXT, BITRATE_LONGTEXT ,
false )
add_string( "mmsh-proxy", NULL, PROXY_TEXT, PROXY_LONGTEXT,
......
......@@ -86,7 +86,7 @@ vlc_module_begin ()
set_capability( "access_demux", 10 )
set_callbacks( DemuxOpen, DemuxClose )
add_bool( CFG_PREFIX "stereo", true, NULL, STEREO_TEXT, STEREO_LONGTEXT,
add_bool( CFG_PREFIX "stereo", true, STEREO_TEXT, STEREO_LONGTEXT,
true )
add_integer( CFG_PREFIX "samplerate", 48000, SAMPLERATE_TEXT,
SAMPLERATE_LONGTEXT, true )
......
......@@ -106,7 +106,7 @@ vlc_module_begin ()
add_integer( "screen-left", 0, LEFT_TEXT, LEFT_LONGTEXT, true )
add_integer( "screen-width", 0, WIDTH_TEXT, WIDTH_LONGTEXT, true )
add_integer( "screen-height", 0, HEIGHT_TEXT, HEIGHT_LONGTEXT, true )
add_bool( "screen-follow-mouse", false, NULL, FOLLOW_MOUSE_TEXT,
add_bool( "screen-follow-mouse", false, FOLLOW_MOUSE_TEXT,
FOLLOW_MOUSE_LONGTEXT, true )
#endif
......
......@@ -88,7 +88,7 @@ vlc_module_begin ()
add_integer ("screen-height", 0, LEFT_TEXT, LEFT_LONGTEXT, true)
change_integer_range (0, 65535)
change_safe ()
add_bool ("screen-follow-mouse", false, NULL, FOLLOW_MOUSE_TEXT,
add_bool ("screen-follow-mouse", false, FOLLOW_MOUSE_TEXT,
FOLLOW_MOUSE_LONGTEXT, true)
add_shortcut ("screen", "window")
......
......@@ -303,7 +303,7 @@ vlc_module_begin ()
add_integer( CFG_PREFIX "caching", 50 /* ms */,
CACHING_TEXT, CACHING_LONGTEXT, true )
#ifdef HAVE_LIBV4L2
add_bool( CFG_PREFIX "use-libv4l2", false, NULL, LIBV4L2_TEXT, LIBV4L2_LONGTEXT, true );
add_bool( CFG_PREFIX "use-libv4l2", false, LIBV4L2_TEXT, LIBV4L2_LONGTEXT, true );
#endif
set_section( N_( "Tuner" ), NULL )
......@@ -318,7 +318,7 @@ vlc_module_begin ()
set_section( N_( "Controls" ),
N_( "v4l2 driver controls, if supported by your v4l2 driver." ) )
add_bool( CFG_PREFIX "controls-reset", false, NULL, CTRL_RESET_TEXT,
add_bool( CFG_PREFIX "controls-reset", false, CTRL_RESET_TEXT,
CTRL_RESET_LONGTEXT, true )
add_integer( CFG_PREFIX "brightness", -1, BRIGHTNESS_TEXT,
BRIGHTNESS_LONGTEXT, true )
......@@ -358,7 +358,7 @@ vlc_module_begin ()
AUDIO_VOLUME_LONGTEXT, true )
add_integer( CFG_PREFIX "audio-balance", -1, AUDIO_BALANCE_TEXT,
AUDIO_BALANCE_LONGTEXT, true )
add_bool( CFG_PREFIX "audio-mute", false, NULL, AUDIO_MUTE_TEXT,
add_bool( CFG_PREFIX "audio-mute", false, AUDIO_MUTE_TEXT,
AUDIO_MUTE_LONGTEXT, true )
add_integer( CFG_PREFIX "audio-bass", -1, AUDIO_BASS_TEXT,
AUDIO_BASS_LONGTEXT, true )
......
......@@ -101,7 +101,7 @@ vlc_module_begin ()
N_("Number of CD blocks to get in a single read."),
true )
add_bool( MODULE_STRING "-PBC", false, NULL,
add_bool( MODULE_STRING "-PBC", false,
N_("Use playback control?"),
N_("If VCD is authored with playback control, use it. "
"Otherwise we play by tracks."),
......@@ -114,7 +114,7 @@ vlc_module_begin ()
"the length of an entry."),
false )
add_bool( MODULE_STRING "-extended-info", false, NULL,
add_bool( MODULE_STRING "-extended-info", false,
N_("Show extended VCD info?"),
N_("Show the maximum amount of information under Stream and "
"Media Info. Shows for example playback control navigation."),
......
......@@ -73,9 +73,9 @@ vlc_module_begin ()
set_category( CAT_SOUT )
set_subcategory( SUBCAT_SOUT_ACO )
add_shortcut( "file", "stream" )
add_bool( SOUT_CFG_PREFIX "append", false, NULL, APPEND_TEXT,APPEND_LONGTEXT,
add_bool( SOUT_CFG_PREFIX "append", false, APPEND_TEXT,APPEND_LONGTEXT,
true )
add_bool( SOUT_CFG_PREFIX "sync", false, NULL, SYNC_TEXT,SYNC_LONGTEXT,
add_bool( SOUT_CFG_PREFIX "sync", false, SYNC_TEXT,SYNC_LONGTEXT,
false )
set_callbacks( Open, Close )
vlc_module_end ()
......
......@@ -113,7 +113,7 @@ vlc_module_begin ()
add_string( SOUT_CFG_PREFIX "crl", NULL,
CRL_TEXT, CRL_LONGTEXT, true )
#if 0 //def HAVE_AVAHI_CLIENT
add_bool( SOUT_CFG_PREFIX "bonjour", false, NULL,
add_bool( SOUT_CFG_PREFIX "bonjour", false,
BONJOUR_TEXT, BONJOUR_LONGTEXT, true);
#endif
set_callbacks( Open, Close )
......
......@@ -89,11 +89,11 @@ vlc_module_begin ()
set_subcategory( SUBCAT_SOUT_ACO )
add_integer( SOUT_CFG_PREFIX "seglen", 10, SEGLEN_TEXT, SEGLEN_LONGTEXT, true )
add_integer( SOUT_CFG_PREFIX "numsegs", 0, NUMSEGS_TEXT, NUMSEGS_LONGTEXT, true )
add_bool( SOUT_CFG_PREFIX "splitanywhere", false, NULL,
add_bool( SOUT_CFG_PREFIX "splitanywhere", false,
SPLITANYWHERE_TEXT, SPLITANYWHERE_LONGTEXT, true )
add_bool( SOUT_CFG_PREFIX "delsegs", true, NULL,
add_bool( SOUT_CFG_PREFIX "delsegs", true,
DELSEGS_TEXT, DELSEGS_LONGTEXT, true )
add_bool( SOUT_CFG_PREFIX "ratecontrol", false, NULL,
add_bool( SOUT_CFG_PREFIX "ratecontrol", false,
RATECONTROL_TEXT, RATECONTROL_TEXT, true )
add_string( SOUT_CFG_PREFIX "index", NULL,
INDEX_TEXT, INDEX_LONGTEXT, true )
......
......@@ -59,7 +59,7 @@ vlc_module_begin ()
set_subcategory( SUBCAT_SOUT_STREAM )
add_shortcut( "rtmp" )
set_callbacks( Open, Close )
add_bool( "rtmp-connect", false, NULL, RTMP_CONNECT_TEXT,
add_bool( "rtmp-connect", false, RTMP_CONNECT_TEXT,
RTMP_CONNECT_LONGTEXT, false )
vlc_module_end ()
......
......@@ -117,7 +117,7 @@ vlc_module_begin ()
NAME_TEXT, NAME_LONGTEXT, false )
add_string( SOUT_CFG_PREFIX "description", "Live stream from VLC media player", NULL,
DESCRIPTION_TEXT, DESCRIPTION_LONGTEXT, false )
add_bool( SOUT_CFG_PREFIX "mp3", false, NULL,
add_bool( SOUT_CFG_PREFIX "mp3", false,
MP3_TEXT, MP3_LONGTEXT, true )
add_string( SOUT_CFG_PREFIX "genre", "Alternative",
GENRE_TEXT, GENRE_LONGTEXT, false )
......@@ -131,7 +131,7 @@ vlc_module_begin ()
CHANNELS_TEXT, CHANNELS_LONGTEXT, false )
add_string( SOUT_CFG_PREFIX "quality", "",
QUALITY_TEXT, QUALITY_LONGTEXT, false )
add_bool( SOUT_CFG_PREFIX "public", false, NULL,
add_bool( SOUT_CFG_PREFIX "public", false,
PUBLIC_TEXT, PUBLIC_LONGTEXT, true )
set_callbacks( Open, Close )
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