add_bool: remove callback parameter

include/vlc_plugin.h

@@ -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);
 

modules/access/alsa.c

@@ -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 )

modules/access/bda/bda.c

@@ -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 )

modules/access/dshow/dshow.cpp

@@ -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 )

modules/access/dvb/access.c

@@ -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 )

modules/access/dvdnav.c

@@ -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" )

modules/access/http.c

@@ -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")

modules/access/jack.c

@@ -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" )

modules/access/mmap.c

@@ -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 ()

modules/access/mms/mms.c

@@ -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,

modules/access/oss.c

@@ -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 )

modules/access/screen/screen.c

@@ -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
 

modules/access/screen/xcb.c

@@ -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")

modules/access/v4l2.c

@@ -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 )

modules/access/vcdx/vcd.c

@@ -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."),

modules/access_output/file.c

@@ -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 ()

modules/access_output/http.c

@@ -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 )

modules/access_output/livehttp.c

@@ -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 )

modules/access_output/rtmp.c

@@ -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 ()
 

modules/access_output/shout.c

@@ -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 ()

modules/audio_filter/channel_mixer/headphone.c

@@ -80,9 +80,9 @@ vlc_module_begin ()
 
     add_integer( "headphone-dim", 10, HEADPHONE_DIM_TEXT,
                  HEADPHONE_DIM_LONGTEXT, false )
