add_float: remove callback parameter

diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h
index 1dcee2d1c945b7ad2595629b8ec102161e8f1f56..451ebbda065e98ac9e46f61c0707418ec8789442 100644 (file)
--- a/include/vlc_plugin.h
+++ b/include/vlc_plugin.h
@@ -357,12 +357,12 @@ enum vlc_module_properties
     add_integer( name, value, p_callback, text, longtext, advc ) \
     change_integer_range( i_min, i_max )
 
-#define add_float( name, v, p_callback, text, longtext, advc ) \
+#define add_float( name, v, text, longtext, advc ) \
     add_typename_inner( CONFIG_ITEM_FLOAT, name, text, longtext, advc ) \
     vlc_config_set (p_config, VLC_CONFIG_VALUE, (double)(v));
 
 #define add_float_with_range( name, value, f_min, f_max, p_callback, text, longtext, advc ) \
-    add_float( name, value, p_callback, text, longtext, advc ) \
+    add_float( name, value, text, longtext, advc ) \
     change_float_range( f_min, f_max )
 
 #define add_bool( name, v, p_callback, text, longtext, advc ) \

diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index 82b291690f0341317ff8c68072f66c2f59d18102..80df34cefa6c76c9c2738a1004fb5028cbe432e7 100644 (file)
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -242,7 +242,7 @@ vlc_module_begin ()
 
     add_string( CFG_PREFIX "chroma", NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true )
 
-    add_float( CFG_PREFIX "fps", 0.0f, NULL, FPS_TEXT, FPS_LONGTEXT, true )
+    add_float( CFG_PREFIX "fps", 0.0f, FPS_TEXT, FPS_LONGTEXT, true )
 
     add_bool( CFG_PREFIX "config", false, NULL, CONFIG_TEXT, CONFIG_LONGTEXT, true )
 

diff --git a/modules/access/screen/screen.c b/modules/access/screen/screen.c
index 639b8c7304d2f60b24842d5f9fe73502d5e84a7d..080e9bd9faeacba2a32a9820169b7e81600b123a 100644 (file)
--- a/modules/access/screen/screen.c
+++ b/modules/access/screen/screen.c
@@ -99,7 +99,7 @@ vlc_module_begin ()
 
     add_integer( "screen-caching", DEFAULT_PTS_DELAY / 1000, NULL,
         CACHING_TEXT, CACHING_LONGTEXT, true )
-    add_float( "screen-fps", SCREEN_FPS, NULL, FPS_TEXT, FPS_LONGTEXT, true )
+    add_float( "screen-fps", SCREEN_FPS, FPS_TEXT, FPS_LONGTEXT, true )
 
 #ifdef SCREEN_SUBSCREEN
     add_integer( "screen-top", 0, NULL, TOP_TEXT, TOP_LONGTEXT, true )

diff --git a/modules/access/screen/xcb.c b/modules/access/screen/xcb.c
index 9cc919ca8a4728a814ed0ed4937ed7375c2a86e0..4661b17bccb6cd814e2fb888f4b5aa019e81cd66 100644 (file)
--- a/modules/access/screen/xcb.c
+++ b/modules/access/screen/xcb.c
@@ -75,7 +75,7 @@ vlc_module_begin ()
 
     add_integer ("screen-caching", DEFAULT_PTS_DELAY * 1000 / CLOCK_FREQ,
                  NULL, CACHING_TEXT, CACHING_LONGTEXT, true)
-    add_float ("screen-fps", 2.0, NULL, FPS_TEXT, FPS_LONGTEXT, true)
+    add_float ("screen-fps", 2.0, FPS_TEXT, FPS_LONGTEXT, true)
     add_integer ("screen-left", 0, NULL, LEFT_TEXT, LEFT_LONGTEXT, true)
         change_integer_range (-32768, 32767)
         change_safe ()

diff --git a/modules/access/v4l2.c b/modules/access/v4l2.c
index 6c68730738145e596a572290b0889dfa2b6316c6..063e61ee8db47cb6316d71978c50f92939eed9b1 100644 (file)
--- a/modules/access/v4l2.c
+++ b/modules/access/v4l2.c
@@ -299,7 +299,7 @@ vlc_module_begin ()
                 HEIGHT_LONGTEXT, true )
     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_float( CFG_PREFIX "fps", 0, FPS_TEXT, FPS_LONGTEXT, true )
     add_integer( CFG_PREFIX "caching", 50 /* ms */, NULL,
                 CACHING_TEXT, CACHING_LONGTEXT, true )
 #ifdef HAVE_LIBV4L2

