Remove legacy parameter from add_string()

include/vlc_plugin.h

@@ -299,7 +299,7 @@ enum vlc_module_properties
 #define add_usage_hint( text ) \
     add_typedesc_inner( CONFIG_HINT_USAGE, text, NULL )
 
-#define add_string( name, value, p_callback, text, longtext, advc ) \
+#define add_string( name, value, text, longtext, advc ) \
     add_string_inner( CONFIG_ITEM_STRING, name, text, longtext, advc, \
                       value )
 

modules/access/bda/bda.c

@@ -203,9 +203,9 @@ vlc_module_begin ()
                  false )
         change_safe()
 #   if defined(WIN32) || defined(WINCE)
-        add_string( "dvb-network-name", NULL, NULL, NAME_TEXT, NAME_LONGTEXT,
+        add_string( "dvb-network-name", NULL, NAME_TEXT, NAME_LONGTEXT,
                     true )
-        add_string( "dvb-create-name", NULL, NULL, CREATE_TEXT,
+        add_string( "dvb-create-name", NULL, CREATE_TEXT,
                     CREATE_LONGTEXT, true )
         add_integer( "dvb-adapter", -1, NULL, ADAPTER_TEXT, ADAPTER_LONGTEXT,
                      true )
@@ -223,7 +223,7 @@ vlc_module_begin ()
         INVERSION_LONGTEXT, true )
         change_integer_list( i_inversion_list, ppsz_inversion_text )
 #   if defined(WIN32) || defined(WINCE)
-        add_string( "dvb-polarisation", NULL, NULL, POLARISATION_TEXT,
+        add_string( "dvb-polarisation", NULL, POLARISATION_TEXT,
             POLARISATION_LONGTEXT, false )
             change_string_list( ppsz_polar_list, ppsz_polar_text, 0 )
             /* Note: Polaristion H = voltage 18; V = voltage 13; */
@@ -235,7 +235,7 @@ vlc_module_begin ()
             ELEVATION_LONGTEXT, true )
         add_integer( "dvb-longitude", 0, NULL, LONGITUDE_TEXT,
             LONGITUDE_LONGTEXT, true )
-        add_string( "dvb-range", NULL, NULL, RANGE_TEXT,
+        add_string( "dvb-range", NULL, RANGE_TEXT,
             RANGE_LONGTEXT, true )
         /* dvb-range corresponds to the BDA InputRange parameter which is
          * used by some drivers to control the diseqc */

modules/access/cdda.c

@@ -84,7 +84,7 @@ vlc_module_begin ()
         change_volatile ()
 
 #ifdef HAVE_LIBCDDB
-    add_string( "cddb-server", "freedb.freedb.org", NULL, N_( "CDDB Server" ),
+    add_string( "cddb-server", "freedb.freedb.org", N_( "CDDB Server" ),
             N_( "Address of the CDDB server to use." ), true )
     add_integer( "cddb-port", 8880, NULL, N_( "CDDB port" ),
             N_( "CDDB Server port to use." ), true )

modules/access/dshow/dshow.cpp

@@ -226,21 +226,21 @@ vlc_module_begin ()
     add_integer( CFG_PREFIX "caching", (mtime_t)(0.2*CLOCK_FREQ) / 1000, NULL,
                  CACHING_TEXT, CACHING_LONGTEXT, true )
 
-    add_string( CFG_PREFIX "vdev", NULL, NULL, VDEV_TEXT, VDEV_LONGTEXT, false)
+    add_string( CFG_PREFIX "vdev", NULL, VDEV_TEXT, VDEV_LONGTEXT, false)
         change_string_list( ppsz_vdev, ppsz_vdev_text, FindDevicesCallback )
         change_action_add( FindDevicesCallback, N_("Refresh list") )
         change_action_add( ConfigDevicesCallback, N_("Configure") )
 
-    add_string( CFG_PREFIX "adev", NULL, NULL, ADEV_TEXT, ADEV_LONGTEXT, false)
+    add_string( CFG_PREFIX "adev", NULL, ADEV_TEXT, ADEV_LONGTEXT, false)
         change_string_list( ppsz_adev, ppsz_adev_text, FindDevicesCallback )
         change_action_add( FindDevicesCallback, N_("Refresh list") )
         change_action_add( ConfigDevicesCallback, N_("Configure") )
 
-    add_string( CFG_PREFIX "size", NULL, NULL, SIZE_TEXT, SIZE_LONGTEXT, false)
+    add_string( CFG_PREFIX "size", NULL, SIZE_TEXT, SIZE_LONGTEXT, false)
 
-    add_string( CFG_PREFIX "aspect-ratio", "4:3", NULL, ASPECT_TEXT, ASPECT_LONGTEXT, false)
+    add_string( CFG_PREFIX "aspect-ratio", "4:3", ASPECT_TEXT, ASPECT_LONGTEXT, false)
 
-    add_string( CFG_PREFIX "chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true )
+    add_string( CFG_PREFIX "chroma", NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true )
 
     add_float( CFG_PREFIX "fps", 0.0f, NULL, FPS_TEXT, FPS_LONGTEXT, true )
 

modules/access/dvb/access.c

@@ -216,7 +216,7 @@ vlc_module_begin ()
     add_bool( "dvb-budget-mode", false, NULL, BUDGET_TEXT, BUDGET_LONGTEXT,
               true )
     /* DVB-S (satellite) */
-    add_string( "dvb-satellite", NULL, NULL, SATELLITE_TEXT, SATELLITE_LONGTEXT,
+    add_string( "dvb-satellite", NULL, SATELLITE_TEXT, SATELLITE_LONGTEXT,
                 true )
     add_integer( "dvb-satno", 0, NULL, SATNO_TEXT, SATNO_LONGTEXT,
                  true )
@@ -254,21 +254,21 @@ vlc_module_begin ()
 #ifdef ENABLE_HTTPD
     /* MMI HTTP interface */
     set_section( N_("HTTP server" ), 0 )
-    add_string( "dvb-http-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT,
+    add_string( "dvb-http-host", NULL, HOST_TEXT, HOST_LONGTEXT,
                 true )
-    add_string( "dvb-http-user", NULL, NULL, USER_TEXT, USER_LONGTEXT,
+    add_string( "dvb-http-user", NULL, USER_TEXT, USER_LONGTEXT,
                 true )
     add_password( "dvb-http-password", NULL, NULL, PASSWORD_TEXT,
                   PASSWORD_LONGTEXT, true )
-    add_string( "dvb-http-acl", NULL, NULL, ACL_TEXT, ACL_LONGTEXT,
+    add_string( "dvb-http-acl", NULL, ACL_TEXT, ACL_LONGTEXT,
                 true )
-    add_string( "dvb-http-intf-cert", NULL, NULL, CERT_TEXT, CERT_LONGTEXT,
+    add_string( "dvb-http-intf-cert", NULL, CERT_TEXT, CERT_LONGTEXT,
                 true )
-    add_string( "dvb-http-intf-key",  NULL, NULL, KEY_TEXT,  KEY_LONGTEXT,
+    add_string( "dvb-http-intf-key",  NULL, KEY_TEXT,  KEY_LONGTEXT,
                 true )
-    add_string( "dvb-http-intf-ca",   NULL, NULL, CA_TEXT,   CA_LONGTEXT,
+    add_string( "dvb-http-intf-ca",   NULL, CA_TEXT,   CA_LONGTEXT,
                 true )
-    add_string( "dvb-http-intf-crl",  NULL, NULL, CRL_TEXT,  CRL_LONGTEXT,
+    add_string( "dvb-http-intf-crl",  NULL, CRL_TEXT,  CRL_LONGTEXT,
                 true )
 #endif
 

modules/access/fs.c

@@ -76,11 +76,11 @@ vlc_module_begin ()
     set_shortname( N_("Directory" ) )
     set_description( N_("Directory input") )
     set_capability( "access", 55 )
-    add_string( "recursive", "expand" , NULL, RECURSIVE_TEXT,
+    add_string( "recursive", "expand" , RECURSIVE_TEXT,
                 RECURSIVE_LONGTEXT, false )
       change_string_list( psz_recursive_list, psz_recursive_list_text, 0 )
     add_string( "ignore-filetypes", "m3u,db,nfo,ini,jpg,jpeg,ljpg,gif,png,pgm,pgmyuv,pbm,pam,tga,bmp,pnm,xpm,xcf,pcx,tif,tiff,lbm,sfv,txt,sub,idx,srt,cue,ssa",
-                NULL, IGNORE_TEXT, IGNORE_LONGTEXT, false )
+                IGNORE_TEXT, IGNORE_LONGTEXT, false )
 #ifndef HAVE_FDOPENDIR
     add_shortcut( "file", "directory", "dir" )
 #else

modules/access/ftp.c

@@ -78,11 +78,11 @@ vlc_module_begin ()
     add_integer( "ftp-caching", 2 * DEFAULT_PTS_DELAY / 1000, NULL,
                  CACHING_TEXT, CACHING_LONGTEXT, true )
         change_safe()
-    add_string( "ftp-user", "anonymous", NULL, USER_TEXT, USER_LONGTEXT,
+    add_string( "ftp-user", "anonymous", USER_TEXT, USER_LONGTEXT,
                 false )
-    add_string( "ftp-pwd", "anonymous@example.com", NULL, PASS_TEXT,
+    add_string( "ftp-pwd", "anonymous@example.com", PASS_TEXT,
                 PASS_LONGTEXT, false )
-    add_string( "ftp-account", "anonymous", NULL, ACCOUNT_TEXT,
+    add_string( "ftp-account", "anonymous", ACCOUNT_TEXT,
                 ACCOUNT_LONGTEXT, false )
     add_shortcut( "ftp" )
     set_callbacks( InOpen, InClose )

modules/access/http.c

@@ -112,14 +112,14 @@ vlc_module_begin ()
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_ACCESS )
 
-    add_string( "http-proxy", NULL, NULL, PROXY_TEXT, PROXY_LONGTEXT,
+    add_string( "http-proxy", NULL, PROXY_TEXT, PROXY_LONGTEXT,
                 false )
     add_password( "http-proxy-pwd", NULL, NULL,
                   PROXY_PASS_TEXT, PROXY_PASS_LONGTEXT, false )
     add_integer( "http-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL,
                  CACHING_TEXT, CACHING_LONGTEXT, true )
         change_safe()
-    add_string( "http-user-agent", NULL, NULL, NULL, NULL, false )
+    add_string( "http-user-agent", NULL, NULL, NULL, false )
         change_safe()
         change_private()
     add_bool( "http-reconnect", false, NULL, RECONNECT_TEXT,

modules/access/imem.c

@@ -127,14 +127,14 @@ vlc_module_begin()
 
     add_integer("imem-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, true)
         change_private()
-    add_string ("imem-get", "0", NULL, GET_TEXT, GET_LONGTEXT, true)
+    add_string ("imem-get", "0", GET_TEXT, GET_LONGTEXT, true)
         change_volatile()
-    add_string ("imem-release", "0", NULL, RELEASE_TEXT, RELEASE_LONGTEXT, true)
+    add_string ("imem-release", "0", RELEASE_TEXT, RELEASE_LONGTEXT, true)
         change_volatile()
-    add_string ("imem-cookie", NULL, NULL, COOKIE_TEXT, COOKIE_LONGTEXT, true)
+    add_string ("imem-cookie", NULL, COOKIE_TEXT, COOKIE_LONGTEXT, true)
         change_volatile()
         change_safe()
-    add_string ("imem-data", "0", NULL, DATA_TEXT, DATA_LONGTEXT, true)
+    add_string ("imem-data", "0", DATA_TEXT, DATA_LONGTEXT, true)
         change_volatile()
 
     add_integer("imem-id", -1, NULL, ID_TEXT, ID_LONGTEXT, true)
@@ -147,10 +147,10 @@ vlc_module_begin()
         change_integer_list(cat_values, cat_texts)
         change_private()
         change_safe()
-    add_string ("imem-codec", NULL, NULL, CODEC_TEXT, CODEC_LONGTEXT, true)
+    add_string ("imem-codec", NULL, CODEC_TEXT, CODEC_LONGTEXT, true)
         change_private()
         change_safe()
-    add_string( "imem-language", NULL, NULL, LANGUAGE_TEXT, LANGUAGE_LONGTEXT, false)
+    add_string( "imem-language", NULL, LANGUAGE_TEXT, LANGUAGE_LONGTEXT, false)
         change_private()
         change_safe()
 
@@ -167,10 +167,10 @@ vlc_module_begin()
     add_integer("imem-height", 0, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, true)
         change_private()
         change_safe()
-    add_string ("imem-dar", NULL, NULL, DAR_TEXT, DAR_LONGTEXT, true)
+    add_string ("imem-dar", NULL, DAR_TEXT, DAR_LONGTEXT, true)
         change_private()
         change_safe()
-    add_string ("imem-fps", NULL, NULL, FPS_TEXT, FPS_LONGTEXT, true)
+    add_string ("imem-fps", NULL, FPS_TEXT, FPS_LONGTEXT, true)
         change_private()
         change_safe()
 

modules/access/mms/mms.c

@@ -85,7 +85,7 @@ vlc_module_begin ()
     add_bool( "mms-all", false, NULL, ALL_TEXT, ALL_LONGTEXT, true )
     add_integer( "mms-maxbitrate", 0, NULL, BITRATE_TEXT, BITRATE_LONGTEXT ,
                  false )
-    add_string( "mmsh-proxy", NULL, NULL, PROXY_TEXT, PROXY_LONGTEXT,
+    add_string( "mmsh-proxy", NULL, PROXY_TEXT, PROXY_LONGTEXT,
                     false )
 
     add_shortcut( "mms", "mmsu", "mmst", "mmsh", "http" )

modules/access/pvr.c

@@ -134,9 +134,9 @@ vlc_module_begin ()
 
     add_integer( "pvr-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,
                  CACHING_LONGTEXT, true )
-    add_string( "pvr-device", "/dev/video0", NULL, DEVICE_TEXT,
+    add_string( "pvr-device", "/dev/video0", DEVICE_TEXT,
                  DEVICE_LONGTEXT, false )
-    add_string( "pvr-radio-device", "/dev/radio0", NULL, RADIO_DEVICE_TEXT,
+    add_string( "pvr-radio-device", "/dev/radio0", RADIO_DEVICE_TEXT,
                  RADIO_DEVICE_LONGTEXT, false )
     add_integer( "pvr-norm", V4L2_STD_UNKNOWN , NULL, NORM_TEXT,
                  NORM_LONGTEXT, false )

modules/access/rtmp/access.c

@@ -66,9 +66,9 @@ vlc_module_begin ()
 
     add_integer( "rtmp-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT,
                  CACHING_LONGTEXT, true )
-    add_string( "rtmp-swfurl", "file:///player.swf", NULL, SWFURL_TEXT,
+    add_string( "rtmp-swfurl", "file:///player.swf", SWFURL_TEXT,
                 SWFURL_LONGTEXT, true )
-    add_string( "rtmp-pageurl", "file:///player.htm", NULL, PAGEURL_TEXT,
+    add_string( "rtmp-pageurl", "file:///player.htm", PAGEURL_TEXT,
                 PAGEURL_LONGTEXT, true )
 
     set_capability( "access", 0 )

modules/access/rtp/rtp.c

@@ -98,9 +98,9 @@ vlc_module_begin ()
         change_integer_range (0, 65535)
         change_safe ()
 #ifdef HAVE_SRTP
-    add_string ("srtp-key", "", NULL,
+    add_string ("srtp-key", "",
                 SRTP_KEY_TEXT, SRTP_KEY_LONGTEXT, false)
-    add_string ("srtp-salt", "", NULL,
+    add_string ("srtp-salt", "",
                 SRTP_SALT_TEXT, SRTP_SALT_LONGTEXT, false)
 #endif
     add_integer ("rtp-max-src", 1, NULL, RTP_MAX_SRC_TEXT,

modules/access/smb.c

@@ -83,11 +83,11 @@ vlc_module_begin ()
     add_integer( "smb-caching", 2 * DEFAULT_PTS_DELAY / 1000, NULL,
                  CACHING_TEXT, CACHING_LONGTEXT, true )
         change_safe()
-    add_string( "smb-user", NULL, NULL, USER_TEXT, USER_LONGTEXT,
+    add_string( "smb-user", NULL, USER_TEXT, USER_LONGTEXT,
                 false )
     add_password( "smb-pwd", NULL, NULL, PASS_TEXT,
                   PASS_LONGTEXT, false )
-    add_string( "smb-domain", NULL, NULL, DOMAIN_TEXT,
+    add_string( "smb-domain", NULL, DOMAIN_TEXT,
                 DOMAIN_LONGTEXT, false )
     add_shortcut( "smb" )
     set_callbacks( Open, Close )

modules/access/v4l2.c

@@ -284,7 +284,7 @@ vlc_module_begin ()
     add_integer( CFG_PREFIX "standard", 0, NULL, STANDARD_TEXT,
                  STANDARD_LONGTEXT, false )
         change_integer_list( i_standards_list, psz_standards_list_text )
-    add_string( CFG_PREFIX "chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT,
+    add_string( CFG_PREFIX "chroma", NULL, CHROMA_TEXT, CHROMA_LONGTEXT,
                 true )
     add_integer( CFG_PREFIX "input", 0, NULL, INPUT_TEXT, INPUT_LONGTEXT,
                 true )
@@ -297,7 +297,7 @@ vlc_module_begin ()
                 WIDTH_LONGTEXT, true )
     add_integer( CFG_PREFIX "height", DEFAULT_HEIGHT, NULL, HEIGHT_TEXT,
                 HEIGHT_LONGTEXT, true )
-    add_string( CFG_PREFIX "aspect-ratio", "4:3", NULL, ASPECT_TEXT,
+    add_string( CFG_PREFIX "aspect-ratio", "4:3", ASPECT_TEXT,
               ASPECT_LONGTEXT, true )
     add_float( CFG_PREFIX "fps", 0, NULL, FPS_TEXT, FPS_LONGTEXT, true )
     add_integer( CFG_PREFIX "caching", 50 /* ms */, NULL,
@@ -366,7 +366,7 @@ vlc_module_begin ()
                 AUDIO_TREBLE_LONGTEXT, true )
     add_integer( CFG_PREFIX "audio-loudness", -1, NULL, AUDIO_LOUDNESS_TEXT,
                 AUDIO_LOUDNESS_LONGTEXT, true )
-    add_string( CFG_PREFIX "set-ctrls", NULL, NULL, S_CTRLS_TEXT,
+    add_string( CFG_PREFIX "set-ctrls", NULL, S_CTRLS_TEXT,
               S_CTRLS_LONGTEXT, true )
 
     add_obsolete_string( CFG_PREFIX "dev" )

modules/access/vcdx/vcd.c

@@ -121,15 +121,11 @@ vlc_module_begin ()
                  "Media Info. Shows for example playback control navigation."),
               false )
 
-    add_string( MODULE_STRING "-author-format",
-                "%v - %F disc %c of %C",
-                NULL,
+    add_string( MODULE_STRING "-author-format", "%v - %F disc %c of %C", NULL,
                 N_("Format to use in the playlist's \"author\" field."),
                 VCD_TITLE_FMT_LONGTEXT, true )
 
-    add_string( MODULE_STRING "-title-format",
-                "%I %N %L%S - %M %A %v - disc %c of %C %F",
-                NULL,
+    add_string( MODULE_STRING "-title-format", "%I %N %L%S - %M %A %v - disc %c of %C %F", NULL,
                 N_("Format to use in the playlist's \"title\" field."),
                 VCD_TITLE_FMT_LONGTEXT, false )
 

modules/access_output/http.c

@@ -98,19 +98,19 @@ vlc_module_begin ()
     add_shortcut( "http", "https", "mmsh" )
     set_category( CAT_SOUT )
     set_subcategory( SUBCAT_SOUT_ACO )
-    add_string( SOUT_CFG_PREFIX "user", "", NULL,
+    add_string( SOUT_CFG_PREFIX "user", "",
                 USER_TEXT, USER_LONGTEXT, true )
     add_password( SOUT_CFG_PREFIX "pwd", "", NULL,
                   PASS_TEXT, PASS_LONGTEXT, true )
-    add_string( SOUT_CFG_PREFIX "mime", "", NULL,
+    add_string( SOUT_CFG_PREFIX "mime", "",
                 MIME_TEXT, MIME_LONGTEXT, true )
-    add_string( SOUT_CFG_PREFIX "cert", "vlc.pem", NULL,
+    add_string( SOUT_CFG_PREFIX "cert", "vlc.pem",
                 CERT_TEXT, CERT_LONGTEXT, true )
-    add_string( SOUT_CFG_PREFIX "key", NULL, NULL,
+    add_string( SOUT_CFG_PREFIX "key", NULL,
                 KEY_TEXT, KEY_LONGTEXT, true )
-    add_string( SOUT_CFG_PREFIX "ca", NULL, NULL,
+    add_string( SOUT_CFG_PREFIX "ca", NULL,
                 CA_TEXT, CA_LONGTEXT, true )
-    add_string( SOUT_CFG_PREFIX "crl", NULL, NULL,
+    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,

modules/access_output/livehttp.c

@@ -95,9 +95,9 @@ vlc_module_begin ()
               DELSEGS_TEXT, DELSEGS_LONGTEXT, true )
     add_bool( SOUT_CFG_PREFIX "ratecontrol", false, NULL,
               RATECONTROL_TEXT, RATECONTROL_TEXT, true )
-    add_string( SOUT_CFG_PREFIX "index", NULL, NULL,
+    add_string( SOUT_CFG_PREFIX "index", NULL,
                 INDEX_TEXT, INDEX_LONGTEXT, true )
-    add_string( SOUT_CFG_PREFIX "index-url", NULL, NULL,
+    add_string( SOUT_CFG_PREFIX "index-url", NULL,
                 INDEXURL_TEXT, INDEXURL_LONGTEXT, true )
     set_callbacks( Open, Close )
 vlc_module_end ()

modules/access_output/shout.c

@@ -113,24 +113,23 @@ vlc_module_begin ()
     set_category( CAT_SOUT )
     set_subcategory( SUBCAT_SOUT_ACO )
     add_shortcut( "shout" )
-    add_string( SOUT_CFG_PREFIX "name", "VLC media player - Live stream", NULL,
+    add_string( SOUT_CFG_PREFIX "name", "VLC media player - Live stream",
                 NAME_TEXT, NAME_LONGTEXT, false )
-    add_string( SOUT_CFG_PREFIX "description",
-                 "Live stream from VLC media player", NULL,
+    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,
                 MP3_TEXT, MP3_LONGTEXT, true )
-    add_string( SOUT_CFG_PREFIX "genre", "Alternative", NULL,
+    add_string( SOUT_CFG_PREFIX "genre", "Alternative",
                 GENRE_TEXT, GENRE_LONGTEXT, false )
-    add_string( SOUT_CFG_PREFIX "url", "http://www.videolan.org/vlc", NULL,
+    add_string( SOUT_CFG_PREFIX "url", "http://www.videolan.org/vlc",
                 URL_TEXT, URL_LONGTEXT, false )
-    add_string( SOUT_CFG_PREFIX "bitrate", "", NULL,
+    add_string( SOUT_CFG_PREFIX "bitrate", "",
                 BITRATE_TEXT, BITRATE_LONGTEXT, false )
-    add_string( SOUT_CFG_PREFIX "samplerate", "", NULL,
+    add_string( SOUT_CFG_PREFIX "samplerate", "",
                 SAMPLERATE_TEXT, SAMPLERATE_LONGTEXT, false )
-    add_string( SOUT_CFG_PREFIX "channels", "", NULL,
+    add_string( SOUT_CFG_PREFIX "channels", "",
                 CHANNELS_TEXT, CHANNELS_LONGTEXT, false )
-    add_string( SOUT_CFG_PREFIX "quality", "", NULL,
+    add_string( SOUT_CFG_PREFIX "quality", "",
                 QUALITY_TEXT, QUALITY_LONGTEXT, false )
     add_bool(   SOUT_CFG_PREFIX "public", false, NULL,
                 PUBLIC_TEXT, PUBLIC_LONGTEXT, true )

modules/audio_filter/audiobargraph_a.c

@@ -87,7 +87,7 @@ vlc_module_begin ()
     set_category( CAT_AUDIO )
     set_subcategory( SUBCAT_AUDIO_AFILTER )
     
-    add_string( CFG_PREFIX "address", "localhost", NULL, ADDRESS_TEXT, ADDRESS_LONGTEXT, false )
+    add_string( CFG_PREFIX "address", "localhost", ADDRESS_TEXT, ADDRESS_LONGTEXT, false )
     add_integer( CFG_PREFIX "port", 12345, NULL, PORT_TEXT, PORT_LONGTEXT, false )
     add_integer( CFG_PREFIX "bargraph", 1, NULL, BARGRAPH_TEXT, BARGRAPH_LONGTEXT, false )
     add_integer( CFG_PREFIX "bargraph_repetition", 4, NULL, BARGRAPH_REPETITION_TEXT, BARGRAPH_REPETITION_LONGTEXT, false )

modules/audio_filter/equalizer.c

@@ -78,10 +78,10 @@ vlc_module_begin ()
     set_category( CAT_AUDIO )
     set_subcategory( SUBCAT_AUDIO_AFILTER )
 
-    add_string( "equalizer-preset", "flat", NULL, PRESET_TEXT,
+    add_string( "equalizer-preset", "flat", PRESET_TEXT,
                 PRESET_LONGTEXT, false )
         change_string_list( preset_list, preset_list_text, 0 )
-    add_string( "equalizer-bands", NULL, NULL, BANDS_TEXT,
+    add_string( "equalizer-bands", NULL, BANDS_TEXT,
                 BANDS_LONGTEXT, true )
     add_bool( "equalizer-2pass", false, NULL, TWOPASS_TEXT,
               TWOPASS_LONGTEXT, true )

modules/audio_output/alsa.c

@@ -110,7 +110,7 @@ vlc_module_begin ()
     set_description( N_("ALSA audio output") )
     set_category( CAT_AUDIO )
     set_subcategory( SUBCAT_AUDIO_AOUT )
-    add_string( "alsa-audio-device", DEFAULT_ALSA_DEVICE, NULL,
+    add_string( "alsa-audio-device", DEFAULT_ALSA_DEVICE,
                 N_("ALSA Device Name"), NULL, false )
         add_deprecated_alias( "alsadev" )   /* deprecated since 0.9.3 */
         change_string_list( ppsz_devices, ppsz_devices_text, FindDevicesCallback )

modules/audio_output/directx.c

@@ -132,7 +132,7 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_AUDIO_AOUT )
     add_shortcut( "directx", "directsound" )
 
-    add_string( "directx-audio-device-name", "default", NULL,
+    add_string( "directx-audio-device-name", "default",
              DEVICE_TEXT, DEVICE_LONGTEXT, false )
         add_deprecated_alias( "directx-audio-device" ) /* Since 1.1.0 */
         change_string_list( ppsz_adev, ppsz_adev_text, ReloadDirectXDevices )
@@ -140,7 +140,7 @@ vlc_module_begin ()
         change_need_restart ()
     add_bool( "directx-audio-float32", false, NULL, FLOAT_TEXT,
               FLOAT_LONGTEXT, true )
-    add_string( "directx-audio-speaker", "Windows default", NULL,
+    add_string( "directx-audio-speaker", "Windows default",
                  SPEAKER_TEXT, SPEAKER_LONGTEXT, true )
         change_string_list( speaker_list, 0, 0 )
         change_need_restart ()

modules/audio_output/file.c

@@ -113,7 +113,7 @@ vlc_module_begin ()
     set_category( CAT_AUDIO )
     set_subcategory( SUBCAT_AUDIO_AOUT )
 
-    add_string( "audiofile-format", "s16", NULL,
+    add_string( "audiofile-format", "s16",
                 FORMAT_TEXT, FORMAT_LONGTEXT, true )
         change_string_list( format_list, 0, 0 )
     add_integer( "audiofile-channels", 0, NULL,

modules/audio_output/jack.c

@@ -89,7 +89,7 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_AUDIO_AOUT )
     add_bool( AUTO_CONNECT_OPTION, false, NULL, AUTO_CONNECT_TEXT,
               AUTO_CONNECT_LONGTEXT, true )
-    add_string( CONNECT_REGEX_OPTION, NULL, NULL, CONNECT_REGEX_TEXT,
+    add_string( CONNECT_REGEX_OPTION, NULL, CONNECT_REGEX_TEXT,
                 CONNECT_REGEX_LONGTEXT, true )
     set_callbacks( Open, Close )
 vlc_module_end ()

modules/audio_output/waveout.c

@@ -101,7 +101,7 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_AUDIO_AOUT )
     add_bool( "waveout-float32", true, NULL, FLOAT_TEXT, FLOAT_LONGTEXT, true )
 
-    add_string( "waveout-audio-device", "wavemapper", NULL,
+    add_string( "waveout-audio-device", "wavemapper",
                  DEVICE_TEXT, DEVICE_LONG, false )
        add_deprecated_alias( "waveout-dev" )   /* deprecated since 0.9.3 */
        change_string_list( ppsz_adev, ppsz_adev_text, ReloadWaveoutDevices )

modules/codec/avcodec/avcodec.c

@@ -153,7 +153,7 @@ vlc_module_begin ()
     set_capability( "encoder", 100 )
     set_callbacks( OpenEncoder, CloseEncoder )
 
-    add_string( ENC_CFG_PREFIX "hq", "simple", NULL, ENC_HQ_TEXT,
+    add_string( ENC_CFG_PREFIX "hq", "simple", ENC_HQ_TEXT,
                 ENC_HQ_LONGTEXT, false )
         change_string_list( enc_hq_list, enc_hq_list_text, 0 )
     add_integer( ENC_CFG_PREFIX "keyint", 0, NULL, ENC_KEYINT_TEXT,
@@ -204,7 +204,7 @@ vlc_module_begin ()
                  ENC_CHROMA_ELIM_TEXT, ENC_CHROMA_ELIM_LONGTEXT, true )
 
     /* Audio AAC encoder profile */
-    add_string( ENC_CFG_PREFIX "aac-profile", "low", NULL,
+    add_string( ENC_CFG_PREFIX "aac-profile", "low",
                 ENC_PROFILE_TEXT, ENC_PROFILE_LONGTEXT, true )
 #endif /* ENABLE_SOUT */
 

modules/codec/dirac.c

@@ -219,7 +219,7 @@ vlc_module_begin()
     add_bool( ENC_CFG_PREFIX ENC_LOSSLESS, false, NULL,
               ENC_LOSSLESS_TEXT, ENC_LOSSLESS_LONGTEXT, false )
 
-    add_string( ENC_CFG_PREFIX ENC_PREFILTER, "diaglp", NULL,
+    add_string( ENC_CFG_PREFIX ENC_PREFILTER, "diaglp",
                 ENC_PREFILTER_TEXT, ENC_PREFILTER_LONGTEXT, false )
     change_string_list( enc_prefilter_list, enc_prefilter_list_text, 0 );
 
@@ -227,7 +227,7 @@ vlc_module_begin()
                  ENC_PREFILTER_STRENGTH_TEXT, ENC_PREFILTER_STRENGTH_LONGTEXT, false )
     change_integer_range(0, 10);
 
-    add_string( ENC_CFG_PREFIX ENC_CHROMAFMT, "420", NULL,
+    add_string( ENC_CFG_PREFIX ENC_CHROMAFMT, "420",
                 ENC_CHROMAFMT_TEXT, ENC_CHROMAFMT_LONGTEXT, false )
     change_string_list( enc_chromafmt_list, enc_chromafmt_list_text, 0 );
 
@@ -239,11 +239,11 @@ vlc_module_begin()
                  ENC_L1NUM_TEXT, ENC_L1NUM_LONGTEXT, false )
     change_integer_range(-1, INT_MAX);
 
-    add_string( ENC_CFG_PREFIX ENC_CODINGMODE, "auto", NULL,
+    add_string( ENC_CFG_PREFIX ENC_CODINGMODE, "auto",
                 ENC_CODINGMODE_TEXT, ENC_CODINGMODE_LONGTEXT, false )
     change_string_list( enc_codingmode_list, enc_codingmode_list_text, 0 );
 
-    add_string( ENC_CFG_PREFIX ENC_MVPREC, "1/2", NULL,
+    add_string( ENC_CFG_PREFIX ENC_MVPREC, "1/2",
                 ENC_MVPREC_TEXT, ENC_MVPREC_LONGTEXT, false )
     change_string_list( enc_mvprec_list, enc_mvprec_list, 0 );
 
@@ -268,7 +268,7 @@ vlc_module_begin()
                  ENC_MCBLK_YBLEN_TEXT, ENC_MCBLK_YBLEN_LONGTEXT, true )
     change_integer_range(-1, INT_MAX);
 
-    add_string( ENC_CFG_PREFIX ENC_ME_SIMPLESEARCH, "", NULL,
+    add_string( ENC_CFG_PREFIX ENC_ME_SIMPLESEARCH, "",
               ENC_ME_SIMPLESEARCH_TEXT, ENC_ME_SIMPLESEARCH_LONGTEXT, false )
 
 #if DIRAC_RESEARCH_VERSION_ATLEAST(1,0,1)

modules/codec/invmem.c

@@ -82,10 +82,10 @@ vlc_module_begin()
 
     add_integer( "invmem-width", 0, NULL, T_WIDTH, LT_WIDTH, false )
     add_integer( "invmem-height", 0, NULL, T_HEIGHT, LT_HEIGHT, false )
-    add_string( "invmem-lock", "0", NULL, T_LOCK, LT_LOCK, true )
-    add_string( "invmem-unlock", "0", NULL, T_UNLOCK, LT_UNLOCK, true )
-    add_string( "invmem-data", "0", NULL, T_DATA, LT_DATA, true )
-    add_string( "invmem-chroma", "RV24", NULL, T_CHROMA, LT_CHROMA, true)
+    add_string( "invmem-lock", "0", T_LOCK, LT_LOCK, true )
+    add_string( "invmem-unlock", "0", T_UNLOCK, LT_UNLOCK, true )
+    add_string( "invmem-data", "0", T_DATA, LT_DATA, true )
+    add_string( "invmem-chroma", "RV24", T_CHROMA, LT_CHROMA, true)
 vlc_module_end()
 
 

modules/codec/kate.c

@@ -289,8 +289,7 @@ vlc_module_begin ()
                           true )
 
     set_section( N_("Tiger rendering defaults"), NULL );
-    add_string( "kate-tiger-default-font-desc",
-                TIGER_DEFAULT_FONT_DESC_DEFAULT, TigerConfigurationCallback,
+    add_string( "kate-tiger-default-font-desc", TIGER_DEFAULT_FONT_DESC_DEFAULT, NULL,
                 TIGER_DEFAULT_FONT_DESC_TEXT, TIGER_DEFAULT_FONT_DESC_LONGTEXT, true);
     add_integer_with_range( "kate-tiger-default-font-effect",
                             TIGER_DEFAULT_FONT_EFFECT_DEFAULT,

modules/codec/subsdec.c

@@ -215,7 +215,7 @@ vlc_module_begin ()
     add_integer( "subsdec-align", 0, NULL, ALIGN_TEXT, ALIGN_LONGTEXT,
                  false )
         change_integer_list( pi_justification, ppsz_justification_text )
-    add_string( "subsdec-encoding", "", NULL,
+    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,

modules/codec/x264.c

@@ -424,7 +424,7 @@ vlc_module_begin ()
                  MIN_KEYINT_LONGTEXT, false )
 
 #if X264_BUILD >= 102
-    add_string( SOUT_CFG_PREFIX "opengop", "none", NULL, OPENGOP_TEXT,
+    add_string( SOUT_CFG_PREFIX "opengop", "none", OPENGOP_TEXT,
                OPENGOP_LONGTEXT,false )
         change_string_list( x264_open_gop_names, x264_open_gop_names, 0 );
 #endif
@@ -448,10 +448,10 @@ vlc_module_begin ()
         change_integer_range( -100, 100 )
 
 #if X264_BUILD >= 87
-    add_string( SOUT_CFG_PREFIX "bpyramid", "normal", NULL, BPYRAMID_TEXT,
+    add_string( SOUT_CFG_PREFIX "bpyramid", "normal", BPYRAMID_TEXT,
               BPYRAMID_LONGTEXT, false )
 #else
-    add_string( SOUT_CFG_PREFIX "bpyramid", "none", NULL, BPYRAMID_TEXT,
+    add_string( SOUT_CFG_PREFIX "bpyramid", "none", BPYRAMID_TEXT,
               BPYRAMID_LONGTEXT, false )
 #endif
         change_string_list( bpyramid_list, bpyramid_list, 0 );
@@ -466,18 +466,18 @@ vlc_module_begin ()
     add_bool( SOUT_CFG_PREFIX "nf", false, NULL, NF_TEXT,
               NF_LONGTEXT, false )
 
-    add_string( SOUT_CFG_PREFIX "deblock", "0:0", NULL, FILTER_TEXT,
+    add_string( SOUT_CFG_PREFIX "deblock", "0:0", FILTER_TEXT,
                  FILTER_LONGTEXT, false )
 
-    add_string( SOUT_CFG_PREFIX "psy-rd", "1.0:0.0", NULL, PSY_RD_TEXT,
+    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_string( SOUT_CFG_PREFIX "level", "0", NULL, LEVEL_TEXT,
+    add_string( SOUT_CFG_PREFIX "level", "0", LEVEL_TEXT,
                LEVEL_LONGTEXT, false )
 
-    add_string( SOUT_CFG_PREFIX "profile", "high", NULL, PROFILE_TEXT,
+    add_string( SOUT_CFG_PREFIX "profile", "high", PROFILE_TEXT,
                PROFILE_LONGTEXT, false )
         change_string_list( x264_profile_names, x264_profile_names, 0 );
 
@@ -489,7 +489,7 @@ vlc_module_begin ()
     add_integer( SOUT_CFG_PREFIX "slice-max-mbs", 0, NULL, SLICE_MAX_MBS, SLICE_MAX_MBS_LONGTEXT, false )
 
 #if X264_BUILD >= 89
-    add_string( SOUT_CFG_PREFIX "hrd", "none", NULL, HRD_TEXT, HRD_LONGTEXT, false )
+    add_string( SOUT_CFG_PREFIX "hrd", "none", HRD_TEXT, HRD_LONGTEXT, false )
         change_string_list( x264_nal_hrd_names, x264_nal_hrd_names, 0 );
 #endif
 
@@ -564,11 +564,11 @@ vlc_module_begin ()
 /* Analysis */
 
     /* x264 partitions = none (default). set at least "normal" mode. */
-    add_string( SOUT_CFG_PREFIX "partitions", "normal", NULL, ANALYSE_TEXT,
+    add_string( SOUT_CFG_PREFIX "partitions", "normal", ANALYSE_TEXT,
                 ANALYSE_LONGTEXT, false )
         change_string_list( enc_analyse_list, enc_analyse_list_text, 0 );
 
-    add_string( SOUT_CFG_PREFIX "direct", "spatial", NULL, DIRECT_PRED_TEXT,
+    add_string( SOUT_CFG_PREFIX "direct", "spatial", DIRECT_PRED_TEXT,
                 DIRECT_PRED_LONGTEXT, false )
         change_string_list( direct_pred_list, direct_pred_list_text, 0 );
 
@@ -583,7 +583,7 @@ vlc_module_begin ()
               WEIGHTP_LONGTEXT, false )
         change_integer_range( 0, 2 )
 
-    add_string( SOUT_CFG_PREFIX "me", "hex", NULL, ME_TEXT,
+    add_string( SOUT_CFG_PREFIX "me", "hex", ME_TEXT,
                 ME_LONGTEXT, false )
         change_string_list( enc_me_list, enc_me_list_text, 0 );
 
@@ -672,12 +672,12 @@ vlc_module_begin ()
     add_bool( SOUT_CFG_PREFIX "verbose", false, NULL, VERBOSE_TEXT,
               VERBOSE_LONGTEXT, false )
 
-    add_string( SOUT_CFG_PREFIX "stats", "x264_2pass.log", NULL, STATS_TEXT,
+    add_string( SOUT_CFG_PREFIX "stats", "x264_2pass.log", STATS_TEXT,
                 STATS_LONGTEXT, false )
 
-    add_string( SOUT_CFG_PREFIX "preset", NULL , NULL, PRESET_TEXT , PRESET_TEXT, false )
+    add_string( SOUT_CFG_PREFIX "preset", NULL , PRESET_TEXT , PRESET_TEXT, false )
         change_string_list( x264_preset_names, x264_preset_names, 0 );
-    add_string( SOUT_CFG_PREFIX "tune", NULL , NULL, TUNE_TEXT, TUNE_TEXT, false )
+    add_string( SOUT_CFG_PREFIX "tune", NULL , TUNE_TEXT, TUNE_TEXT, false )
         change_string_list( x264_tune_names, x264_tune_names, 0 );
 
 vlc_module_end ()

modules/control/gestures.c

@@ -102,7 +102,7 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_INTERFACE_CONTROL )
     add_integer( "gestures-threshold", 30, NULL,
                  THRESHOLD_TEXT, THRESHOLD_LONGTEXT, true )
-    add_string( "gestures-button", BUTTON_DEFAULT, NULL,
+    add_string( "gestures-button", BUTTON_DEFAULT,
                 BUTTON_TEXT, BUTTON_LONGTEXT, false )
         change_string_list( button_list, button_list_text, 0 )
     set_description( N_("Mouse gestures control interface") )

modules/control/http/http.c

@@ -70,18 +70,18 @@ vlc_module_begin ()
     set_description( N_("HTTP remote control interface") )
     set_category( CAT_INTERFACE )
     set_subcategory( SUBCAT_INTERFACE_MAIN )
-        add_string ( "http-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, true )
-        add_string ( "http-src",  NULL, NULL, SRC_TEXT,  SRC_LONGTEXT,  true )
+        add_string ( "http-host", NULL, HOST_TEXT, HOST_LONGTEXT, true )
+        add_string ( "http-src",  NULL, SRC_TEXT,  SRC_LONGTEXT,  true )
         add_obsolete_string ( "http-charset" )
 #if defined( HAVE_FORK ) || defined( WIN32 )
-        add_string ( "http-handlers", NULL, NULL, HANDLERS_TEXT, HANDLERS_LONGTEXT, true )
+        add_string ( "http-handlers", NULL, HANDLERS_TEXT, HANDLERS_LONGTEXT, true )
 #endif
         add_bool   ( "http-album-art", false, NULL, ART_TEXT, ART_LONGTEXT, true )
         set_section( N_("HTTP SSL" ), 0 )
-        add_string ( "http-intf-cert", NULL, NULL, CERT_TEXT, CERT_LONGTEXT, true )
-        add_string ( "http-intf-key",  NULL, NULL, KEY_TEXT,  KEY_LONGTEXT,  true )
-        add_string ( "http-intf-ca",   NULL, NULL, CA_TEXT,   CA_LONGTEXT,   true )
-        add_string ( "http-intf-crl",  NULL, NULL, CRL_TEXT,  CRL_LONGTEXT,  true )
+        add_string ( "http-intf-cert", NULL, CERT_TEXT, CERT_LONGTEXT, true )
+        add_string ( "http-intf-key",  NULL, KEY_TEXT,  KEY_LONGTEXT,  true )
+        add_string ( "http-intf-ca",   NULL, CA_TEXT,   CA_LONGTEXT,   true )
+        add_string ( "http-intf-crl",  NULL, CRL_TEXT,  CRL_LONGTEXT,  true )
     set_capability( "interface", 0 )
     set_callbacks( Open, Close )
     add_shortcut( "http" )

modules/control/lirc.c

@@ -62,7 +62,7 @@ vlc_module_begin ()
     set_capability( "interface", 0 )
     set_callbacks( Open, Close )
 
-    add_string( "lirc-file", NULL, NULL,
+    add_string( "lirc-file", NULL,
                 LIRC_TEXT, LIRC_LONGTEXT, true )
 vlc_module_end ()
 

modules/control/netsync.c

@@ -75,7 +75,7 @@ vlc_module_begin()
 
     add_bool("netsync-master", false, NULL,
               NETSYNC_TEXT, NETSYNC_LONGTEXT, true)
-    add_string("netsync-master-ip", NULL, NULL, MIP_TEXT, MIP_LONGTEXT,
+    add_string("netsync-master-ip", NULL, MIP_TEXT, MIP_LONGTEXT,
                 true)
     add_integer("netsync-timeout", 500, NULL,
                  NETSYNC_TIMEOUT_TEXT, NETSYNC_TIMEOUT_LONGTEXT, true)

modules/control/ntservice.c

@@ -70,11 +70,11 @@ vlc_module_begin ()
               INSTALL_TEXT, INSTALL_LONGTEXT, true )
     add_bool( "ntservice-uninstall", false, NULL,
               UNINSTALL_TEXT, UNINSTALL_LONGTEXT, true )
-    add_string ( "ntservice-name", VLCSERVICENAME, NULL,
+    add_string ( "ntservice-name", VLCSERVICENAME,
                  NAME_TEXT, NAME_LONGTEXT, true )
-    add_string ( "ntservice-options", NULL, NULL,
+    add_string ( "ntservice-options", NULL,
                  OPTIONS_TEXT, OPTIONS_LONGTEXT, true )
-    add_string ( "ntservice-extraintf", NULL, NULL,
+    add_string ( "ntservice-extraintf", NULL,
                  EXTRAINTF_TEXT, EXTRAINTF_LONGTEXT, true )
 
     set_capability( "interface", 0 )

modules/control/rc.c

@@ -194,9 +194,9 @@ vlc_module_begin ()
 #if defined (HAVE_ISATTY)
     add_bool( "rc-fake-tty", false, NULL, TTY_TEXT, TTY_LONGTEXT, true )
 #endif
-    add_string( "rc-unix", NULL, NULL, UNIX_TEXT, UNIX_LONGTEXT, true )
+    add_string( "rc-unix", NULL, UNIX_TEXT, UNIX_LONGTEXT, true )
 #endif
-    add_string( "rc-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, true )
+    add_string( "rc-host", NULL, HOST_TEXT, HOST_LONGTEXT, true )
 
     set_capability( "interface", 20 )
 

modules/demux/avformat/avformat.c

@@ -48,7 +48,7 @@ vlc_module_begin ()
     add_shortcut( "ffmpeg" )
     set_description( N_("FFmpeg muxer" ) )
     set_capability( "sout mux", 2 )
-    add_string( "ffmpeg-mux", NULL, NULL, MUX_TEXT,
+    add_string( "ffmpeg-mux", NULL, MUX_TEXT,
                 MUX_LONGTEXT, true )
     set_callbacks( OpenMux, CloseMux )
 #endif

modules/demux/image.c

@@ -81,11 +81,11 @@ vlc_module_begin()
         change_safe()
     add_bool("image-decode", true, NULL, DECODE_TEXT, DECODE_LONGTEXT, true)
         change_safe()
-    add_string("image-chroma", "", NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true)
+    add_string("image-chroma", "", CHROMA_TEXT, CHROMA_LONGTEXT, true)
         change_safe()
     add_float("image-duration", 10, NULL, DURATION_TEXT, DURATION_LONGTEXT, true)
         change_safe()
-    add_string("image-fps", "10/1", NULL, FPS_TEXT, FPS_LONGTEXT, true)
+    add_string("image-fps", "10/1", FPS_TEXT, FPS_LONGTEXT, true)
         change_safe()
     add_bool("image-realtime", false, NULL, RT_TEXT, RT_LONGTEXT, true)
         change_safe()

modules/demux/live555.cpp

@@ -137,7 +137,7 @@ vlc_module_begin ()
         add_bool(   "rtsp-wmserver", false, NULL, WMSERVER_TEXT,
                     WMSERVER_LONGTEXT, true)
             change_safe()
-        add_string( "rtsp-user", NULL, NULL, USER_TEXT,
+        add_string( "rtsp-user", NULL, USER_TEXT,
                     USER_LONGTEXT, true )
             change_safe()
         add_password( "rtsp-pwd", NULL, NULL, PASS_TEXT,

modules/demux/rawaud.c

@@ -69,9 +69,9 @@ vlc_module_begin();
     add_shortcut( "rawaud" );
     add_integer( "rawaud-channels", 2, NULL, CHANNELS_TEXT, CHANNELS_LONGTEXT, false );
     add_integer( "rawaud-samplerate", 48000, NULL, SAMPLERATE_TEXT, SAMPLERATE_LONGTEXT, false );
-    add_string( "rawaud-fourcc", FOURCC_DEFAULT, NULL,
+    add_string( "rawaud-fourcc", FOURCC_DEFAULT,
                 FOURCC_TEXT, FOURCC_LONGTEXT, false );
-    add_string( "rawaud-lang", "eng", NULL, LANG_TEXT, LANG_LONGTEXT, false);
+    add_string( "rawaud-lang", "eng", LANG_TEXT, LANG_LONGTEXT, false);
 vlc_module_end();
 
 /*****************************************************************************

modules/demux/rawvid.c

@@ -68,12 +68,12 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_INPUT_DEMUX )
     set_callbacks( Open, Close )
     add_shortcut( "rawvideo" )
-    add_string( "rawvid-fps", NULL, NULL, FPS_TEXT, FPS_LONGTEXT, false )
+    add_string( "rawvid-fps", NULL, FPS_TEXT, FPS_LONGTEXT, false )
     add_integer( "rawvid-width", 0, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, 0 )
     add_integer( "rawvid-height", 0, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, 0 )
-    add_string( "rawvid-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT,
+    add_string( "rawvid-chroma", NULL, CHROMA_TEXT, CHROMA_LONGTEXT,
                 true )
-    add_string( "rawvid-aspect-ratio", NULL, NULL,
+    add_string( "rawvid-aspect-ratio", NULL,
                 ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, true )
 vlc_module_end ()
 

modules/demux/subtitle.c

@@ -81,10 +81,10 @@ vlc_module_begin ()
     add_integer( "sub-delay", 0, NULL,
                N_("Subtitles delay"),
                SUB_DELAY_LONGTEXT, true )
-    add_string( "sub-type", "auto", NULL, N_("Subtitles format"),
+    add_string( "sub-type", "auto", N_("Subtitles format"),
                 SUB_TYPE_LONGTEXT, true )
         change_string_list( ppsz_sub_type, NULL, NULL )
-    add_string( "sub-description", NULL, NULL, N_("Subtitles description"),
+    add_string( "sub-description", NULL, N_("Subtitles description"),
                 SUB_DESCRIPTION_LONGTEXT, true )
     set_callbacks( Open, Close )
 

modules/demux/ts.c

@@ -166,13 +166,13 @@ vlc_module_begin ()
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_DEMUX )
 
-    add_string( "ts-extra-pmt", NULL, NULL, PMT_TEXT, PMT_LONGTEXT, true )
+    add_string( "ts-extra-pmt", NULL, PMT_TEXT, PMT_LONGTEXT, true )
     add_bool( "ts-es-id-pid", true, NULL, PID_TEXT, PID_LONGTEXT, true )
-    add_string( "ts-out", NULL, NULL, TSOUT_TEXT, TSOUT_LONGTEXT, true )
+    add_string( "ts-out", NULL, TSOUT_TEXT, TSOUT_LONGTEXT, true )
     add_integer( "ts-out-mtu", 1400, NULL, MTUOUT_TEXT,
                  MTUOUT_LONGTEXT, true )
-    add_string( "ts-csa-ck", NULL, NULL, CSA_TEXT, CSA_LONGTEXT, true )
-    add_string( "ts-csa2-ck", NULL, NULL, CSA_TEXT, CSA_LONGTEXT, true )
+    add_string( "ts-csa-ck", NULL, CSA_TEXT, CSA_LONGTEXT, true )
+    add_string( "ts-csa2-ck", NULL, CSA_TEXT, CSA_LONGTEXT, true )
     add_integer( "ts-csa-pkt", 188, NULL, CPKT_TEXT, CPKT_LONGTEXT, true )
     add_bool( "ts-silent", false, NULL, SILENT_TEXT, SILENT_LONGTEXT, true )
 

modules/gui/fbosd.c

@@ -182,12 +182,12 @@ vlc_module_begin ()
 
     add_loadfile( "fbosd-dev", "/dev/fb0", NULL, DEVICE_TEXT, DEVICE_LONGTEXT,
                   false )
-    add_string( "fbosd-aspect-ratio", "", NULL, ASPECT_RATIO_TEXT,
+    add_string( "fbosd-aspect-ratio", "", ASPECT_RATIO_TEXT,
                 ASPECT_RATIO_LONGTEXT, true )
 
-    add_string( "fbosd-image", NULL, NULL, FBOSD_IMAGE_TEXT,
+    add_string( "fbosd-image", NULL, FBOSD_IMAGE_TEXT,
                 FBOSD_IMAGE_LONGTEXT, true )
-    add_string( "fbosd-text", NULL, NULL, FBOSD_TEXT,
+    add_string( "fbosd-text", NULL, FBOSD_TEXT,
                 FBOSD_LONGTEXT, true )
 
     add_integer_with_range( "fbosd-alpha", 255, 0, 255, NULL, ALPHA_TEXT,

modules/gui/qt4/qt4.cpp

@@ -208,7 +208,7 @@ vlc_module_begin ()
                QT_NATIVEOPEN_TEXT, false )
     add_bool( "qt-recentplay", true, NULL, RECENTPLAY_TEXT,
               RECENTPLAY_TEXT, false )
-    add_string( "qt-recentplay-filter", "", NULL,
+    add_string( "qt-recentplay-filter", "",
                 RECENTPLAY_FILTER_TEXT, RECENTPLAY_FILTER_LONGTEXT, false )
 
     add_bool( "qt-adv-options", false, NULL, ADVANCED_OPTIONS_TEXT,
@@ -223,9 +223,8 @@ vlc_module_begin ()
     add_integer( "qt-updates-days", 7, NULL, UPDATER_DAYS_TEXT,
                  UPDATER_DAYS_TEXT, false )
 #endif
-    add_string( "qt-slider-colours",
-                "255;255;255;20;210;20;255;199;15;245;39;29",
-                NULL, SLIDERCOL_TEXT, SLIDERCOL_LONGTEXT, false )
+    add_string( "qt-slider-colours", "255;255;255;20;210;20;255;199;15;245;39;29",
+                SLIDERCOL_TEXT, SLIDERCOL_LONGTEXT, false )
 
     add_bool( "qt-privacy-ask", true, NULL, PRIVACY_TEXT, PRIVACY_TEXT,
               false )

modules/gui/skins2/src/skin_main.cpp

@@ -481,7 +481,7 @@ vlc_module_begin ()
     add_loadfile( "skins2-last", "", NULL, SKINS2_LAST, SKINS2_LAST_LONG,
                   true )
         change_autosave ()
-    add_string( "skins2-config", "", NULL, SKINS2_CONFIG, SKINS2_CONFIG_LONG,
+    add_string( "skins2-config", "", SKINS2_CONFIG, SKINS2_CONFIG_LONG,
                 true )
         change_autosave ()
         change_private ()

modules/misc/audioscrobbler.c

@@ -162,11 +162,11 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_INTERFACE_CONTROL )
     set_shortname( N_( "Audioscrobbler" ) )
     set_description( N_("Submission of played songs to last.fm") )
-    add_string( "lastfm-username", "", NULL,
+    add_string( "lastfm-username", "",
                 USERNAME_TEXT, USERNAME_LONGTEXT, false )
     add_password( "lastfm-password", "", NULL,
                 PASSWORD_TEXT, PASSWORD_LONGTEXT, false )
-    add_string( "scrobbler-url", "post.audioscrobbler.com", NULL,
+    add_string( "scrobbler-url", "post.audioscrobbler.com",
                 URL_TEXT, URL_LONGTEXT, false )
     set_capability( "interface", 0 )
     set_callbacks( Open, Close )

modules/misc/dummy/dummy.c

@@ -104,7 +104,7 @@ vlc_module_begin ()
         set_category( CAT_VIDEO )
         set_subcategory( SUBCAT_VIDEO_VOUT )
         add_category_hint( N_("Video"), NULL, false )
-        add_string( "dummy-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true )
+        add_string( "dummy-chroma", NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true )
     add_submodule ()
         set_section( N_( "Stats video output" ), NULL )
         set_description( N_("Stats video output function") )

modules/misc/logger.c

@@ -167,11 +167,11 @@ vlc_module_begin ()
 
     add_savefile( "logfile", NULL, NULL,
              N_("Log filename"), N_("Specify the log filename."), false )
-    add_string( "logmode", "text", NULL, LOGMODE_TEXT, LOGMODE_LONGTEXT,
+    add_string( "logmode", "text", LOGMODE_TEXT, LOGMODE_LONGTEXT,
                 false )
         change_string_list( mode_list, mode_list_text, 0 )
 #ifdef HAVE_SYSLOG_H
-    add_string( "syslog-facility", fac_name[0], NULL, SYSLOG_FACILITY_TEXT,
+    add_string( "syslog-facility", fac_name[0], SYSLOG_FACILITY_TEXT,
                 SYSLOG_FACILITY_LONGTEXT, true )
         change_string_list( fac_name, fac_name, 0 )
 #endif

modules/misc/lua/vlc.c

@@ -101,18 +101,18 @@ vlc_module_begin ()
         set_capability( "interface", 0 )
         set_category( CAT_INTERFACE )
         set_subcategory( SUBCAT_INTERFACE_CONTROL )
-        add_string( "lua-intf", "dummy", NULL,
+        add_string( "lua-intf", "dummy",
                     INTF_TEXT, INTF_LONGTEXT, false )
-        add_string( "lua-config", "", NULL,
+        add_string( "lua-config", "",
                     CONFIG_TEXT, CONFIG_LONGTEXT, false )
         set_section( N_("Lua HTTP"), 0 )
-            add_string ( "http-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, true )
-            add_string ( "http-src",  NULL, NULL, SRC_TEXT,  SRC_LONGTEXT,  true )
+            add_string ( "http-host", NULL, HOST_TEXT, HOST_LONGTEXT, true )
+            add_string ( "http-src",  NULL, SRC_TEXT,  SRC_LONGTEXT,  true )
             add_bool   ( "http-index", false, NULL, INDEX_TEXT, INDEX_LONGTEXT, true )
         set_section( N_("Lua RC"), 0 )
-            add_string( "rc-host", NULL, NULL, RCHOST_TEXT, RCHOST_LONGTEXT, true )
+            add_string( "rc-host", NULL, RCHOST_TEXT, RCHOST_LONGTEXT, true )
         set_section( N_("Lua Telnet"), 0 )
-            add_string( "telnet-host", "localhost", NULL, TELNETHOST_TEXT,
+            add_string( "telnet-host", "localhost", TELNETHOST_TEXT,
                         TELNETHOST_LONGTEXT, true )
             add_integer( "telnet-port", TELNETPORT_DEFAULT, NULL, TELNETPORT_TEXT,
                          TELNETPORT_LONGTEXT, true )
@@ -163,9 +163,9 @@ vlc_module_begin ()
         set_description( N_("Lua SD Module") )
         add_shortcut( "luasd" )
         set_capability( "services_discovery", 0 )
-        add_string( "lua-sd", "", NULL, NULL, NULL, false )
+        add_string( "lua-sd", "", NULL, NULL, false )
             change_volatile()
-        add_string( "lua-longname", "", NULL, NULL, NULL, false )
+        add_string( "lua-longname", "", NULL, NULL, false )
             change_volatile()
         set_callbacks( Open_LuaSD, Close_LuaSD )
 

modules/misc/notify/growl_udp.c

@@ -81,7 +81,7 @@ vlc_module_begin ()
     set_shortname( "Growl-UDP" )
     set_description( N_("Growl UDP Notification Plugin") )
 
-    add_string( "growl-server", SERVER_DEFAULT, NULL,
+    add_string( "growl-server", SERVER_DEFAULT,
                 SERVER_TEXT, SERVER_LONGTEXT, false )
     add_password( "growl-password", PASS_DEFAULT, NULL,
                 PASS_TEXT, PASS_LONGTEXT, false )

modules/misc/notify/msn.c

@@ -75,7 +75,7 @@ vlc_module_begin ()
     set_shortname( "MSN" )
     set_description( N_("MSN Now-Playing") )
 
-    add_string( "msn-format", FORMAT_DEFAULT, NULL,
+    add_string( "msn-format", FORMAT_DEFAULT,
                 FORMAT_TEXT, FORMAT_LONGTEXT, false )
 
     set_capability( "interface", 0 )

modules/misc/notify/telepathy.c

@@ -80,7 +80,7 @@ vlc_module_begin ()
     set_shortname( "Telepathy" )
     set_description( N_("Telepathy \"Now Playing\" (MissionControl)") )
 
-    add_string( "telepathy-format", FORMAT_DEFAULT, NULL,
+    add_string( "telepathy-format", FORMAT_DEFAULT,
                 FORMAT_TEXT, FORMAT_LONGTEXT, false )
 
     set_capability( "interface", 0 )

modules/misc/notify/xosd.c

@@ -91,11 +91,10 @@ vlc_module_begin ()
     add_integer( "xosd-text-offset", 30, NULL, TXT_OFS_TEXT, TXT_OFS_LONGTEXT, true )
     add_integer( "xosd-shadow-offset", 2, NULL,
                  SHD_OFS_TEXT, SHD_OFS_LONGTEXT, true )
-    add_string( "xosd-font",
-                "-adobe-helvetica-bold-r-normal-*-*-160-*-*-p-*-iso8859-1",
-                NULL, FONT_TEXT, FONT_LONGTEXT, true )
-    add_string( "xosd-colour", "LawnGreen",
-                    NULL, COLOUR_TEXT, COLOUR_LONGTEXT, true )
+    add_string( "xosd-font", "-adobe-helvetica-bold-r-normal-*-*-160-*-*-p-*-iso8859-1", NULL,
+                FONT_TEXT, FONT_LONGTEXT, true )
+    add_string( "xosd-colour", "LawnGreen", NULL,
+                COLOUR_TEXT, COLOUR_LONGTEXT, true )
     set_capability( "interface", 10 )
     set_callbacks( Open, Close )
 vlc_module_end ()

modules/misc/quartztext.c

@@ -109,7 +109,7 @@ vlc_module_begin ()
     set_category( CAT_VIDEO )
     set_subcategory( SUBCAT_VIDEO_SUBPIC )
 
-    add_string( "quartztext-font", DEFAULT_FONT, NULL, FONT_TEXT, FONT_LONGTEXT,
+    add_string( "quartztext-font", DEFAULT_FONT, FONT_TEXT, FONT_LONGTEXT,
               false )
     add_integer( "quartztext-rel-fontsize", DEFAULT_REL_FONT_SIZE, NULL, FONTSIZER_TEXT,
                  FONTSIZER_LONGTEXT, false )

modules/misc/rtsp.c

@@ -86,8 +86,8 @@ vlc_module_begin ()
     set_capability( "vod server", 1 )
     set_callbacks( Open, Close )
     add_shortcut( "rtsp" )
-    add_string ( "rtsp-host", NULL, NULL, HOST_TEXT, HOST_LONGTEXT, true )
-    add_string( "rtsp-raw-mux", "ts", NULL, RAWMUX_TEXT,
+    add_string ( "rtsp-host", NULL, HOST_TEXT, HOST_LONGTEXT, true )
+    add_string( "rtsp-raw-mux", "ts", RAWMUX_TEXT,
                 RAWMUX_TEXT, true )
     add_integer( "rtsp-throttle-users", 0, NULL, THROTTLE_TEXT,
                  THROTTLE_LONGTEXT, true )

modules/misc/svg.c

@@ -74,7 +74,7 @@ vlc_module_begin ()
     set_category( SUBCAT_INPUT_SCODEC )
     set_capability( "text renderer", 99 )
     add_shortcut( "svg" )
-    add_string( "svg-template-file", "", NULL, TEMPLATE_TEXT, TEMPLATE_LONGTEXT, true )
+    add_string( "svg-template-file", "", TEMPLATE_TEXT, TEMPLATE_LONGTEXT, true )
     set_callbacks( Create, Destroy )
 vlc_module_end ()
 

modules/mux/asf.c

@@ -79,15 +79,15 @@ vlc_module_begin ()
     add_shortcut( "asf", "asfh" )
     set_callbacks( Open, Close )
 
-    add_string( SOUT_CFG_PREFIX "title", "", NULL, TITLE_TEXT, TITLE_LONGTEXT,
+    add_string( SOUT_CFG_PREFIX "title", "", TITLE_TEXT, TITLE_LONGTEXT,
                                  true )
-    add_string( SOUT_CFG_PREFIX "author",   "", NULL, AUTHOR_TEXT,
+    add_string( SOUT_CFG_PREFIX "author",   "", AUTHOR_TEXT,
                                  AUTHOR_LONGTEXT, true )
-    add_string( SOUT_CFG_PREFIX "copyright","", NULL, COPYRIGHT_TEXT,
+    add_string( SOUT_CFG_PREFIX "copyright","", COPYRIGHT_TEXT,
                                  COPYRIGHT_LONGTEXT, true )
-    add_string( SOUT_CFG_PREFIX "comment",  "", NULL, COMMENT_TEXT,
+    add_string( SOUT_CFG_PREFIX "comment",  "", COMMENT_TEXT,
                                  COMMENT_LONGTEXT, true )
-    add_string( SOUT_CFG_PREFIX "rating",  "", NULL, RATING_TEXT,
+    add_string( SOUT_CFG_PREFIX "rating",  "", RATING_TEXT,
                                  RATING_LONGTEXT, true )
     add_integer( SOUT_CFG_PREFIX "packet-size", 4096, NULL, PACKETSIZE_TEXT,
                                  PACKETSIZE_LONGTEXT, true )

modules/mux/mpeg/ts.c

@@ -208,13 +208,13 @@ vlc_module_begin ()
     add_integer( SOUT_CFG_PREFIX "netid", 0, NULL, NETID_TEXT,
                  NETID_LONGTEXT, true )
 #endif
-    add_string( SOUT_CFG_PREFIX "program-pmt", NULL, NULL, PMTPROG_TEXT,
+    add_string( SOUT_CFG_PREFIX "program-pmt", NULL, PMTPROG_TEXT,
                 PMTPROG_LONGTEXT, true )
     add_bool( SOUT_CFG_PREFIX "es-id-pid", false, NULL, PID_TEXT, PID_LONGTEXT,
               true )
-    add_string( SOUT_CFG_PREFIX "muxpmt", NULL, NULL, MUXPMT_TEXT, MUXPMT_LONGTEXT, true )
+    add_string( SOUT_CFG_PREFIX "muxpmt", NULL, MUXPMT_TEXT, MUXPMT_LONGTEXT, true )
 #ifdef HAVE_DVBPSI_SDT
-    add_string( SOUT_CFG_PREFIX "sdtdesc", NULL, NULL, SDTDESC_TEXT, SDTDESC_LONGTEXT, true )
+    add_string( SOUT_CFG_PREFIX "sdtdesc", NULL, SDTDESC_TEXT, SDTDESC_LONGTEXT, true )
 #endif
     add_bool( SOUT_CFG_PREFIX "alignment", true, NULL, ALIGNMENT_TEXT,
               ALIGNMENT_LONGTEXT, true )
@@ -238,11 +238,11 @@ vlc_module_begin ()
     add_bool( SOUT_CFG_PREFIX "crypt-video", true, NULL, VCRYPT_TEXT,
               VCRYPT_LONGTEXT, true )
 
-    add_string( SOUT_CFG_PREFIX "csa-ck", NULL, NULL, CK_TEXT, CK_LONGTEXT,
+    add_string( SOUT_CFG_PREFIX "csa-ck", NULL, CK_TEXT, CK_LONGTEXT,
                 true )
-    add_string( SOUT_CFG_PREFIX "csa2-ck", NULL, NULL, CK2_TEXT, CK2_LONGTEXT,
+    add_string( SOUT_CFG_PREFIX "csa2-ck", NULL, CK2_TEXT, CK2_LONGTEXT,
                 true )
-    add_string( SOUT_CFG_PREFIX "csa-use", "1", NULL, CU_TEXT, CU_LONGTEXT,
+    add_string( SOUT_CFG_PREFIX "csa-use", "1", CU_TEXT, CU_LONGTEXT,
                 true )
     add_integer( SOUT_CFG_PREFIX "csa-pkt", 188, NULL, CPKT_TEXT, CPKT_LONGTEXT, true )
 

modules/services_discovery/podcast.c

@@ -64,7 +64,7 @@ vlc_module_begin ()
     set_category( CAT_PLAYLIST )
     set_subcategory( SUBCAT_PLAYLIST_SD )
 
-    add_string( "podcast-urls", NULL, NULL,
+    add_string( "podcast-urls", NULL,
                 URLS_TEXT, URLS_LONGTEXT, false )
         change_autosave ()
 

modules/services_discovery/sap.c

@@ -122,7 +122,7 @@ vlc_module_begin ()
     set_category( CAT_PLAYLIST )
     set_subcategory( SUBCAT_PLAYLIST_SD )
 
-    add_string( "sap-addr", NULL, NULL,
+    add_string( "sap-addr", NULL,
                 SAP_ADDR_TEXT, SAP_ADDR_LONGTEXT, true )
     add_bool( "sap-ipv4", true, NULL,
                SAP_IPV4_TEXT,SAP_IPV4_LONGTEXT, true )

modules/stream_out/bridge.c

@@ -100,7 +100,7 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_SOUT_STREAM )*/
     add_integer( SOUT_CFG_PREFIX_OUT "id", 0, NULL, ID_TEXT, ID_LONGTEXT,
                  false )
-    add_string( SOUT_CFG_PREFIX_OUT "in-name", "default", NULL,
+    add_string( SOUT_CFG_PREFIX_OUT "in-name", "default",
                 DEST_TEXT, DEST_LONGTEXT, false )
     set_callbacks( OpenOut, CloseOut )
 
@@ -114,7 +114,7 @@ vlc_module_begin ()
                  DELAY_LONGTEXT, false )
     add_integer( SOUT_CFG_PREFIX_IN "id-offset", 8192, NULL, ID_OFFSET_TEXT,
                  ID_OFFSET_LONGTEXT, false )
-    add_string( SOUT_CFG_PREFIX_IN "name", "default", NULL,
+    add_string( SOUT_CFG_PREFIX_IN "name", "default",
                 NAME_TEXT, NAME_LONGTEXT, false )
     add_bool( SOUT_CFG_PREFIX_IN "placeholder", false, NULL,
               PLACEHOLDER_TEXT, PLACEHOLDER_LONGTEXT, false )

modules/stream_out/es.c

@@ -83,27 +83,27 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_SOUT_STREAM )
 
     set_section( N_("Generic"), NULL )
-    add_string( SOUT_CFG_PREFIX "access", "", NULL, ACCESS_TEXT,
+    add_string( SOUT_CFG_PREFIX "access", "", ACCESS_TEXT,
                 ACCESS_LONGTEXT, true )
-    add_string( SOUT_CFG_PREFIX "mux", "", NULL, MUX_TEXT,
+    add_string( SOUT_CFG_PREFIX "mux", "", MUX_TEXT,
                 MUX_LONGTEXT, true )
-    add_string( SOUT_CFG_PREFIX "dst", "", NULL, DEST_TEXT,
+    add_string( SOUT_CFG_PREFIX "dst", "", DEST_TEXT,
                 DEST_LONGTEXT, true )
 
     set_section( N_("Audio"), NULL )
-    add_string( SOUT_CFG_PREFIX "access-audio", "", NULL, ACCESSA_TEXT,
+    add_string( SOUT_CFG_PREFIX "access-audio", "", ACCESSA_TEXT,
                 ACCESSA_LONGTEXT, true )
-    add_string( SOUT_CFG_PREFIX "mux-audio", "", NULL, MUXA_TEXT,
+    add_string( SOUT_CFG_PREFIX "mux-audio", "", MUXA_TEXT,
                 MUXA_LONGTEXT, true )
-    add_string( SOUT_CFG_PREFIX "dst-audio", "", NULL, DESTA_TEXT,
+    add_string( SOUT_CFG_PREFIX "dst-audio", "", DESTA_TEXT,
                 DESTA_LONGTEXT, true )
 
     set_section( N_("Video"), NULL )
-    add_string( SOUT_CFG_PREFIX "access-video", "", NULL, ACCESSV_TEXT,
+    add_string( SOUT_CFG_PREFIX "access-video", "", ACCESSV_TEXT,
                 ACCESSV_LONGTEXT, true )
-    add_string( SOUT_CFG_PREFIX "mux-video", "", NULL, MUXV_TEXT,
+    add_string( SOUT_CFG_PREFIX "mux-video", "", MUXV_TEXT,
                 MUXV_LONGTEXT, true )
-    add_string( SOUT_CFG_PREFIX "dst-video", "", NULL, DESTV_TEXT,
+    add_string( SOUT_CFG_PREFIX "dst-video", "", DESTV_TEXT,
                 DESTV_LONGTEXT, true )
 
     set_callbacks( Open, Close )

modules/stream_out/mosaic_bridge.c

@@ -146,15 +146,15 @@ vlc_module_begin ()
     set_capability( "sout stream", 0 )
     add_shortcut( "mosaic-bridge" )
 
-    add_string( CFG_PREFIX "id", "Id", NULL, ID_TEXT, ID_LONGTEXT,
+    add_string( CFG_PREFIX "id", "Id", ID_TEXT, ID_LONGTEXT,
                 false )
     add_integer( CFG_PREFIX "width", 0, NULL, WIDTH_TEXT,
                  WIDTH_LONGTEXT, true )
     add_integer( CFG_PREFIX "height", 0, NULL, HEIGHT_TEXT,
                  HEIGHT_LONGTEXT, true )
-    add_string( CFG_PREFIX "sar", "1:1", NULL, RATIO_TEXT,
+    add_string( CFG_PREFIX "sar", "1:1", RATIO_TEXT,
                 RATIO_LONGTEXT, false )
-    add_string( CFG_PREFIX "chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT,
+    add_string( CFG_PREFIX "chroma", NULL, CHROMA_TEXT, CHROMA_LONGTEXT,
                 false )
 
     add_module_list( CFG_PREFIX "vfilter", "video filter2",

modules/stream_out/raop.c

@@ -164,7 +164,7 @@ vlc_module_begin();
     add_shortcut( "raop" )
     set_category( CAT_SOUT )
     set_subcategory( SUBCAT_SOUT_STREAM )
-    add_string( SOUT_CFG_PREFIX "host", "", NULL,
+    add_string( SOUT_CFG_PREFIX "host", "",
                 HOST_TEXT, HOST_LONGTEXT, false )
     add_password( SOUT_CFG_PREFIX "password", NULL, NULL,
                   PASSWORD_TEXT, PASSWORD_LONGTEXT, false )

modules/stream_out/record.c

@@ -62,7 +62,7 @@ vlc_module_begin ()
     set_category( CAT_SOUT )
     set_subcategory( SUBCAT_SOUT_STREAM )
 
-    add_string( SOUT_CFG_PREFIX "dst-prefix", "", NULL, DST_PREFIX_TEXT,
+    add_string( SOUT_CFG_PREFIX "dst-prefix", "", DST_PREFIX_TEXT,
                 DST_PREFIX_LONGTEXT, true )
 
     set_callbacks( Open, Close )

modules/stream_out/rtp.c

@@ -174,27 +174,27 @@ vlc_module_begin ()
     set_category( CAT_SOUT )
     set_subcategory( SUBCAT_SOUT_STREAM )
 
-    add_string( SOUT_CFG_PREFIX "dst", "", NULL, DEST_TEXT,
+    add_string( SOUT_CFG_PREFIX "dst", "", DEST_TEXT,
                 DEST_LONGTEXT, true )
-    add_string( SOUT_CFG_PREFIX "sdp", "", NULL, SDP_TEXT,
+    add_string( SOUT_CFG_PREFIX "sdp", "", SDP_TEXT,
                 SDP_LONGTEXT, true )
-    add_string( SOUT_CFG_PREFIX "mux", "", NULL, MUX_TEXT,
+    add_string( SOUT_CFG_PREFIX "mux", "", MUX_TEXT,
                 MUX_LONGTEXT, true )
     add_bool( SOUT_CFG_PREFIX "sap", false, NULL, SAP_TEXT, SAP_LONGTEXT,
               true )
 
-    add_string( SOUT_CFG_PREFIX "name", "", NULL, NAME_TEXT,
+    add_string( SOUT_CFG_PREFIX "name", "", NAME_TEXT,
                 NAME_LONGTEXT, true )
-    add_string( SOUT_CFG_PREFIX "description", "", NULL, DESC_TEXT,
+    add_string( SOUT_CFG_PREFIX "description", "", DESC_TEXT,
                 DESC_LONGTEXT, true )
-    add_string( SOUT_CFG_PREFIX "url", "", NULL, URL_TEXT,
+    add_string( SOUT_CFG_PREFIX "url", "", URL_TEXT,
                 URL_LONGTEXT, true )
-    add_string( SOUT_CFG_PREFIX "email", "", NULL, EMAIL_TEXT,
+    add_string( SOUT_CFG_PREFIX "email", "", EMAIL_TEXT,
                 EMAIL_LONGTEXT, true )
-    add_string( SOUT_CFG_PREFIX "phone", "", NULL, PHONE_TEXT,
+    add_string( SOUT_CFG_PREFIX "phone", "", PHONE_TEXT,
                 PHONE_LONGTEXT, true )
 
-    add_string( SOUT_CFG_PREFIX "proto", "udp", NULL, PROTO_TEXT,
+    add_string( SOUT_CFG_PREFIX "proto", "udp", PROTO_TEXT,
                 PROTO_LONGTEXT, false )
         change_string_list( ppsz_protos, ppsz_protocols, NULL )
     add_integer( SOUT_CFG_PREFIX "port", 5004, NULL, PORT_TEXT,
@@ -212,9 +212,9 @@ vlc_module_begin ()
                  CACHING_TEXT, CACHING_LONGTEXT, true )
 
 #ifdef HAVE_SRTP
-    add_string( SOUT_CFG_PREFIX "key", "", NULL,
+    add_string( SOUT_CFG_PREFIX "key", "",
                 SRTP_KEY_TEXT, SRTP_KEY_LONGTEXT, false )
-    add_string( SOUT_CFG_PREFIX "salt", "", NULL,
+    add_string( SOUT_CFG_PREFIX "salt", "",
                 SRTP_SALT_TEXT, SRTP_SALT_LONGTEXT, false )
 #endif
 

modules/stream_out/smem.c

@@ -98,17 +98,17 @@ vlc_module_begin ()
     add_shortcut( "smem" )
     set_category( CAT_SOUT )
     set_subcategory( SUBCAT_SOUT_STREAM )
-    add_string( SOUT_PREFIX_VIDEO "prerender-callback", "0", NULL, T_VIDEO_PRERENDER_CALLBACK, LT_VIDEO_PRERENDER_CALLBACK, true )
+    add_string( SOUT_PREFIX_VIDEO "prerender-callback", "0", T_VIDEO_PRERENDER_CALLBACK, LT_VIDEO_PRERENDER_CALLBACK, true )
         change_volatile()
-    add_string( SOUT_PREFIX_AUDIO "prerender-callback", "0", NULL, T_AUDIO_PRERENDER_CALLBACK, LT_AUDIO_PRERENDER_CALLBACK, true )
+    add_string( SOUT_PREFIX_AUDIO "prerender-callback", "0", T_AUDIO_PRERENDER_CALLBACK, LT_AUDIO_PRERENDER_CALLBACK, true )
         change_volatile()
-    add_string( SOUT_PREFIX_VIDEO "postrender-callback", "0", NULL, T_VIDEO_POSTRENDER_CALLBACK, LT_VIDEO_POSTRENDER_CALLBACK, true )
+    add_string( SOUT_PREFIX_VIDEO "postrender-callback", "0", T_VIDEO_POSTRENDER_CALLBACK, LT_VIDEO_POSTRENDER_CALLBACK, true )
         change_volatile()
-    add_string( SOUT_PREFIX_AUDIO "postrender-callback", "0", NULL, T_AUDIO_POSTRENDER_CALLBACK, LT_AUDIO_POSTRENDER_CALLBACK, true )
+    add_string( SOUT_PREFIX_AUDIO "postrender-callback", "0", T_AUDIO_POSTRENDER_CALLBACK, LT_AUDIO_POSTRENDER_CALLBACK, true )
         change_volatile()
-    add_string( SOUT_PREFIX_VIDEO "data", "0", NULL, T_VIDEO_DATA, LT_VIDEO_DATA, true )
+    add_string( SOUT_PREFIX_VIDEO "data", "0", T_VIDEO_DATA, LT_VIDEO_DATA, true )
         change_volatile()
-    add_string( SOUT_PREFIX_AUDIO "data", "0", NULL, T_AUDIO_DATA, LT_VIDEO_DATA, true )
+    add_string( SOUT_PREFIX_AUDIO "data", "0", T_AUDIO_DATA, LT_VIDEO_DATA, true )
         change_volatile()
     add_bool( SOUT_CFG_PREFIX "time-sync", true, NULL, T_TIME_SYNC, LT_TIME_SYNC, true )
         change_private()

modules/stream_out/standard.c

@@ -104,30 +104,30 @@ vlc_module_begin ()
     set_category( CAT_SOUT )
     set_subcategory( SUBCAT_SOUT_STREAM )
 
-    add_string( SOUT_CFG_PREFIX "access", "", NULL, ACCESS_TEXT,
+    add_string( SOUT_CFG_PREFIX "access", "", ACCESS_TEXT,
                 ACCESS_LONGTEXT, false )
-    add_string( SOUT_CFG_PREFIX "mux", "", NULL, MUX_TEXT,
+    add_string( SOUT_CFG_PREFIX "mux", "", MUX_TEXT,
                 MUX_LONGTEXT, false )
-    add_string( SOUT_CFG_PREFIX "dst", "", NULL, DEST_TEXT,
+    add_string( SOUT_CFG_PREFIX "dst", "", DEST_TEXT,
                 DEST_LONGTEXT, false )
-    add_string( SOUT_CFG_PREFIX "bind", "", NULL, BIND_TEXT,
+    add_string( SOUT_CFG_PREFIX "bind", "", BIND_TEXT,
                 BIND_LONGTEXT, false )
-    add_string( SOUT_CFG_PREFIX "path", "", NULL, PATH_TEXT,
+    add_string( SOUT_CFG_PREFIX "path", "", PATH_TEXT,
                 PATH_LONGTEXT, false )
 
     add_bool( SOUT_CFG_PREFIX "sap", false, NULL, SAP_TEXT, SAP_LONGTEXT,
               true )
-    add_string( SOUT_CFG_PREFIX "name", "", NULL, NAME_TEXT, NAME_LONGTEXT,
+    add_string( SOUT_CFG_PREFIX "name", "", NAME_TEXT, NAME_LONGTEXT,
                                         true )
-    add_string( SOUT_CFG_PREFIX "group", "", NULL, GROUP_TEXT, GROUP_LONGTEXT,
+    add_string( SOUT_CFG_PREFIX "group", "", GROUP_TEXT, GROUP_LONGTEXT,
                                         true )
-    add_string( SOUT_CFG_PREFIX "description", "", NULL, DESC_TEXT, DESC_LONGTEXT,
+    add_string( SOUT_CFG_PREFIX "description", "", DESC_TEXT, DESC_LONGTEXT,
                                         true )
-    add_string( SOUT_CFG_PREFIX "url", "", NULL, URL_TEXT, URL_LONGTEXT,
+    add_string( SOUT_CFG_PREFIX "url", "", URL_TEXT, URL_LONGTEXT,
                                         true )
-    add_string( SOUT_CFG_PREFIX "email", "", NULL, EMAIL_TEXT, EMAIL_LONGTEXT,
+    add_string( SOUT_CFG_PREFIX "email", "", EMAIL_TEXT, EMAIL_LONGTEXT,
                                         true )
-    add_string( SOUT_CFG_PREFIX "phone", "", NULL, PHONE_TEXT, PHONE_LONGTEXT,
+    add_string( SOUT_CFG_PREFIX "phone", "", PHONE_TEXT, PHONE_LONGTEXT,
                                         true )
     add_obsolete_bool( SOUT_CFG_PREFIX "sap-ipv6" )
 

modules/stream_out/switcher.c

@@ -118,11 +118,11 @@ vlc_module_begin ()
     add_shortcut( "switcher" )
     set_callbacks( Open, Close )
 
-    add_string( SOUT_CFG_PREFIX "files", "", NULL, FILES_TEXT,
+    add_string( SOUT_CFG_PREFIX "files", "", FILES_TEXT,
                 FILES_LONGTEXT, false )
-    add_string( SOUT_CFG_PREFIX "sizes", "", NULL, SIZES_TEXT,
+    add_string( SOUT_CFG_PREFIX "sizes", "", SIZES_TEXT,
                 SIZES_LONGTEXT, false )
-    add_string( SOUT_CFG_PREFIX "aspect-ratio", "4:3", NULL, RATIO_TEXT,
+    add_string( SOUT_CFG_PREFIX "aspect-ratio", "4:3", RATIO_TEXT,
                 RATIO_LONGTEXT, false )
     add_integer( SOUT_CFG_PREFIX "port", 5001, NULL,
                  PORT_TEXT, PORT_LONGTEXT, true )

modules/stream_out/transcode/transcode.c

@@ -161,7 +161,7 @@ vlc_module_begin ()
     set_section( N_("Video"), NULL )
     add_module( SOUT_CFG_PREFIX "venc", "encoder", NULL, NULL, VENC_TEXT,
                 VENC_LONGTEXT, false )
-    add_string( SOUT_CFG_PREFIX "vcodec", NULL, NULL, VCODEC_TEXT,
+    add_string( SOUT_CFG_PREFIX "vcodec", NULL, VCODEC_TEXT,
                 VCODEC_LONGTEXT, false )
     add_integer( SOUT_CFG_PREFIX "vb", 0, NULL, VB_TEXT,
                  VB_LONGTEXT, false )
@@ -173,7 +173,7 @@ vlc_module_begin ()
                HURRYUP_LONGTEXT, false )
     add_bool( SOUT_CFG_PREFIX "deinterlace", false, NULL, DEINTERLACE_TEXT,
               DEINTERLACE_LONGTEXT, false )
-    add_string( SOUT_CFG_PREFIX "deinterlace-module", "deinterlace", NULL,
+    add_string( SOUT_CFG_PREFIX "deinterlace-module", "deinterlace",
                 DEINTERLACE_MODULE_TEXT, DEINTERLACE_MODULE_LONGTEXT,
                 false )
         change_string_list( ppsz_deinterlace_type, 0, 0 )
@@ -192,11 +192,11 @@ vlc_module_begin ()
     set_section( N_("Audio"), NULL )
     add_module( SOUT_CFG_PREFIX "aenc", "encoder", NULL, NULL, AENC_TEXT,
                 AENC_LONGTEXT, false )
-    add_string( SOUT_CFG_PREFIX "acodec", NULL, NULL, ACODEC_TEXT,
+    add_string( SOUT_CFG_PREFIX "acodec", NULL, ACODEC_TEXT,
                 ACODEC_LONGTEXT, false )
     add_integer( SOUT_CFG_PREFIX "ab", 96, NULL, AB_TEXT,
                  AB_LONGTEXT, false )
-    add_string( SOUT_CFG_PREFIX "alang", NULL, NULL, ALANG_TEXT,
+    add_string( SOUT_CFG_PREFIX "alang", NULL, ALANG_TEXT,
                 ALANG_LONGTEXT, true )
     add_integer( SOUT_CFG_PREFIX "channels", 0, NULL, ACHANS_TEXT,
                  ACHANS_LONGTEXT, false )
@@ -211,7 +211,7 @@ vlc_module_begin ()
     set_section( N_("Overlays/Subtitles"), NULL )
     add_module( SOUT_CFG_PREFIX "senc", "encoder", NULL, NULL, SENC_TEXT,
                 SENC_LONGTEXT, false )
-    add_string( SOUT_CFG_PREFIX "scodec", NULL, NULL, SCODEC_TEXT,
+    add_string( SOUT_CFG_PREFIX "scodec", NULL, SCODEC_TEXT,
                 SCODEC_LONGTEXT, false )
     add_bool( SOUT_CFG_PREFIX "soverlay", false, NULL, SCODEC_TEXT,
                SCODEC_LONGTEXT, false )

modules/video_filter/alphamask.c

@@ -69,7 +69,7 @@ vlc_module_begin ()
     add_shortcut( "alphamask", "mask" )
     set_callbacks( Create, Destroy )
 
-    add_string( CFG_PREFIX "mask", NULL, NULL, MASK_TEXT,
+    add_string( CFG_PREFIX "mask", NULL, MASK_TEXT,
                 MASK_LONGTEXT, false )
 vlc_module_end ()
 

modules/video_filter/atmo/atmo.cpp

@@ -375,7 +375,7 @@ change_integer_list( pi_device_type_values,
                      ppsz_device_type_descriptions )
 
 #if defined(WIN32)
-add_string(CFG_PREFIX "serialdev", "COM1", NULL,
+add_string(CFG_PREFIX "serialdev", "COM1",
            SERIALDEV_TEXT, SERIALDEV_LONGTEXT, false )
 /*
     on win32 the executeable external driver application
@@ -384,7 +384,7 @@ add_string(CFG_PREFIX "serialdev", "COM1", NULL,
 add_loadfile(CFG_PREFIX "atmowinexe", NULL, NULL,
              ATMOWINEXE_TEXT, ATMOWINEXE_LONGTEXT, false )
 #else
-add_string(CFG_PREFIX "serialdev", "/dev/ttyUSB0", NULL,
+add_string(CFG_PREFIX "serialdev", "/dev/ttyUSB0",
            SERIALDEV_TEXT, SERIALDEV_LONGTEXT, false )
 #endif
 
@@ -422,7 +422,7 @@ add_integer_with_range(CFG_PREFIX "efadesteps",    50, 1, 250, NULL,
 set_section( N_("DMX options" ), 0 )
 add_integer_with_range(CFG_PREFIX "dmx-channels",   5, 1, 64, NULL,
                        DMX_CHANNELS_TEXT, DMX_CHANNELS_LONGTEXT, false)
-add_string(CFG_PREFIX "dmx-chbase", "0,3,6,9,12", NULL,
+add_string(CFG_PREFIX "dmx-chbase", "0,3,6,9,12",
                        DMX_CHBASE_TEXT, DMX_CHBASE_LONGTEXT, false )
 
 set_section( N_("MoMoLight options" ), 0 )
@@ -553,7 +553,7 @@ add_integer( CFG_PREFIX "channel_4", 2, NULL,
 change_integer_list( pi_zone_assignment_values,
                      ppsz_zone_assignment_descriptions )
 
-add_string(CFG_PREFIX "channels", NULL, NULL,
+add_string(CFG_PREFIX "channels", "",
            CHANNELS_ASSIGN_TEXT, CHANNELS_ASSIGN_LONGTEXT, false )
 
 
@@ -599,7 +599,7 @@ add_directory(CFG_PREFIX "gradient_path", NULL, NULL,
 #if defined(__ATMO_DEBUG__)
 add_bool(CFG_PREFIX "saveframes", false, NULL,
          SAVEFRAMES_TEXT, SAVEFRAMES_LONGTEXT, false)
-add_string(CFG_PREFIX "framepath", "", NULL,
+add_string(CFG_PREFIX "framepath", "",
            FRAMEPATH_TEXT, FRAMEPATH_LONGTEXT, false )
 #endif
 /*

modules/video_filter/audiobargraph_v.c

@@ -88,7 +88,7 @@ vlc_module_begin ()
     set_shortname( N_("Audio Bar Graph Video") )
     add_shortcut( "audiobargraph_v" )
 
-    add_string( CFG_PREFIX "i_values", NULL, NULL, I_VALUES_TEXT, I_VALUES_LONGTEXT, false )
+    add_string( CFG_PREFIX "i_values", NULL, I_VALUES_TEXT, I_VALUES_LONGTEXT, false )
     add_integer( CFG_PREFIX "x", 0, NULL, POSX_TEXT, POSX_LONGTEXT, true )
     add_integer( CFG_PREFIX "y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, true )
     add_integer_with_range( CFG_PREFIX "transparency", 255, 0, 255, NULL,

modules/video_filter/ball.c

@@ -137,7 +137,7 @@ vlc_module_begin ()
     set_category( CAT_VIDEO )
     set_subcategory( SUBCAT_VIDEO_VFILTER )
 
-    add_string( FILTER_PREFIX "color", "ball-color", NULL,
+    add_string( FILTER_PREFIX "color", "ball-color",
                 BALL_COLOR_TEXT, BALL_COLOR_LONGTEXT, false )
     change_string_list( mode_list, mode_list_text, 0 )
 

modules/video_filter/blendbench.c

@@ -86,13 +86,13 @@ vlc_module_begin ()
     set_section( N_("Base image"), NULL )
     add_loadfile( CFG_PREFIX "base-image", NULL, NULL, BASE_IMAGE_TEXT,
                   BASE_IMAGE_LONGTEXT, false )
-    add_string( CFG_PREFIX "base-chroma", "I420", NULL, BASE_CHROMA_TEXT,
+    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,
                   BLEND_IMAGE_LONGTEXT, false )
-    add_string( CFG_PREFIX "blend-chroma", "YUVA", NULL, BLEND_CHROMA_TEXT,
+    add_string( CFG_PREFIX "blend-chroma", "YUVA", BLEND_CHROMA_TEXT,
               BLEND_CHROMA_LONGTEXT, false )
 
     set_callbacks( Create, Destroy )

modules/video_filter/canvas.c

@@ -116,7 +116,7 @@ vlc_module_begin ()
     add_integer_with_range( CFG_PREFIX "height", 0, 0, INT_MAX, NULL,
                             HEIGHT_TEXT, HEIGHT_LONGTEXT, false )
 
-    add_string( CFG_PREFIX "aspect", NULL, NULL,
+    add_string( CFG_PREFIX "aspect", NULL,
                 ASPECT_TEXT, ASPECT_LONGTEXT, false )
 
     add_bool( CFG_PREFIX "padd", true, NULL,

modules/video_filter/clone.c

@@ -60,7 +60,7 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_VIDEO_VFILTER )
 
     add_integer( CFG_PREFIX "count", 2, NULL, COUNT_TEXT, COUNT_LONGTEXT, false )
-    add_string ( CFG_PREFIX "vout-list", NULL, NULL, VOUTLIST_TEXT, VOUTLIST_LONGTEXT, true )
+    add_string ( CFG_PREFIX "vout-list", NULL, VOUTLIST_TEXT, VOUTLIST_LONGTEXT, true )
 
     add_shortcut( "clone" )
     set_callbacks( Open, Close )

modules/video_filter/crop.c

@@ -108,7 +108,7 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_VIDEO_VFILTER )
     set_capability( "video filter", 0 )
 
-    add_string( "crop-geometry", NULL, NULL, GEOMETRY_TEXT,
+    add_string( "crop-geometry", NULL, GEOMETRY_TEXT,
                                              GEOMETRY_LONGTEXT, false )
     add_bool( "autocrop", false, NULL, AUTOCROP_TEXT,
                                    AUTOCROP_LONGTEXT, false )

modules/video_filter/deinterlace.c

@@ -80,7 +80,7 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_VIDEO_VFILTER )
 
     set_capability( "video filter2", 0 )
-    add_string( FILTER_CFG_PREFIX "mode", "blend", NULL, SOUT_MODE_TEXT,
+    add_string( FILTER_CFG_PREFIX "mode", "blend", SOUT_MODE_TEXT,
                 SOUT_MODE_LONGTEXT, false )
         change_string_list( mode_list, mode_list_text, 0 )
         change_safe ()

modules/video_filter/gradient.c

@@ -85,7 +85,7 @@ vlc_module_begin ()
     set_category( CAT_VIDEO )
     set_subcategory( SUBCAT_VIDEO_VFILTER )
 
-    add_string( FILTER_PREFIX "mode", "gradient", NULL,
+    add_string( FILTER_PREFIX "mode", "gradient",
                 MODE_TEXT, MODE_LONGTEXT, false )
         change_string_list( mode_list, mode_list_text, 0 )
 

modules/video_filter/marq.c

@@ -151,7 +151,7 @@ vlc_module_begin ()
     set_callbacks( CreateFilter, DestroyFilter )
     set_category( CAT_VIDEO )
     set_subcategory( SUBCAT_VIDEO_SUBPIC )
-    add_string( CFG_PREFIX "marquee", "VLC", NULL, MSG_TEXT, MSG_LONGTEXT,
+    add_string( CFG_PREFIX "marquee", "VLC", MSG_TEXT, MSG_LONGTEXT,
                 false )
 
     set_section( N_("Position"), NULL )

modules/video_filter/mosaic.c

@@ -218,10 +218,10 @@ vlc_module_begin ()
     add_bool( CFG_PREFIX "keep-picture", false, NULL,
               KEEP_TEXT, KEEP_LONGTEXT, false )
 
-    add_string( CFG_PREFIX "order", "", NULL,
+    add_string( CFG_PREFIX "order", "",
                 ORDER_TEXT, ORDER_LONGTEXT, false )
 
-    add_string( CFG_PREFIX "offsets", "", NULL,
+    add_string( CFG_PREFIX "offsets", "",
                 OFFSETS_TEXT, OFFSETS_LONGTEXT, false )
 
     add_integer( CFG_PREFIX "delay", 0, NULL, DELAY_TEXT, DELAY_LONGTEXT,

modules/video_filter/opencv_example.c

@@ -72,7 +72,7 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_VIDEO_VFILTER2 )
     set_callbacks( OpenFilter, CloseFilter )
 
-    add_string( "opencv-haarcascade-file", "c:\\haarcascade_frontalface_alt.xml", NULL,
+    add_string( "opencv-haarcascade-file", "c:\\haarcascade_frontalface_alt.xml",
                           N_("Haar cascade filename"),
                           N_("Name of XML file containing Haar cascade description"), false);
 vlc_module_end ()

modules/video_filter/opencv_wrapper.c

@@ -85,19 +85,19 @@ vlc_module_begin ()
                           N_("Scale factor (0.1-2.0)"),
                           N_("Ammount by which to scale the picture before sending it to the internal OpenCV filter"),
                           false )
-    add_string( "opencv-chroma", "input", NULL,
+    add_string( "opencv-chroma", "input",
                           N_("OpenCV filter chroma"),
                           N_("Chroma to convert picture to before sending it to the internal OpenCV filter"), false);
         change_string_list( chroma_list, chroma_list_text, 0);
-    add_string( "opencv-output", "input", NULL,
+    add_string( "opencv-output", "input",
                           N_("Wrapper filter output"),
                           N_("Determines what (if any) video is displayed by the wrapper filter"), false);
         change_string_list( output_list, output_list_text, 0);
-    add_string( "opencv-verbosity", "error", NULL,
+    add_string( "opencv-verbosity", "error",
                           N_("Wrapper filter verbosity"),
                           N_("Determines wrapper filter verbosity level"), false);
         change_string_list( verbosity_list, verbosity_list_text, 0);
-    add_string( "opencv-filter-name", "none", NULL,
+    add_string( "opencv-filter-name", "none",
                           N_("OpenCV internal filter name"),
                           N_("Name of internal OpenCV plugin filter to use"), false);
 vlc_module_end ()

modules/video_filter/osdmenu.c

@@ -129,9 +129,9 @@ vlc_module_begin ()
     add_integer( OSD_CFG "position", 8, NULL, POS_TEXT, POS_LONGTEXT,
                  false )
         change_integer_list( pi_pos_values, ppsz_pos_descriptions )
-    add_string( OSD_CFG "file", OSD_DEFAULT_CFG, NULL, OSD_FILE_TEXT,
+    add_string( OSD_CFG "file", OSD_DEFAULT_CFG, OSD_FILE_TEXT,
         OSD_FILE_LONGTEXT, false )
-    add_string( OSD_CFG "file-path", NULL, NULL, OSD_PATH_TEXT,
+    add_string( OSD_CFG "file-path", NULL, OSD_PATH_TEXT,
         OSD_PATH_LONGTEXT, false )
     add_integer( OSD_CFG "timeout", 15, NULL, TIMEOUT_TEXT,
         TIMEOUT_LONGTEXT, false )

modules/video_filter/panoramix.c

@@ -170,7 +170,7 @@ vlc_module_begin()
     add_obsolete_bool( CFG_PREFIX "offset-x" )
 #endif
 
-    add_string( CFG_PREFIX "active", NULL, NULL, ACTIVE_TEXT, ACTIVE_LONGTEXT, true )
+    add_string( CFG_PREFIX "active", NULL, ACTIVE_TEXT, ACTIVE_LONGTEXT, true )
 
     add_shortcut( "panoramix" )
     set_callbacks( Open, Close )

modules/video_filter/postproc.c

@@ -86,7 +86,7 @@ vlc_module_begin ()
                             PP_QUALITY_MAX, NULL, Q_TEXT, Q_LONGTEXT, false )
         add_deprecated_alias( "ffmpeg-pp-q" )
         change_safe()
-    add_string( FILTER_PREFIX "name", "default", NULL, NAME_TEXT,
+    add_string( FILTER_PREFIX "name", "default", NAME_TEXT,
                 NAME_LONGTEXT, true )
         add_deprecated_alias( "ffmpeg-pp-name" )
 vlc_module_end ()

modules/video_filter/remoteosd.c

@@ -122,7 +122,7 @@ vlc_module_begin ()
     add_shortcut( "rmtosd" )
     set_callbacks( CreateFilter, DestroyFilter )
 
-    add_string( RMTOSD_CFG "host", "myvdr", NULL, RMTOSD_HOST_TEXT,
+    add_string( RMTOSD_CFG "host", "myvdr", RMTOSD_HOST_TEXT,
         RMTOSD_HOST_LONGTEXT, false )
     add_integer_with_range( RMTOSD_CFG "port", 20001, 1, 0xFFFF, NULL,
         RMTOSD_PORT_TEXT, RMTOSD_PORT_LONGTEXT, false )

modules/video_filter/rss.c

@@ -195,7 +195,7 @@ vlc_module_begin ()
     set_callbacks( CreateFilter, DestroyFilter )
     set_category( CAT_VIDEO )
     set_subcategory( SUBCAT_VIDEO_SUBPIC )
-    add_string( CFG_PREFIX "urls", NULL, NULL, MSG_TEXT, MSG_LONGTEXT, false )
+    add_string( CFG_PREFIX "urls", NULL, MSG_TEXT, MSG_LONGTEXT, false )
 
     set_section( N_("Position"), NULL )
     add_integer( CFG_PREFIX "x", 0, NULL, POSX_TEXT, POSX_LONGTEXT, true )

modules/video_filter/scene.c

@@ -98,15 +98,15 @@ vlc_module_begin ()
     set_capability( "video filter2", 0 )
 
     /* General options */
-    add_string(  CFG_PREFIX "format", "png", NULL,
+    add_string(  CFG_PREFIX "format", "png",
                  FORMAT_TEXT, FORMAT_LONGTEXT, false )
     add_integer( CFG_PREFIX "width", -1, NULL,
                  WIDTH_TEXT, WIDTH_LONGTEXT, true )
     add_integer( CFG_PREFIX "height", -1, NULL,
                  HEIGHT_TEXT, HEIGHT_LONGTEXT, true )
-    add_string(  CFG_PREFIX "prefix", "scene", NULL,
+    add_string(  CFG_PREFIX "prefix", "scene",
                  PREFIX_TEXT, PREFIX_LONGTEXT, false )
-    add_string(  CFG_PREFIX "path", NULL, NULL,
+    add_string(  CFG_PREFIX "path", NULL,
                  PATH_TEXT, PATH_LONGTEXT, false )
     add_bool(    CFG_PREFIX "replace", false, NULL,
                  REPLACE_TEXT, REPLACE_LONGTEXT, false )

modules/video_filter/transform.c

@@ -80,7 +80,7 @@ vlc_module_begin ()
     set_category( CAT_VIDEO )
     set_subcategory( SUBCAT_VIDEO_VFILTER )
 
-    add_string( CFG_PREFIX "type", "90", NULL,
+    add_string( CFG_PREFIX "type", "90",
                           TYPE_TEXT, TYPE_LONGTEXT, false)
         change_string_list( type_list, type_list_text, 0)
 

modules/video_filter/wall.c

@@ -70,9 +70,9 @@ vlc_module_begin()
 
     add_integer( CFG_PREFIX "cols", 3, NULL, COLS_TEXT, COLS_LONGTEXT, false )
     add_integer( CFG_PREFIX "rows", 3, NULL, ROWS_TEXT, ROWS_LONGTEXT, false )
-    add_string( CFG_PREFIX "active", NULL, NULL, ACTIVE_TEXT, ACTIVE_LONGTEXT,
+    add_string( CFG_PREFIX "active", NULL, ACTIVE_TEXT, ACTIVE_LONGTEXT,
                  true )
-    add_string( CFG_PREFIX "element-aspect", "4:3", NULL, ASPECT_TEXT, ASPECT_LONGTEXT, false )
+    add_string( CFG_PREFIX "element-aspect", "4:3", ASPECT_TEXT, ASPECT_LONGTEXT, false )
 
     add_shortcut( "wall" )
     set_callbacks( Open, Close )

modules/video_output/fb.c

@@ -86,7 +86,7 @@ vlc_module_begin ()
     add_loadfile(FB_DEV_VAR, "/dev/fb0", NULL, DEVICE_TEXT, DEVICE_LONGTEXT,
                  false)
     add_bool("fb-tty", true, NULL, TTY_TEXT, TTY_LONGTEXT, true)
-    add_string( "fb-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true )
+    add_string( "fb-chroma", NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true )
     add_obsolete_string("fb-aspect-ratio")
     add_integer("fb-mode", 4, NULL, FB_MODE_TEXT, FB_MODE_LONGTEXT,
                  true)

modules/video_output/msw/directx.c

@@ -111,7 +111,7 @@ vlc_module_begin()
               true)
     add_bool("directx-3buffering", true, NULL, TRIPLEBUF_TEXT,
               TRIPLEBUF_LONGTEXT, true)
-    add_string("directx-device", "", NULL, DEVICE_TEXT, DEVICE_LONGTEXT, true)
+    add_string("directx-device", "", DEVICE_TEXT, DEVICE_LONGTEXT, true)
         change_string_list(device, device_text, FindDevicesCallback)
         change_action_add(FindDevicesCallback, N_("Refresh list"))
 

modules/video_output/sdl.c

@@ -65,7 +65,7 @@ vlc_module_begin()
     set_description(N_("Simple DirectMedia Layer video output"))
     set_capability("vout display", 60)
     add_shortcut("sdl")
-    add_string("sdl-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true)
+    add_string("sdl-chroma", NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true)
     add_obsolete_string("sdl-video-driver") /* obsolete since 1.1.0 */
     set_callbacks(Open, Close)
 #if defined(__i386__) || defined(__x86_64__)

modules/video_output/snapshot.c

@@ -78,7 +78,7 @@ vlc_module_begin ()
 
     add_integer("vout-snapshot-width", 320, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, false)
     add_integer("vout-snapshot-height", 200, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, false)
-    add_string("vout-snapshot-chroma", "RV32", NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true)
+    add_string("vout-snapshot-chroma", "RV32", CHROMA_TEXT, CHROMA_LONGTEXT, true)
         add_deprecated_alias("snapshot-chroma")
     add_integer("vout-snapshot-cache-size", 50, NULL, CACHE_TEXT, CACHE_LONGTEXT, true)
         add_deprecated_alias("snapshot-cache-size")

modules/video_output/vmem.c

@@ -69,7 +69,7 @@ vlc_module_begin()
         change_private()
     add_integer("vmem-pitch", 640, NULL, T_PITCH, LT_PITCH, false)
         change_private()
-    add_string("vmem-chroma", "RV16", NULL, T_CHROMA, LT_CHROMA, true)
+    add_string("vmem-chroma", "RV16", T_CHROMA, LT_CHROMA, true)
         change_private()
     add_obsolete_string("vmem-lock") /* obsoleted since 1.1.1 */
     add_obsolete_string("vmem-unlock") /* obsoleted since 1.1.1 */