-    add_bool( "headphone-compensate", false, NULL, HEADPHONE_COMPENSATE_TEXT,
+    add_bool( "headphone-compensate", false, HEADPHONE_COMPENSATE_TEXT,
               HEADPHONE_COMPENSATE_LONGTEXT, true )
-    add_bool( "headphone-dolby", false, NULL, HEADPHONE_DOLBY_TEXT,
+    add_bool( "headphone-dolby", false, HEADPHONE_DOLBY_TEXT,
               HEADPHONE_DOLBY_LONGTEXT, true )
 
     set_capability( "audio filter", 0 )

modules/audio_filter/channel_mixer/mono.c

@@ -112,7 +112,7 @@ vlc_module_begin ()
     set_callbacks( OpenFilter, CloseFilter )
     set_shortname( "Mono" )
 
-    add_bool( MONO_CFG "downmix", true, NULL, MONO_DOWNMIX_TEXT,
+    add_bool( MONO_CFG "downmix", true, MONO_DOWNMIX_TEXT,
               MONO_DOWNMIX_LONGTEXT, false )
     add_integer( MONO_CFG "channel", -1, MONO_CHANNEL_TEXT,
         MONO_CHANNEL_LONGTEXT, false )

modules/audio_filter/converter/a52tofloat32.c

@@ -95,8 +95,8 @@ vlc_module_begin ()
     set_description( N_("ATSC A/52 (AC-3) audio decoder") )
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_ACODEC )
-    add_bool( "a52-dynrng", true, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT, false )
-    add_bool( "a52-upmix", false, NULL, UPMIX_TEXT, UPMIX_LONGTEXT, true )
+    add_bool( "a52-dynrng", true, DYNRNG_TEXT, DYNRNG_LONGTEXT, false )
+    add_bool( "a52-upmix", false, UPMIX_TEXT, UPMIX_LONGTEXT, true )
     set_capability( "audio filter", 100 )
     set_callbacks( OpenFilter, CloseFilter )
 vlc_module_end ()

modules/audio_filter/converter/dtstofloat32.c

@@ -85,7 +85,7 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_INPUT_ACODEC )
     set_shortname( "DCA" )
     set_description( N_("DTS Coherent Acoustics audio decoder") )
-    add_bool( "dts-dynrng", true, NULL, DYNRNG_TEXT, DYNRNG_LONGTEXT, false )
+    add_bool( "dts-dynrng", true, DYNRNG_TEXT, DYNRNG_LONGTEXT, false )
     set_capability( "audio filter", 100 )
     set_callbacks( OpenFilter, CloseFilter )
 vlc_module_end ()

modules/audio_filter/equalizer.c

@@ -83,7 +83,7 @@ vlc_module_begin ()
         change_string_list( preset_list, preset_list_text, 0 )
     add_string( "equalizer-bands", NULL, BANDS_TEXT,
                 BANDS_LONGTEXT, true )
-    add_bool( "equalizer-2pass", false, NULL, TWOPASS_TEXT,
+    add_bool( "equalizer-2pass", false, TWOPASS_TEXT,
               TWOPASS_LONGTEXT, true )
     add_float( "equalizer-preamp", 12.0, PREAMP_TEXT,
                PREAMP_LONGTEXT, true )

modules/audio_output/directx.c

@@ -138,7 +138,7 @@ vlc_module_begin ()
         change_string_list( ppsz_adev, ppsz_adev_text, ReloadDirectXDevices )
         change_action_add( ReloadDirectXDevices, N_("Refresh list") )
         change_need_restart ()
-    add_bool( "directx-audio-float32", false, NULL, FLOAT_TEXT,
+    add_bool( "directx-audio-float32", false, FLOAT_TEXT,
               FLOAT_LONGTEXT, true )
     add_string( "directx-audio-speaker", "Windows default",
                  SPEAKER_TEXT, SPEAKER_LONGTEXT, true )

modules/audio_output/file.c

@@ -120,7 +120,7 @@ vlc_module_begin ()
                  CHANNELS_TEXT, CHANNELS_LONGTEXT, true )
     add_savefile( "audiofile-file", "audiofile.wav", FILE_TEXT,
                   FILE_LONGTEXT, false )
-    add_bool( "audiofile-wav", true, NULL, WAV_TEXT, WAV_LONGTEXT, true )
+    add_bool( "audiofile-wav", true, WAV_TEXT, WAV_LONGTEXT, true )
 
     set_capability( "audio output", 0 )
     add_shortcut( "file", "audiofile" )

modules/audio_output/jack.c

@@ -87,7 +87,7 @@ vlc_module_begin ()
     set_capability( "audio output", 100 )
     set_category( CAT_AUDIO )
     set_subcategory( SUBCAT_AUDIO_AOUT )
-    add_bool( AUTO_CONNECT_OPTION, false, NULL, AUTO_CONNECT_TEXT,
+    add_bool( AUTO_CONNECT_OPTION, false, AUTO_CONNECT_TEXT,
               AUTO_CONNECT_LONGTEXT, true )
     add_string( CONNECT_REGEX_OPTION, NULL, CONNECT_REGEX_TEXT,
                 CONNECT_REGEX_LONGTEXT, true )

modules/audio_output/oss.c

@@ -109,7 +109,7 @@ vlc_module_begin ()
     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 )
+    add_bool( "oss-buggy", false, BUGGY_TEXT, BUGGY_LONGTEXT, true )
 
     set_capability( "audio output", 100 )
     add_shortcut( "oss" )

modules/audio_output/waveout.c

@@ -99,7 +99,7 @@ vlc_module_begin ()
     set_capability( "audio output", 50 )
     set_category( CAT_AUDIO )
     set_subcategory( SUBCAT_AUDIO_AOUT )
-    add_bool( "waveout-float32", true, NULL, FLOAT_TEXT, FLOAT_LONGTEXT, true )
+    add_bool( "waveout-float32", true, FLOAT_TEXT, FLOAT_LONGTEXT, true )
 
     add_string( "waveout-audio-device", "wavemapper",
                  DEVICE_TEXT, DEVICE_LONG, false )

modules/codec/avcodec/avcodec.c

@@ -110,12 +110,12 @@ vlc_module_begin ()
     set_callbacks( OpenDecoder, CloseDecoder )
 
 
-    add_bool( "ffmpeg-dr", true, NULL, DR_TEXT, DR_TEXT, true )
+    add_bool( "ffmpeg-dr", true, DR_TEXT, DR_TEXT, true )
     add_integer ( "ffmpeg-error-resilience", 1, ERROR_TEXT,
         ERROR_LONGTEXT, true )
     add_integer ( "ffmpeg-workaround-bugs", 1, BUGS_TEXT, BUGS_LONGTEXT,
         false )
-    add_bool( "ffmpeg-hurry-up", true, NULL, HURRYUP_TEXT, HURRYUP_LONGTEXT,
+    add_bool( "ffmpeg-hurry-up", true, HURRYUP_TEXT, HURRYUP_LONGTEXT,
         false )
     add_integer( "ffmpeg-skip-frame", 0, SKIP_FRAME_TEXT,
         SKIP_FRAME_LONGTEXT, true )
@@ -128,7 +128,7 @@ vlc_module_begin ()
     add_integer ( "ffmpeg-lowres", 0, LOWRES_TEXT, LOWRES_LONGTEXT,
         true )
         change_integer_range( 0, 2 )
-    add_bool( "ffmpeg-fast", false, NULL, FAST_TEXT, FAST_LONGTEXT, true )
+    add_bool( "ffmpeg-fast", false, FAST_TEXT, FAST_LONGTEXT, true )
     add_integer ( "ffmpeg-skiploopfilter", 0, SKIPLOOPF_TEXT,
                   SKIPLOOPF_LONGTEXT, true )
         change_safe ()
@@ -137,7 +137,7 @@ vlc_module_begin ()
     add_integer( "ffmpeg-debug", 0, DEBUG_TEXT, DEBUG_LONGTEXT,
                  true )
 #if defined(HAVE_AVCODEC_VAAPI) || defined(HAVE_AVCODEC_DXVA2)
-    add_bool( "ffmpeg-hw", false, NULL, HW_TEXT, HW_LONGTEXT, true )
+    add_bool( "ffmpeg-hw", false, HW_TEXT, HW_LONGTEXT, true )
 #endif
 #if defined(FF_THREAD_FRAME)
     add_integer( "ffmpeg-threads", 0, THREADS_TEXT, THREADS_LONGTEXT, true );
@@ -160,15 +160,15 @@ vlc_module_begin ()
                  ENC_KEYINT_LONGTEXT, false )
     add_integer( ENC_CFG_PREFIX "bframes", 0, ENC_BFRAMES_TEXT,
                  ENC_BFRAMES_LONGTEXT, false )
-    add_bool( ENC_CFG_PREFIX "hurry-up", false, NULL, ENC_HURRYUP_TEXT,
+    add_bool( ENC_CFG_PREFIX "hurry-up", false, ENC_HURRYUP_TEXT,
               ENC_HURRYUP_LONGTEXT, false )
-    add_bool( ENC_CFG_PREFIX "interlace", false, NULL, ENC_INTERLACE_TEXT,
+    add_bool( ENC_CFG_PREFIX "interlace", false, ENC_INTERLACE_TEXT,
               ENC_INTERLACE_LONGTEXT, true )
-    add_bool( ENC_CFG_PREFIX "interlace-me", true, NULL, ENC_INTERLACE_ME_TEXT,
+    add_bool( ENC_CFG_PREFIX "interlace-me", true, ENC_INTERLACE_ME_TEXT,
               ENC_INTERLACE_ME_LONGTEXT, true )
     add_integer( ENC_CFG_PREFIX "vt", 0, ENC_VT_TEXT,
                  ENC_VT_LONGTEXT, true )
-    add_bool( ENC_CFG_PREFIX "pre-me", false, NULL, ENC_PRE_ME_TEXT,
+    add_bool( ENC_CFG_PREFIX "pre-me", false, ENC_PRE_ME_TEXT,
               ENC_PRE_ME_LONGTEXT, true )
     add_integer( ENC_CFG_PREFIX "rc-buffer-size", 224*1024*8,
                  ENC_RC_BUF_TEXT, ENC_RC_BUF_LONGTEXT, true )
@@ -178,13 +178,13 @@ vlc_module_begin ()
                ENC_IQUANT_FACTOR_TEXT, ENC_IQUANT_FACTOR_LONGTEXT, true )
     add_integer( ENC_CFG_PREFIX "noise-reduction", 0,
                  ENC_NOISE_RED_TEXT, ENC_NOISE_RED_LONGTEXT, true )
-    add_bool( ENC_CFG_PREFIX "mpeg4-matrix", false, NULL,
+    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 )
     add_integer( ENC_CFG_PREFIX "qmax", 0,
                  ENC_QMAX_TEXT, ENC_QMAX_LONGTEXT, true )
-    add_bool( ENC_CFG_PREFIX "trellis", false, NULL,
+    add_bool( ENC_CFG_PREFIX "trellis", false,
               ENC_TRELLIS_TEXT, ENC_TRELLIS_LONGTEXT, true )
     add_float( ENC_CFG_PREFIX "qscale", 0,
                ENC_QSCALE_TEXT, ENC_QSCALE_LONGTEXT, true )

modules/codec/dirac.c

@@ -216,7 +216,7 @@ vlc_module_begin()
                  ENC_TARGETRATE_TEXT, ENC_TARGETRATE_LONGTEXT, false )
     change_integer_range(-1, INT_MAX);
 
-    add_bool( ENC_CFG_PREFIX ENC_LOSSLESS, false, NULL,
+    add_bool( ENC_CFG_PREFIX ENC_LOSSLESS, false,
               ENC_LOSSLESS_TEXT, ENC_LOSSLESS_LONGTEXT, false )
 
     add_string( ENC_CFG_PREFIX ENC_PREFILTER, "diaglp",
@@ -272,7 +272,7 @@ vlc_module_begin()
               ENC_ME_SIMPLESEARCH_TEXT, ENC_ME_SIMPLESEARCH_LONGTEXT, false )
 
 #if DIRAC_RESEARCH_VERSION_ATLEAST(1,0,1)
-    add_bool( ENC_CFG_PREFIX ENC_ME_COMBINED, true, NULL,
+    add_bool( ENC_CFG_PREFIX ENC_ME_COMBINED, true,
               ENC_ME_COMBINED_TEXT, ENC_ME_COMBINED_LONGTEXT, false )
 #endif
 
@@ -300,7 +300,7 @@ vlc_module_begin()
                  ENC_SPARTITION_TEXT, ENC_SPARTITION_LONGTEXT, true )
     change_integer_range(-1, 1);
 
-    add_bool( ENC_CFG_PREFIX ENC_NOAC, false, NULL,
+    add_bool( ENC_CFG_PREFIX ENC_NOAC, false,
               ENC_NOAC_TEXT, ENC_NOAC_LONGTEXT, false )
 
     /* advanced option only */

modules/codec/kate.c

@@ -277,11 +277,11 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_INPUT_SCODEC )
     add_shortcut( "kate" )
 
-    add_bool( "kate-formatted", true, NULL, FORMAT_TEXT, FORMAT_LONGTEXT,
+    add_bool( "kate-formatted", true, FORMAT_TEXT, FORMAT_LONGTEXT,
               true )
 
 #ifdef HAVE_TIGER
-    add_bool( "kate-use-tiger", true, NULL, TIGER_TEXT, TIGER_LONGTEXT,
+    add_bool( "kate-use-tiger", true, TIGER_TEXT, TIGER_LONGTEXT,
               true )
     add_float_with_range( "kate-tiger-quality",
                           TIGER_QUALITY_DEFAULT, 0.0f, 1.0f, TigerConfigurationCallback,

modules/codec/speex.c

@@ -116,7 +116,7 @@ vlc_module_begin ()
                  ENC_COMPLEXITY_LONGTEXT, false )
         change_integer_range( 1, 10 )
 
-    add_bool( ENC_CFG_PREFIX "cbr", false, NULL, ENC_CBR_TEXT,
+    add_bool( ENC_CFG_PREFIX "cbr", false, ENC_CBR_TEXT,
                  ENC_CBR_LONGTEXT, false )
 
     add_float( ENC_CFG_PREFIX "quality", 8.0, ENC_QUALITY_TEXT,
@@ -126,10 +126,10 @@ vlc_module_begin ()
     add_integer( ENC_CFG_PREFIX "max-bitrate", 0, ENC_MAXBITRATE_TEXT,
                  ENC_MAXBITRATE_LONGTEXT, false )
 
-    add_bool( ENC_CFG_PREFIX "vad", true, NULL, ENC_VAD_TEXT,
+    add_bool( ENC_CFG_PREFIX "vad", true, ENC_VAD_TEXT,
                  ENC_VAD_LONGTEXT, false )
 
-    add_bool( ENC_CFG_PREFIX "dtx", false, NULL, ENC_DTX_TEXT,
+    add_bool( ENC_CFG_PREFIX "dtx", false, ENC_DTX_TEXT,
                  ENC_DTX_LONGTEXT, false )
 
     /* TODO agc, noise suppression, */

modules/codec/spudec/spudec.c

@@ -54,7 +54,7 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_INPUT_SCODEC )
     set_callbacks( DecoderOpen, Close )
 
-    add_bool( "dvdsub-transparency", false, NULL,
+    add_bool( "dvdsub-transparency", false,
               DVDSUBTRANS_DISABLE_TEXT, DVDSUBTRANS_DISABLE_LONGTEXT, true )
     add_submodule ()
     set_description( N_("DVD subtitles packetizer") )

modules/codec/subsdec.c

@@ -218,9 +218,9 @@ vlc_module_begin ()
     add_string( "subsdec-encoding", "",
                 ENCODING_TEXT, ENCODING_LONGTEXT, false )
         change_string_list( ppsz_encodings, ppsz_encoding_names, 0 )
-    add_bool( "subsdec-autodetect-utf8", true, NULL,
+    add_bool( "subsdec-autodetect-utf8", true,
               AUTODETECT_UTF8_TEXT, AUTODETECT_UTF8_LONGTEXT, false )
-    add_bool( "subsdec-formatted", true, NULL, FORMAT_TEXT, FORMAT_LONGTEXT,
+    add_bool( "subsdec-formatted", true, FORMAT_TEXT, FORMAT_LONGTEXT,
                  false )
 vlc_module_end ()
 

modules/codec/telx.c

@@ -77,9 +77,9 @@ vlc_module_begin ()
 
     add_integer( "telx-override-page", -1,
                  OVERRIDE_PAGE_TEXT, OVERRIDE_PAGE_LONGTEXT, true )
-    add_bool( "telx-ignore-subtitle-flag", false, NULL,
+    add_bool( "telx-ignore-subtitle-flag", false,
               IGNORE_SUB_FLAG_TEXT, IGNORE_SUB_FLAG_LONGTEXT, true )
-    add_bool( "telx-french-workaround", false, NULL,
+    add_bool( "telx-french-workaround", false,
               FRENCH_WORKAROUND_TEXT, FRENCH_WORKAROUND_LONGTEXT, true )
 
 vlc_module_end ()

modules/codec/twolame.c

@@ -84,7 +84,7 @@ vlc_module_begin ()
     add_integer( ENC_CFG_PREFIX "mode", 0, ENC_MODE_TEXT,
                  ENC_MODE_LONGTEXT, false )
         change_integer_list( pi_stereo_values, ppsz_stereo_descriptions );
-    add_bool( ENC_CFG_PREFIX "vbr", false, NULL, ENC_VBR_TEXT,
+    add_bool( ENC_CFG_PREFIX "vbr", false, ENC_VBR_TEXT,
               ENC_VBR_LONGTEXT, false )
     add_integer( ENC_CFG_PREFIX "psy", 3, ENC_PSY_TEXT,
                  ENC_PSY_LONGTEXT, false )

modules/codec/vorbis.c

@@ -213,7 +213,7 @@ vlc_module_begin ()
                  ENC_MAXBR_LONGTEXT, false )
     add_integer( ENC_CFG_PREFIX "min-bitrate", 0, ENC_MINBR_TEXT,
                  ENC_MINBR_LONGTEXT, false )
-    add_bool( ENC_CFG_PREFIX "cbr", false, NULL, ENC_CBR_TEXT,
+    add_bool( ENC_CFG_PREFIX "cbr", false, ENC_CBR_TEXT,
                  ENC_CBR_LONGTEXT, false )
 #endif
 

modules/codec/x264.c

@@ -456,14 +456,14 @@ vlc_module_begin ()
 #endif
         change_string_list( bpyramid_list, bpyramid_list, 0 );
 
-    add_bool( SOUT_CFG_PREFIX "cabac", true, NULL, CABAC_TEXT, CABAC_LONGTEXT,
+    add_bool( SOUT_CFG_PREFIX "cabac", true, CABAC_TEXT, CABAC_LONGTEXT,
               false )
 
     add_integer( SOUT_CFG_PREFIX "ref", 3, REF_TEXT,
                  REF_LONGTEXT, false )
         change_integer_range( 1, 16 )
 
-    add_bool( SOUT_CFG_PREFIX "nf", false, NULL, NF_TEXT,
+    add_bool( SOUT_CFG_PREFIX "nf", false, NF_TEXT,
               NF_LONGTEXT, false )
 
     add_string( SOUT_CFG_PREFIX "deblock", "0:0", FILTER_TEXT,
@@ -472,7 +472,7 @@ vlc_module_begin ()
     add_string( SOUT_CFG_PREFIX "psy-rd", "1.0:0.0", PSY_RD_TEXT,
                 PSY_RD_LONGTEXT, false )
 
-    add_bool( SOUT_CFG_PREFIX "psy", true, NULL, PSY_TEXT, PSY_LONGTEXT, false )
+    add_bool( SOUT_CFG_PREFIX "psy", true, PSY_TEXT, PSY_LONGTEXT, false )
 
     add_string( SOUT_CFG_PREFIX "level", "0", LEVEL_TEXT,
                LEVEL_LONGTEXT, false )
@@ -481,7 +481,7 @@ vlc_module_begin ()
                PROFILE_LONGTEXT, false )
         change_string_list( x264_profile_names, x264_profile_names, 0 );
 
-    add_bool( SOUT_CFG_PREFIX "interlaced", false, NULL, INTERLACED_TEXT, INTERLACED_LONGTEXT,
+    add_bool( SOUT_CFG_PREFIX "interlaced", false, INTERLACED_TEXT, INTERLACED_LONGTEXT,
               false )
 
     add_integer( SOUT_CFG_PREFIX "slices", 0, SLICE_COUNT, SLICE_COUNT_LONGTEXT, false )
@@ -576,7 +576,7 @@ vlc_module_begin ()
                  DIRECT_PRED_SIZE_LONGTEXT, false )
         change_integer_range( -1, 1 )
 
-    add_bool( SOUT_CFG_PREFIX "weightb", true, NULL, WEIGHTB_TEXT,
+    add_bool( SOUT_CFG_PREFIX "weightb", true, WEIGHTB_TEXT,
               WEIGHTB_LONGTEXT, false )
 
     add_integer( SOUT_CFG_PREFIX "weightp", 2, WEIGHTP_TEXT,
@@ -602,15 +602,15 @@ vlc_module_begin ()
 
     add_obsolete_bool( SOUT_CFG_PREFIX "b-rdo" )
 
-    add_bool( SOUT_CFG_PREFIX "mixed-refs", true, NULL, MIXED_REFS_TEXT,
+    add_bool( SOUT_CFG_PREFIX "mixed-refs", true, MIXED_REFS_TEXT,
               MIXED_REFS_LONGTEXT, false )
 
-    add_bool( SOUT_CFG_PREFIX "chroma-me", true, NULL, CHROMA_ME_TEXT,
+    add_bool( SOUT_CFG_PREFIX "chroma-me", true, CHROMA_ME_TEXT,
               CHROMA_ME_LONGTEXT, false )
 
     add_obsolete_bool( SOUT_CFG_PREFIX "bime" )
 
-    add_bool( SOUT_CFG_PREFIX "8x8dct", true, NULL, TRANSFORM_8X8DCT_TEXT,
+    add_bool( SOUT_CFG_PREFIX "8x8dct", true, TRANSFORM_8X8DCT_TEXT,
               TRANSFORM_8X8DCT_LONGTEXT, false )
 
     add_integer( SOUT_CFG_PREFIX "trellis", 1, TRELLIS_TEXT,
@@ -621,15 +621,15 @@ vlc_module_begin ()
                  LOOKAHEAD_LONGTEXT, false )
         change_integer_range( 0, 60 )
 
-    add_bool( SOUT_CFG_PREFIX "intra-refresh", false, NULL, INTRAREFRESH_TEXT,
+    add_bool( SOUT_CFG_PREFIX "intra-refresh", false, INTRAREFRESH_TEXT,
               INTRAREFRESH_LONGTEXT, false )
 
-    add_bool( SOUT_CFG_PREFIX "mbtree", true, NULL, MBTREE_TEXT, MBTREE_LONGTEXT, false )
+    add_bool( SOUT_CFG_PREFIX "mbtree", true, MBTREE_TEXT, MBTREE_LONGTEXT, false )
 
-    add_bool( SOUT_CFG_PREFIX "fast-pskip", true, NULL, FAST_PSKIP_TEXT,
+    add_bool( SOUT_CFG_PREFIX "fast-pskip", true, FAST_PSKIP_TEXT,
               FAST_PSKIP_LONGTEXT, false )
 
-    add_bool( SOUT_CFG_PREFIX "dct-decimate", true, NULL, DCT_DECIMATE_TEXT,
+    add_bool( SOUT_CFG_PREFIX "dct-decimate", true, DCT_DECIMATE_TEXT,
               DCT_DECIMATE_LONGTEXT, false )
 
     add_integer( SOUT_CFG_PREFIX "nr", 0, NR_TEXT,
@@ -646,30 +646,30 @@ vlc_module_begin ()
 
 /* Input/Output */
 
-    add_bool( SOUT_CFG_PREFIX "non-deterministic", false, NULL, NON_DETERMINISTIC_TEXT,
+    add_bool( SOUT_CFG_PREFIX "non-deterministic", false, NON_DETERMINISTIC_TEXT,
               NON_DETERMINISTIC_LONGTEXT, false )
 
-    add_bool( SOUT_CFG_PREFIX "asm", true, NULL, ASM_TEXT,
+    add_bool( SOUT_CFG_PREFIX "asm", true, ASM_TEXT,
               ASM_LONGTEXT, false )