diff --git a/modules/audio_filter/audiobargraph_a.c b/modules/audio_filter/audiobargraph_a.c
index f8fea543894b5d5aa722ed2d33ff3619855c1e10..0b71aa02dedde31b1831620fc4f9b70cae4b83e5 100644 (file)
--- a/modules/audio_filter/audiobargraph_a.c
+++ b/modules/audio_filter/audiobargraph_a.c
@@ -93,7 +93,7 @@ vlc_module_begin ()
     add_integer( CFG_PREFIX "bargraph_repetition", 4, NULL, BARGRAPH_REPETITION_TEXT, BARGRAPH_REPETITION_LONGTEXT, false )
     add_integer( CFG_PREFIX "silence", 1, NULL, SILENCE_TEXT, SILENCE_LONGTEXT, false )
     add_integer( CFG_PREFIX "time_window", 5000, NULL, TIME_WINDOW_TEXT, TIME_WINDOW_LONGTEXT, false )
-    add_float( CFG_PREFIX "alarm_threshold", 0.1, NULL, ALARM_THRESHOLD_TEXT, ALARM_THRESHOLD_LONGTEXT, false )
+    add_float( CFG_PREFIX "alarm_threshold", 0.1, ALARM_THRESHOLD_TEXT, ALARM_THRESHOLD_LONGTEXT, false )
     add_integer( CFG_PREFIX "repetition_time", 2000, NULL, REPETITION_TIME_TEXT, REPETITION_TIME_LONGTEXT, false )
     add_integer( CFG_PREFIX "connection_reset", 1, NULL, CONNECTION_RESET_TEXT, CONNECTION_RESET_LONGTEXT, false )
     

diff --git a/modules/audio_filter/chorus_flanger.c b/modules/audio_filter/chorus_flanger.c
index 294c6960523b7f6d0f02749242cd7993bf3ef829..de0a3edd105be858d7ae90ee98ce1a89359b7378 100644 (file)
--- a/modules/audio_filter/chorus_flanger.c
+++ b/modules/audio_filter/chorus_flanger.c
@@ -80,12 +80,12 @@ vlc_module_begin ()
     set_category( CAT_AUDIO )
     set_subcategory( SUBCAT_AUDIO_AFILTER )
     add_shortcut( "delay" )
-    add_float( "delay-time", 40, NULL, N_("Delay time"),
+    add_float( "delay-time", 40, N_("Delay time"),
         N_("Time in milliseconds of the average delay. Note average"), true )
-    add_float( "sweep-depth", 6, NULL, N_("Sweep Depth"),
+    add_float( "sweep-depth", 6, N_("Sweep Depth"),
         N_("Time in milliseconds of the maximum sweep depth. Thus, the sweep "
             "range will be delay-time +/- sweep-depth."), true )
-    add_float( "sweep-rate", 6, NULL, N_("Sweep Rate"),
+    add_float( "sweep-rate", 6, N_("Sweep Rate"),
         N_("Rate of change of sweep depth in milliseconds shift per second "
            "of play"), true )
     add_float_with_range( "feedback-gain", 0.5, -0.9, 0.9, NULL,

diff --git a/modules/audio_filter/compressor.c b/modules/audio_filter/compressor.c
index 23502de8a44d980c42ff4219f8c07fbf5012f72a..d73b1543d1773fb7892d6a2a8674ce26d86ab5dd 100644 (file)
--- a/modules/audio_filter/compressor.c
+++ b/modules/audio_filter/compressor.c
@@ -182,19 +182,19 @@ vlc_module_begin()
     set_category( CAT_AUDIO )
     set_subcategory( SUBCAT_AUDIO_AFILTER )
 
-    add_float( "compressor-rms-peak", 0.0, NULL, RMS_PEAK_TEXT,
+    add_float( "compressor-rms-peak", 0.0, RMS_PEAK_TEXT,
                RMS_PEAK_LONGTEXT, false )
-    add_float( "compressor-attack", 25.0, NULL, ATTACK_TEXT,
+    add_float( "compressor-attack", 25.0, ATTACK_TEXT,
                ATTACK_LONGTEXT, false )
-    add_float( "compressor-release", 100.0, NULL, RELEASE_TEXT,
+    add_float( "compressor-release", 100.0, RELEASE_TEXT,
                RELEASE_LONGTEXT, false )
-    add_float( "compressor-threshold", -11.0, NULL, THRESHOLD_TEXT,
+    add_float( "compressor-threshold", -11.0, THRESHOLD_TEXT,
                THRESHOLD_LONGTEXT, false )
-    add_float( "compressor-ratio", 8.0, NULL, RATIO_TEXT,
+    add_float( "compressor-ratio", 8.0, RATIO_TEXT,
                RATIO_LONGTEXT, false )
-    add_float( "compressor-knee", 2.5, NULL, KNEE_TEXT,
+    add_float( "compressor-knee", 2.5, KNEE_TEXT,
                KNEE_LONGTEXT, false )
-    add_float( "compressor-makeup-gain", 7.0, NULL, MAKEUP_GAIN_TEXT,
+    add_float( "compressor-makeup-gain", 7.0, MAKEUP_GAIN_TEXT,
                MAKEUP_GAIN_LONGTEXT, false )
     set_callbacks( Open, Close )
     add_shortcut( "compressor" )

diff --git a/modules/audio_filter/equalizer.c b/modules/audio_filter/equalizer.c
index d330ae1ab3e9f5b8304010b08b40d409035978ca..de34d7df0d6edc1a44cb772e694ad93af4a2c46c 100644 (file)
--- a/modules/audio_filter/equalizer.c
+++ b/modules/audio_filter/equalizer.c
@@ -85,7 +85,7 @@ vlc_module_begin ()
                 BANDS_LONGTEXT, true )
     add_bool( "equalizer-2pass", false, NULL, TWOPASS_TEXT,
               TWOPASS_LONGTEXT, true )
-    add_float( "equalizer-preamp", 12.0, NULL, PREAMP_TEXT,
+    add_float( "equalizer-preamp", 12.0, PREAMP_TEXT,
                PREAMP_LONGTEXT, true )
     set_callbacks( Open, Close )
     add_shortcut( "equalizer" )

diff --git a/modules/audio_filter/normvol.c b/modules/audio_filter/normvol.c
index 6a9dc2700bb1c0023a563a834b6c0380d7b3ffa6..6d522ae42218e74b300aeb78e13614060a2acf28 100644 (file)
--- a/modules/audio_filter/normvol.c
+++ b/modules/audio_filter/normvol.c
@@ -82,7 +82,7 @@ vlc_module_begin ()
     add_shortcut( "volnorm" )
     add_integer( "norm-buff-size", 20 ,NULL ,BUFF_TEXT, BUFF_LONGTEXT,
                  true )
-    add_float( "norm-max-level", 2.0, NULL, LEVEL_TEXT,
+    add_float( "norm-max-level", 2.0, LEVEL_TEXT,
                LEVEL_LONGTEXT, true )
     set_capability( "audio filter", 0 )
     set_callbacks( Open, Close )

diff --git a/modules/audio_filter/param_eq.c b/modules/audio_filter/param_eq.c
index 57cbc5489c1ccf90d52d02ddea44a25830b215ed..4b839f2b7e0544a0e96fa8c2945cd1816af11674 100644 (file)
--- a/modules/audio_filter/param_eq.c
+++ b/modules/audio_filter/param_eq.c
@@ -55,23 +55,23 @@ vlc_module_begin ()
     set_category( CAT_AUDIO )
     set_subcategory( SUBCAT_AUDIO_AFILTER )
 
-    add_float( "param-eq-lowf", 100, NULL, N_("Low freq (Hz)"),NULL, false )
+    add_float( "param-eq-lowf", 100, N_("Low freq (Hz)"),NULL, false )
     add_float_with_range( "param-eq-lowgain", 0, -20.0, 20.0, NULL,
                           N_("Low freq gain (dB)"), NULL,false )
-    add_float( "param-eq-highf", 10000, NULL, N_("High freq (Hz)"),NULL, false )
+    add_float( "param-eq-highf", 10000, N_("High freq (Hz)"),NULL, false )
     add_float_with_range( "param-eq-highgain", 0, -20.0, 20.0, NULL,
                           N_("High freq gain (dB)"),NULL,false )
-    add_float( "param-eq-f1", 300, NULL, N_("Freq 1 (Hz)"),NULL, false )
+    add_float( "param-eq-f1", 300, N_("Freq 1 (Hz)"),NULL, false )
     add_float_with_range( "param-eq-gain1", 0, -20.0, 20.0, NULL,
                           N_("Freq 1 gain (dB)"), NULL,false )
     add_float_with_range( "param-eq-q1", 3, 0.1, 100.0, NULL,
                           N_("Freq 1 Q"), NULL,false )
-    add_float( "param-eq-f2", 1000, NULL, N_("Freq 2 (Hz)"),NULL, false )
+    add_float( "param-eq-f2", 1000, N_("Freq 2 (Hz)"),NULL, false )
     add_float_with_range( "param-eq-gain2", 0, -20.0, 20.0, NULL,
                           N_("Freq 2 gain (dB)"),NULL,false )
     add_float_with_range( "param-eq-q2", 3, 0.1, 100.0, NULL,
                           N_("Freq 2 Q"),NULL,false )
-    add_float( "param-eq-f3", 3000, NULL, N_("Freq 3 (Hz)"),NULL, false )
+    add_float( "param-eq-f3", 3000, N_("Freq 3 (Hz)"),NULL, false )
     add_float_with_range( "param-eq-gain3", 0, -20.0, 20.0, NULL,
                           N_("Freq 3 gain (dB)"),NULL,false )
     add_float_with_range( "param-eq-q3", 3, 0.1, 100.0, NULL,

diff --git a/modules/audio_filter/spatializer/spatializer.cpp b/modules/audio_filter/spatializer/spatializer.cpp
index a5260d8a2bc15e8d1a76da2cea20e08be478143e..a910dff231ebd6bfad931b237086b4588883be3f 100644 (file)
--- a/modules/audio_filter/spatializer/spatializer.cpp
+++ b/modules/audio_filter/spatializer/spatializer.cpp
@@ -76,12 +76,12 @@ vlc_module_begin ()
 
     set_callbacks( Open, Close )
     add_shortcut( "spatializer" )
-    add_float( "spatializer-roomsize", 1.05, NULL, ROOMSIZE_TEXT,
+    add_float( "spatializer-roomsize", 1.05, ROOMSIZE_TEXT,
                ROOMSIZE_LONGTEXT, true )
-    add_float( "spatializer-width", 10., NULL, WIDTH_TEXT,WIDTH_LONGTEXT, true )
-    add_float( "spatializer-wet", 3., NULL, WET_TEXT,WET_LONGTEXT, true )
-    add_float( "spatializer-dry", 2., NULL, DRY_TEXT,DRY_LONGTEXT, true )
-    add_float( "spatializer-damp", 1., NULL, DAMP_TEXT,DAMP_LONGTEXT, true )
+    add_float( "spatializer-width", 10., WIDTH_TEXT,WIDTH_LONGTEXT, true )
+    add_float( "spatializer-wet", 3., WET_TEXT,WET_LONGTEXT, true )
+    add_float( "spatializer-dry", 2., DRY_TEXT,DRY_LONGTEXT, true )
+    add_float( "spatializer-damp", 1., DAMP_TEXT,DAMP_LONGTEXT, true )
 vlc_module_end ()
 
 /*****************************************************************************

diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c
index dd9046c98cb669e422efe61b5360715cde4571a4..6013030c0bbbb886d4ed819134267dd839731cee 100644 (file)
--- a/modules/codec/avcodec/avcodec.c
+++ b/modules/codec/avcodec/avcodec.c
@@ -172,9 +172,9 @@ vlc_module_begin ()
               ENC_PRE_ME_LONGTEXT, true )
     add_integer( ENC_CFG_PREFIX "rc-buffer-size", 224*1024*8, NULL,
                  ENC_RC_BUF_TEXT, ENC_RC_BUF_LONGTEXT, true )
-    add_float( ENC_CFG_PREFIX "rc-buffer-aggressivity", 1.0, NULL,
+    add_float( ENC_CFG_PREFIX "rc-buffer-aggressivity", 1.0,
                ENC_RC_BUF_AGGR_TEXT, ENC_RC_BUF_AGGR_LONGTEXT, true )
-    add_float( ENC_CFG_PREFIX "i-quant-factor", 0, NULL,
+    add_float( ENC_CFG_PREFIX "i-quant-factor", 0,
                ENC_IQUANT_FACTOR_TEXT, ENC_IQUANT_FACTOR_LONGTEXT, true )
     add_integer( ENC_CFG_PREFIX "noise-reduction", 0, NULL,
                  ENC_NOISE_RED_TEXT, ENC_NOISE_RED_LONGTEXT, true )
@@ -186,17 +186,17 @@ vlc_module_begin ()
                  ENC_QMAX_TEXT, ENC_QMAX_LONGTEXT, true )
     add_bool( ENC_CFG_PREFIX "trellis", false, NULL,
               ENC_TRELLIS_TEXT, ENC_TRELLIS_LONGTEXT, true )
-    add_float( ENC_CFG_PREFIX "qscale", 0, NULL,
+    add_float( ENC_CFG_PREFIX "qscale", 0,
                ENC_QSCALE_TEXT, ENC_QSCALE_LONGTEXT, true )
     add_integer( ENC_CFG_PREFIX "strict", 0, NULL,
                  ENC_STRICT_TEXT, ENC_STRICT_LONGTEXT, true )
-    add_float( ENC_CFG_PREFIX "lumi-masking", 0.0, NULL,
+    add_float( ENC_CFG_PREFIX "lumi-masking", 0.0,
                ENC_LUMI_MASKING_TEXT, ENC_LUMI_MASKING_LONGTEXT, true )
-    add_float( ENC_CFG_PREFIX "dark-masking", 0.0, NULL,
+    add_float( ENC_CFG_PREFIX "dark-masking", 0.0,
                ENC_DARK_MASKING_TEXT, ENC_DARK_MASKING_LONGTEXT, true )
-    add_float( ENC_CFG_PREFIX "p-masking", 0.0, NULL,
+    add_float( ENC_CFG_PREFIX "p-masking", 0.0,
                ENC_P_MASKING_TEXT, ENC_P_MASKING_LONGTEXT, true )
-    add_float( ENC_CFG_PREFIX "border-masking", 0.0, NULL,
+    add_float( ENC_CFG_PREFIX "border-masking", 0.0,
                ENC_BORDER_MASKING_TEXT, ENC_BORDER_MASKING_LONGTEXT, true )
     add_integer( ENC_CFG_PREFIX "luma-elim-threshold", 0, NULL,
                  ENC_LUMA_ELIM_TEXT, ENC_LUMA_ELIM_LONGTEXT, true )

diff --git a/modules/codec/dirac.c b/modules/codec/dirac.c
index 3e4c81bdffdf0bb6fb5ce3fa47f0dba2e07cff03..fd1ded438a14c62bdc21c954f65c1879f48a06c9 100644 (file)
--- a/modules/codec/dirac.c
+++ b/modules/codec/dirac.c
@@ -208,7 +208,7 @@ vlc_module_begin()
     set_capability( "encoder", 100 )
     set_callbacks( OpenEncoder, CloseEncoder )
 
-    add_float( ENC_CFG_PREFIX ENC_QUALITY_FACTOR, 5.5, NULL,
+    add_float( ENC_CFG_PREFIX ENC_QUALITY_FACTOR, 5.5,
                ENC_QUALITY_FACTOR_TEXT, ENC_QUALITY_FACTOR_LONGTEXT, false )
     change_float_range(0., 10.);
 
@@ -304,7 +304,7 @@ vlc_module_begin()
               ENC_NOAC_TEXT, ENC_NOAC_LONGTEXT, false )
 
     /* advanced option only */
-    add_float( ENC_CFG_PREFIX ENC_CPD, -1, NULL,
+    add_float( ENC_CFG_PREFIX ENC_CPD, -1,
                ENC_CPD_TEXT, ENC_CPD_LONGTEXT, true )
     change_integer_range(-1, INT_MAX);
 vlc_module_end()

diff --git a/modules/codec/speex.c b/modules/codec/speex.c
index 626d8da14e19937deac9e1d9e4e890ea446d4421..05c90b0467af25854c7b756f3496229c6bd3e7a6 100644 (file)
--- a/modules/codec/speex.c
+++ b/modules/codec/speex.c
@@ -119,7 +119,7 @@ vlc_module_begin ()
     add_bool( ENC_CFG_PREFIX "cbr", false, NULL, ENC_CBR_TEXT,
                  ENC_CBR_LONGTEXT, false )
 
-    add_float( ENC_CFG_PREFIX "quality", 8.0, NULL, ENC_QUALITY_TEXT,
+    add_float( ENC_CFG_PREFIX "quality", 8.0, ENC_QUALITY_TEXT,
                ENC_QUALITY_LONGTEXT, false )
         change_float_range( 0.0, 10.0 )
 

diff --git a/modules/codec/twolame.c b/modules/codec/twolame.c
index 3e3b43b047bddacff46e31a3c134a0946cb32555..810d5a2691385837e202c446b67a2021178a59af 100644 (file)
--- a/modules/codec/twolame.c
+++ b/modules/codec/twolame.c
@@ -79,7 +79,7 @@ vlc_module_begin ()
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_ACODEC )
 
-    add_float( ENC_CFG_PREFIX "quality", 0.0, NULL, ENC_QUALITY_TEXT,
+    add_float( ENC_CFG_PREFIX "quality", 0.0, ENC_QUALITY_TEXT,
                ENC_QUALITY_LONGTEXT, false )
     add_integer( ENC_CFG_PREFIX "mode", 0, NULL, ENC_MODE_TEXT,
                  ENC_MODE_LONGTEXT, false )

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index 02e3ca1be58798ac695d06cbe11cd866017899fd..465912d7aaa29da608c5332f4d3e1793cc9eaefe 100644 (file)
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -516,7 +516,7 @@ vlc_module_begin ()
                  QPSTEP_LONGTEXT, false )
         change_integer_range( 0, 51 )
 
-    add_float( SOUT_CFG_PREFIX "ratetol", 1.0, NULL, RATETOL_TEXT,
+    add_float( SOUT_CFG_PREFIX "ratetol", 1.0, RATETOL_TEXT,
                RATETOL_LONGTEXT, false )
         change_float_range( 0, 100 )
 
@@ -526,15 +526,15 @@ vlc_module_begin ()
     add_integer( SOUT_CFG_PREFIX "vbv-bufsize", 0, NULL, VBV_BUFSIZE_TEXT,
                  VBV_BUFSIZE_LONGTEXT, false )
 
-    add_float( SOUT_CFG_PREFIX "vbv-init", 0.9, NULL, VBV_INIT_TEXT,
+    add_float( SOUT_CFG_PREFIX "vbv-init", 0.9, VBV_INIT_TEXT,
                VBV_INIT_LONGTEXT, false )
         change_float_range( 0, 1 )
 
-    add_float( SOUT_CFG_PREFIX "ipratio", 1.40, NULL, IPRATIO_TEXT,
+    add_float( SOUT_CFG_PREFIX "ipratio", 1.40, IPRATIO_TEXT,
                IPRATIO_LONGTEXT, false )
         change_float_range( 1, 2 )
 
-    add_float( SOUT_CFG_PREFIX "pbratio", 1.30, NULL, PBRATIO_TEXT,
+    add_float( SOUT_CFG_PREFIX "pbratio", 1.30, PBRATIO_TEXT,
                PBRATIO_LONGTEXT, false )
         change_float_range( 1, 2 )
 
@@ -545,20 +545,20 @@ vlc_module_begin ()
                  PASS_LONGTEXT, false )
         change_integer_range( 0, 3 )
 
-    add_float( SOUT_CFG_PREFIX "qcomp", 0.60, NULL, QCOMP_TEXT,
+    add_float( SOUT_CFG_PREFIX "qcomp", 0.60, QCOMP_TEXT,
                QCOMP_LONGTEXT, false )
         change_float_range( 0, 1 )
 
-    add_float( SOUT_CFG_PREFIX "cplxblur", 20.0, NULL, CPLXBLUR_TEXT,
+    add_float( SOUT_CFG_PREFIX "cplxblur", 20.0, CPLXBLUR_TEXT,
                CPLXBLUR_LONGTEXT, false )
 
-    add_float( SOUT_CFG_PREFIX "qblur", 0.5, NULL, QBLUR_TEXT,
+    add_float( SOUT_CFG_PREFIX "qblur", 0.5, QBLUR_TEXT,
                QBLUR_LONGTEXT, false )
 
     add_integer( SOUT_CFG_PREFIX "aq-mode", X264_AQ_VARIANCE, NULL, AQ_MODE_TEXT,
                  AQ_MODE_LONGTEXT, false )
          change_integer_range( 0, 2 )
-    add_float( SOUT_CFG_PREFIX "aq-strength", 1.0, NULL, AQ_STRENGTH_TEXT,
+    add_float( SOUT_CFG_PREFIX "aq-strength", 1.0, AQ_STRENGTH_TEXT,
                AQ_STRENGTH_LONGTEXT, false )
 
 /* Analysis */

diff --git a/modules/demux/image.c b/modules/demux/image.c
index 2b6a3fe3427021c1a40a908444d22b012aeae9a2..e8a1a3fb9fc412e4fd7bad9064b35329453c0df0 100644 (file)
--- a/modules/demux/image.c
+++ b/modules/demux/image.c
@@ -83,7 +83,7 @@ vlc_module_begin()
         change_safe()
     add_string("image-chroma", "", CHROMA_TEXT, CHROMA_LONGTEXT, true)
         change_safe()
-    add_float("image-duration", 10, NULL, DURATION_TEXT, DURATION_LONGTEXT, true)
+    add_float("image-duration", 10, DURATION_TEXT, DURATION_LONGTEXT, true)
         change_safe()
     add_string("image-fps", "10/1", FPS_TEXT, FPS_LONGTEXT, true)
         change_safe()

diff --git a/modules/demux/mjpeg.c b/modules/demux/mjpeg.c
index 31a00e5ce26d58374b6dd872eef00a1920298c65..2ebb4a87701caaa91ec2effc47ab5998101a1743 100644 (file)
--- a/modules/demux/mjpeg.c
+++ b/modules/demux/mjpeg.c
@@ -54,7 +54,7 @@ vlc_module_begin ()
     set_callbacks( Open, Close )
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_DEMUX )
-    add_float( "mjpeg-fps", 0.0, NULL, FPS_TEXT, FPS_LONGTEXT, false )
+    add_float( "mjpeg-fps", 0.0, FPS_TEXT, FPS_LONGTEXT, false )
 vlc_module_end ()
 
 /*****************************************************************************

diff --git a/modules/demux/mpeg/es.c b/modules/demux/mpeg/es.c
index 0103e1412532469e33276668a6026a542e25c45b..64e3750ba5a4bc39b8570536e7ee53171e582e38 100644 (file)
--- a/modules/demux/mpeg/es.c
+++ b/modules/demux/mpeg/es.c
@@ -68,7 +68,7 @@ vlc_module_begin ()
     set_description( N_("MPEG-4 video" ) )
     set_capability( "demux", 0 )
     set_callbacks( OpenVideo, Close )
-    add_float( "es-fps", 25, NULL, FPS_TEXT, FPS_LONGTEXT, false )
+    add_float( "es-fps", 25, FPS_TEXT, FPS_LONGTEXT, false )
 
     add_shortcut( "m4v" )
     add_shortcut( "mp4v" )

diff --git a/modules/demux/mpeg/h264.c b/modules/demux/mpeg/h264.c
index a0e57b814e92fefc49aecddfe81ca32137db66b5..b46723534280ee166748db1864ff97810246b42b 100644 (file)
--- a/modules/demux/mpeg/h264.c
+++ b/modules/demux/mpeg/h264.c
@@ -50,7 +50,7 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_INPUT_DEMUX )
     set_description( N_("H264 video demuxer" ) )
     set_capability( "demux", 0 )
-    add_float( "h264-fps", 25.0, NULL, FPS_TEXT, FPS_LONGTEXT, true )
+    add_float( "h264-fps", 25.0, FPS_TEXT, FPS_LONGTEXT, true )
     set_callbacks( Open, Close )
     add_shortcut( "h264" )
 vlc_module_end ()

diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c
index 741280678f6378a7aad961ec599dd7bb587762e0..f864ecb119ed1d94a46e1bccabc5e71ece156077 100644 (file)
--- a/modules/demux/subtitle.c
+++ b/modules/demux/subtitle.c
@@ -75,7 +75,7 @@ vlc_module_begin ()
     set_capability( "demux", 0 )
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_DEMUX )
-    add_float( "sub-fps", 0.0, NULL,
+    add_float( "sub-fps", 0.0,
                N_("Frames per second"),
                SUB_FPS_LONGTEXT, true )
     add_integer( "sub-delay", 0, NULL,

diff --git a/modules/demux/vc1.c b/modules/demux/vc1.c
index f01ffa3d8fc0839ff960e36c0ee4418c5621c72e..0370455b3ddbacbe59f4b631f9f45f4845d4c552 100644 (file)
--- a/modules/demux/vc1.c
+++ b/modules/demux/vc1.c
@@ -49,7 +49,7 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_INPUT_DEMUX )
     set_description( N_("VC1 video demuxer" ) )
     set_capability( "demux", 0 )
-    add_float( "vc1-fps", 25.0, NULL, FPS_TEXT, FPS_LONGTEXT, true )
+    add_float( "vc1-fps", 25.0, FPS_TEXT, FPS_LONGTEXT, true )
     set_callbacks( Open, Close )
     add_shortcut( "vc1" )
 vlc_module_end ()

diff --git a/modules/stream_out/transcode/transcode.c b/modules/stream_out/transcode/transcode.c
index 4ae43257786f2d20920242fa2f76d1d3907c1491..4ac0b1a111bb60903aec4de952d7cdab6a2c2401 100644 (file)
--- a/modules/stream_out/transcode/transcode.c
+++ b/modules/stream_out/transcode/transcode.c
@@ -165,9 +165,9 @@ vlc_module_begin ()
                 VCODEC_LONGTEXT, false )
     add_integer( SOUT_CFG_PREFIX "vb", 0, NULL, VB_TEXT,
                  VB_LONGTEXT, false )
-    add_float( SOUT_CFG_PREFIX "scale", 0, NULL, SCALE_TEXT,
+    add_float( SOUT_CFG_PREFIX "scale", 0, SCALE_TEXT,
                SCALE_LONGTEXT, false )
-    add_float( SOUT_CFG_PREFIX "fps", 0, NULL, FPS_TEXT,
+    add_float( SOUT_CFG_PREFIX "fps", 0, FPS_TEXT,
                FPS_LONGTEXT, false )
     add_bool( SOUT_CFG_PREFIX "hurry-up", true, NULL, HURRYUP_TEXT,
                HURRYUP_LONGTEXT, false )

diff --git a/modules/video_filter/gaussianblur.c b/modules/video_filter/gaussianblur.c
index c736c8c213bc5a552f3d24480e5af8f203e3f5e8..9ae25b12a042a2ba281a4ccc8f92173f6bf50a10 100644 (file)
--- a/modules/video_filter/gaussianblur.c
+++ b/modules/video_filter/gaussianblur.c
@@ -61,7 +61,7 @@ vlc_module_begin ()
     set_category( CAT_VIDEO )
     set_subcategory( SUBCAT_VIDEO_VFILTER )
 
-    add_float( FILTER_PREFIX "sigma", 2., NULL, SIGMA_TEXT, SIGMA_LONGTEXT,
+    add_float( FILTER_PREFIX "sigma", 2., SIGMA_TEXT, SIGMA_LONGTEXT,
                false )
 
     set_callbacks( Create, Destroy )

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index ae0c7df8ade2914bb94bc74b1f4edd8c65774051..7fe9b469c01e7bc63b6462c4c0ea714e3216dd27 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1621,9 +1621,9 @@ vlc_module_begin ()
     add_string( "audio-replay-gain-mode", ppsz_replay_gain_mode[0], AUDIO_REPLAY_GAIN_MODE_TEXT,
                 AUDIO_REPLAY_GAIN_MODE_LONGTEXT, false )
         change_string_list( ppsz_replay_gain_mode, ppsz_replay_gain_mode_text, 0 )
-    add_float( "audio-replay-gain-preamp", 0.0, NULL,
+    add_float( "audio-replay-gain-preamp", 0.0,
                AUDIO_REPLAY_GAIN_PREAMP_TEXT, AUDIO_REPLAY_GAIN_PREAMP_LONGTEXT, false )
-    add_float( "audio-replay-gain-default", -7.0, NULL,
+    add_float( "audio-replay-gain-default", -7.0,
                AUDIO_REPLAY_GAIN_DEFAULT_TEXT, AUDIO_REPLAY_GAIN_DEFAULT_LONGTEXT, false )
     add_bool( "audio-replay-gain-peak-protection", true, NULL,
               AUDIO_REPLAY_GAIN_PEAK_PROTECTION_TEXT, AUDIO_REPLAY_GAIN_PEAK_PROTECTION_LONGTEXT, true )
@@ -1747,7 +1747,7 @@ vlc_module_begin ()
         change_safe ()
     add_bool( "autoscale", true, NULL, AUTOSCALE_TEXT, AUTOSCALE_LONGTEXT, false )
         change_safe ()
-    add_float( "scale", 1.0, NULL, SCALEFACTOR_TEXT, SCALEFACTOR_LONGTEXT, false )
+    add_float( "scale", 1.0, SCALEFACTOR_TEXT, SCALEFACTOR_LONGTEXT, false )
         change_safe ()
     add_string( "monitor-par", NULL,
                 MASPECT_RATIO_TEXT, MASPECT_RATIO_LONGTEXT, true )
@@ -1760,7 +1760,7 @@ vlc_module_begin ()
                  VIDEO_TITLE_LONGTEXT, true )
     add_integer( "align", 0, NULL, ALIGN_TEXT, ALIGN_LONGTEXT, true )
         change_integer_list( pi_align_values, ppsz_align_descriptions )
-    add_float( "zoom", 1, NULL, ZOOM_TEXT, ZOOM_LONGTEXT, true )
+    add_float( "zoom", 1, ZOOM_TEXT, ZOOM_LONGTEXT, true )
     add_integer( "deinterlace", 0, NULL,
                  DEINTERLACE_TEXT, DEINTERLACE_LONGTEXT, false )
         change_integer_list( pi_deinterlace, ppsz_deinterlace_text )
@@ -1852,19 +1852,19 @@ vlc_module_begin ()
     add_integer( "input-repeat", 0, NULL,
                  INPUT_REPEAT_TEXT, INPUT_REPEAT_LONGTEXT, false )
         change_safe ()
-    add_float( "start-time", 0, NULL,
+    add_float( "start-time", 0,
                START_TIME_TEXT, START_TIME_LONGTEXT, true )
         change_safe ()
-    add_float( "stop-time", 0, NULL,
+    add_float( "stop-time", 0,
                STOP_TIME_TEXT, STOP_TIME_LONGTEXT, true )
         change_safe ()
-    add_float( "run-time", 0, NULL,
+    add_float( "run-time", 0,
                RUN_TIME_TEXT, RUN_TIME_LONGTEXT, true )
         change_safe ()
     add_bool( "input-fast-seek", false, NULL,
               INPUT_FAST_SEEK_TEXT, INPUT_FAST_SEEK_LONGTEXT, false )
         change_safe ()
-    add_float( "rate", 1., NULL,
+    add_float( "rate", 1.,
                INPUT_RATE_TEXT, INPUT_RATE_LONGTEXT, false )
 
     add_string( "input-list", NULL,