Remove unused change_integer_list parameter

Changing the choice list of a configuration item is not thread-safe.
Plus it does not make much sense to use a strict choice list if the
choices change dynamically.

If ever needed, we can invent a suggestions list system later, just
like we already do for SD plugins enumeration.

diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h
index 3fba17bcea84de9dc2bef156124fdbbda7f014f3..4a938b063b6e414b502a15380d8361207b1a241a 100644 (file)
--- a/include/vlc_plugin.h
+++ b/include/vlc_plugin.h
@@ -406,12 +406,12 @@ enum vlc_module_properties
                     (const char *const *)(list_text), \
                     (vlc_callback_t)(list_update_func));
 
-#define change_integer_list( list, list_text, list_update_func ) \
+#define change_integer_list( list, list_text ) \
     vlc_config_set (p_config, VLC_CONFIG_LIST, \
                     (size_t)(sizeof (list) / sizeof (int)), \
                     (const int *)(list), \
                     (const char *const *)(list_text), \
-                    (vlc_callback_t)(list_update_func));
+                    (vlc_callback_t)(NULL));
 
 #define change_integer_range( minv, maxv ) \
     vlc_config_set (p_config, VLC_CONFIG_RANGE, \

diff --git a/modules/access/bda/bda.c b/modules/access/bda/bda.c
index 064f12bd407226c322270e9800c0cfdbbd2a1638..94e9ab00a427ccd946a6094272093e1d32df409c 100644 (file)
--- a/modules/access/bda/bda.c
+++ b/modules/access/bda/bda.c
@@ -221,7 +221,7 @@ vlc_module_begin ()
     /* DVB-S (satellite) */
     add_integer( "dvb-inversion", 2, NULL, INVERSION_TEXT,
         INVERSION_LONGTEXT, true )
-        change_integer_list( i_inversion_list, ppsz_inversion_text, NULL )
+        change_integer_list( i_inversion_list, ppsz_inversion_text )
 #   if defined(WIN32) || defined(WINCE)
         add_string( "dvb-polarisation", NULL, NULL, POLARISATION_TEXT,
             POLARISATION_LONGTEXT, false )
@@ -262,7 +262,7 @@ vlc_module_begin ()
     /* DVB-C (cable) */
     add_integer( "dvb-modulation", -1, NULL, MODULATION_TEXT,
         MODULATION_LONGTEXT, true )
-        change_integer_list( i_mod_list, ppsz_mod_text, NULL )
+        change_integer_list( i_mod_list, ppsz_mod_text )
 
     /* ATSC */
     add_integer( "dvb-major-channel", 0, NULL, MAJOR_CHANNEL_TEXT,
@@ -275,22 +275,22 @@ vlc_module_begin ()
     /* DVB-T (terrestrial) */
     add_integer( "dvb-code-rate-hp", -1, NULL, CODE_RATE_HP_TEXT,
         CODE_RATE_HP_LONGTEXT, true )
-        change_integer_list( i_hp_fec_list, ppsz_hp_fec_text, NULL )
+        change_integer_list( i_hp_fec_list, ppsz_hp_fec_text )
     add_integer( "dvb-code-rate-lp", -1, NULL, CODE_RATE_LP_TEXT,
         CODE_RATE_LP_LONGTEXT, true )
-        change_integer_list( i_lp_fec_list, ppsz_lp_fec_text, NULL )
+        change_integer_list( i_lp_fec_list, ppsz_lp_fec_text )
     add_integer( "dvb-bandwidth", 0, NULL, BANDWIDTH_TEXT, BANDWIDTH_LONGTEXT,
         false )
-        change_integer_list( i_band_list, ppsz_band_text, NULL )
+        change_integer_list( i_band_list, ppsz_band_text )
         change_safe()
     add_integer( "dvb-guard", -1, NULL, GUARD_TEXT, GUARD_LONGTEXT, true )
-        change_integer_list( i_guard_list, ppsz_guard_text, NULL )
+        change_integer_list( i_guard_list, ppsz_guard_text )
     add_integer( "dvb-transmission", -1, NULL, TRANSMISSION_TEXT,
         TRANSMISSION_LONGTEXT, true )
-        change_integer_list( i_transmission_list, ppsz_transmission_text, NULL )
+        change_integer_list( i_transmission_list, ppsz_transmission_text )
     add_integer( "dvb-hierarchy", -1, NULL, HIERARCHY_TEXT, HIERARCHY_LONGTEXT,
         true )
-        change_integer_list( i_hierarchy_list, ppsz_hierarchy_text, NULL )
+        change_integer_list( i_hierarchy_list, ppsz_hierarchy_text )
 
     set_capability( "access", 0 )
     add_shortcut( "dvb",                  /* Generic name */

diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp
index 4dc2d95f6dc2f4793384a01c6f9fc40e7d9433fe..4209c14675573b9340c6296fb7992357774ba7a1 100644 (file)
--- a/modules/access/dshow/dshow.cpp
+++ b/modules/access/dshow/dshow.cpp
@@ -259,11 +259,11 @@ vlc_module_begin ()
 
     add_integer( CFG_PREFIX "tuner-standard", 0, NULL, STANDARD_TEXT, STANDARD_LONGTEXT,
                 false )
-        change_integer_list( i_standards_list, ppsz_standards_list_text, NULL )
+        change_integer_list( i_standards_list, ppsz_standards_list_text )
 
     add_integer( CFG_PREFIX "tuner-input", 0, NULL, TUNER_INPUT_TEXT,
                  TUNER_INPUT_LONGTEXT, true )
-        change_integer_list( pi_tuner_input, ppsz_tuner_input_text, NULL )
+        change_integer_list( pi_tuner_input, ppsz_tuner_input_text )
 
     add_integer( CFG_PREFIX "video-input",  -1, NULL, VIDEO_IN_TEXT,
                  VIDEO_IN_LONGTEXT, true )
@@ -279,7 +279,7 @@ vlc_module_begin ()
 
     add_integer( CFG_PREFIX "amtuner-mode", AMTUNER_MODE_TV, NULL,
                 AMTUNER_MODE_TEXT, AMTUNER_MODE_LONGTEXT, false)
-        change_integer_list( pi_amtuner_mode, ppsz_amtuner_mode_text, NULL )
+        change_integer_list( pi_amtuner_mode, ppsz_amtuner_mode_text )
 
     add_integer( CFG_PREFIX "audio-channels", 0, NULL, AUDIO_CHANNELS_TEXT,
                  AUDIO_CHANNELS_LONGTEXT, true )

diff --git a/modules/access/imem.c b/modules/access/imem.c
index b6cd5890c2bbd6a4d1aa80c53c05fd25eff4ab93..28d5bc923cc11a898a6288fe8ee297c783597b19 100644 (file)
--- a/modules/access/imem.c
+++ b/modules/access/imem.c
@@ -144,7 +144,7 @@ vlc_module_begin()
         change_private()
         change_safe()
     add_integer("imem-cat", 0, NULL, CAT_TEXT, CAT_LONGTEXT, true)
-        change_integer_list(cat_values, cat_texts, NULL)
+        change_integer_list(cat_values, cat_texts)
         change_private()
         change_safe()
     add_string ("imem-codec", NULL, NULL, CODEC_TEXT, CODEC_LONGTEXT, true)

diff --git a/modules/access/pvr.c b/modules/access/pvr.c
index 2bd417e0694e1ca8c37ed8e9a0abe8b52a2f6127..4b5952183cc7e8abeafe5ff554907886d502fcbd 100644 (file)
--- a/modules/access/pvr.c
+++ b/modules/access/pvr.c
@@ -140,7 +140,7 @@ vlc_module_begin ()
                  RADIO_DEVICE_LONGTEXT, false )
     add_integer( "pvr-norm", V4L2_STD_UNKNOWN , NULL, NORM_TEXT,
                  NORM_LONGTEXT, false )
-       change_integer_list( i_norm_list, psz_norm_list_text, NULL )
+       change_integer_list( i_norm_list, psz_norm_list_text )
     add_integer( "pvr-width", -1, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, true )
     add_integer( "pvr-height", -1, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT,
                  true )
@@ -158,7 +158,7 @@ vlc_module_begin ()
                  BITRATE_PEAK_LONGTEXT, true )
     add_integer( "pvr-bitrate-mode", -1, NULL, BITRATE_MODE_TEXT,
                  BITRATE_MODE_LONGTEXT, true )
-        change_integer_list( i_bitrates, psz_bitrates_list_text, NULL )
+        change_integer_list( i_bitrates, psz_bitrates_list_text )
     add_integer( "pvr-audio-bitmask", -1, NULL, BITMASK_TEXT,
                  BITMASK_LONGTEXT, true )
     add_integer( "pvr-audio-volume", -1, NULL, VOLUME_TEXT,

diff --git a/modules/access/v4l2.c b/modules/access/v4l2.c
index a20b79dc9f82b8089c8a03bf581a2ba412d21387..a2074f3d52f2940b1cd2d1926d52441b1d03d1c1 100644 (file)
--- a/modules/access/v4l2.c
+++ b/modules/access/v4l2.c
@@ -283,7 +283,7 @@ vlc_module_begin ()
     set_section( N_( "Video input" ), NULL )
     add_integer( CFG_PREFIX "standard", 0, NULL, STANDARD_TEXT,
                  STANDARD_LONGTEXT, false )
-        change_integer_list( i_standards_list, psz_standards_list_text, NULL )
+        change_integer_list( i_standards_list, psz_standards_list_text )
     add_string( CFG_PREFIX "chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT,
                 true )
     add_integer( CFG_PREFIX "input", 0, NULL, INPUT_TEXT, INPUT_LONGTEXT,
@@ -292,7 +292,7 @@ vlc_module_begin ()
                  AUDIO_INPUT_LONGTEXT, true )
     add_integer( CFG_PREFIX "io", IO_METHOD_AUTO, NULL, IOMETHOD_TEXT,
                  IOMETHOD_LONGTEXT, true )
-        change_integer_list( i_iomethod_list, psz_iomethod_list_text, NULL )
+        change_integer_list( i_iomethod_list, psz_iomethod_list_text )
     add_integer( CFG_PREFIX "width", DEFAULT_WIDTH, NULL, WIDTH_TEXT,
                 WIDTH_LONGTEXT, true )
     add_integer( CFG_PREFIX "height", DEFAULT_HEIGHT, NULL, HEIGHT_TEXT,
@@ -314,7 +314,7 @@ vlc_module_begin ()
     add_integer( CFG_PREFIX "tuner-audio-mode", -1, NULL, TUNER_AUDIO_MODE_TEXT,
                  TUNER_AUDIO_MODE_LONGTEXT, true )
         change_integer_list( i_tuner_audio_modes_list,
-                             psz_tuner_audio_modes_list_text, 0 )
+                             psz_tuner_audio_modes_list_text )
 
     set_section( N_( "Controls" ),
                  N_( "v4l2 driver controls, if supported by your v4l2 driver." ) )

diff --git a/modules/audio_filter/channel_mixer/mono.c b/modules/audio_filter/channel_mixer/mono.c
index 19b3969d4b27a4c50bd0685a97611edf3d76904c..03db8a47eb18651652664c770b404bfc21207f4e 100644 (file)
--- a/modules/audio_filter/channel_mixer/mono.c
+++ b/modules/audio_filter/channel_mixer/mono.c
@@ -116,7 +116,7 @@ vlc_module_begin ()
               MONO_DOWNMIX_LONGTEXT, false )
     add_integer( MONO_CFG "channel", -1, NULL, MONO_CHANNEL_TEXT,
         MONO_CHANNEL_LONGTEXT, false )
-        change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL )
+        change_integer_list( pi_pos_values, ppsz_pos_descriptions )
 
 vlc_module_end ()
 

diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c
index a09be391a8bd50cd62c5ad710867fb965658002b..601c064f18508847acb9ba8ee6734891e89df76f 100644 (file)
--- a/modules/codec/avcodec/avcodec.c
+++ b/modules/codec/avcodec/avcodec.c
@@ -132,7 +132,7 @@ vlc_module_begin ()
     add_integer ( "ffmpeg-skiploopfilter", 0, NULL, SKIPLOOPF_TEXT,
                   SKIPLOOPF_LONGTEXT, true )
         change_safe ()
-        change_integer_list( nloopf_list, nloopf_list_text, NULL )
+        change_integer_list( nloopf_list, nloopf_list_text )
 
     add_integer( "ffmpeg-debug", 0, NULL, DEBUG_TEXT, DEBUG_LONGTEXT,
                  true )

diff --git a/modules/codec/dvbsub.c b/modules/codec/dvbsub.c
index fb7619cfa4a22e54605cce34572b852095c48024..088c3d67ee81037b7bcab5b364da5b3c2b5c0d16 100644 (file)
--- a/modules/codec/dvbsub.c
+++ b/modules/codec/dvbsub.c
@@ -123,7 +123,7 @@ vlc_module_begin ()
     set_callbacks( Open, Close )
 
     add_integer( DVBSUB_CFG_PREFIX "position", 8, NULL, POS_TEXT, POS_LONGTEXT, true )
-        change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL )
+        change_integer_list( pi_pos_values, ppsz_pos_descriptions )
     add_integer( DVBSUB_CFG_PREFIX "x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, false )
     add_integer( DVBSUB_CFG_PREFIX "y", -1, NULL, POSY_TEXT, POSY_LONGTEXT, false )
 

diff --git a/modules/codec/kate.c b/modules/codec/kate.c
index 7f697bdf8759d288bae5a1b60e8ccffd00cd6baf..5de8593f6d20f445de64104f6ddf1c16d014dc35 100644 (file)
--- a/modules/codec/kate.c
+++ b/modules/codec/kate.c
@@ -297,7 +297,7 @@ vlc_module_begin ()
                             0, sizeof(pi_font_effects)/sizeof(pi_font_effects[0])-1, TigerConfigurationCallback,
                             TIGER_DEFAULT_FONT_EFFECT_TEXT, TIGER_DEFAULT_FONT_EFFECT_LONGTEXT,
                             true )
-    change_integer_list( pi_font_effects, ppsz_font_effect_names, NULL );
+    change_integer_list( pi_font_effects, ppsz_font_effect_names );
     add_float_with_range( "kate-tiger-default-font-effect-strength",
               TIGER_DEFAULT_FONT_EFFECT_STRENGTH_DEFAULT, 0.0f, 1.0f, TigerConfigurationCallback,
               TIGER_DEFAULT_FONT_EFFECT_STRENGTH_TEXT, TIGER_DEFAULT_FONT_EFFECT_STRENGTH_LONGTEXT,
@@ -306,7 +306,7 @@ vlc_module_begin ()
                             TIGER_DEFAULT_FONT_COLOR_DEFAULT, 0, 0x00ffffff, TigerConfigurationCallback,
                             TIGER_DEFAULT_FONT_COLOR_TEXT, TIGER_DEFAULT_FONT_COLOR_LONGTEXT,
                             true);
-    change_integer_list( pi_color_values, ppsz_color_descriptions, NULL );
+    change_integer_list( pi_color_values, ppsz_color_descriptions );
     add_integer_with_range( "kate-tiger-default-font-alpha",
                             TIGER_DEFAULT_FONT_ALPHA_DEFAULT, 0, 255, TigerConfigurationCallback,
                             TIGER_DEFAULT_FONT_ALPHA_TEXT, TIGER_DEFAULT_FONT_ALPHA_LONGTEXT,
@@ -315,7 +315,7 @@ vlc_module_begin ()
                             TIGER_DEFAULT_BACKGROUND_COLOR_DEFAULT, 0, 0x00ffffff, TigerConfigurationCallback,
                             TIGER_DEFAULT_BACKGROUND_COLOR_TEXT, TIGER_DEFAULT_BACKGROUND_COLOR_LONGTEXT,
                             true);
-    change_integer_list( pi_color_values, ppsz_color_descriptions, NULL );
+    change_integer_list( pi_color_values, ppsz_color_descriptions );
     add_integer_with_range( "kate-tiger-default-background-alpha",
                             TIGER_DEFAULT_BACKGROUND_ALPHA_DEFAULT, 0, 255, TigerConfigurationCallback,
                             TIGER_DEFAULT_BACKGROUND_ALPHA_TEXT, TIGER_DEFAULT_BACKGROUND_ALPHA_LONGTEXT,

diff --git a/modules/codec/speex.c b/modules/codec/speex.c
index b8a99a37815f99a837f24465f73286cc49215dec..626d8da14e19937deac9e1d9e4e890ea446d4421 100644 (file)
--- a/modules/codec/speex.c
+++ b/modules/codec/speex.c
@@ -110,7 +110,7 @@ vlc_module_begin ()
 
     add_integer( ENC_CFG_PREFIX "mode", 0, NULL, ENC_MODE_TEXT,
                  ENC_MODE_LONGTEXT, false )
-        change_integer_list( pi_enc_mode_values, ppsz_enc_mode_descriptions, NULL )
+        change_integer_list( pi_enc_mode_values, ppsz_enc_mode_descriptions )
 
     add_integer( ENC_CFG_PREFIX "complexity", 3, NULL, ENC_COMPLEXITY_TEXT,
                  ENC_COMPLEXITY_LONGTEXT, false )

diff --git a/modules/codec/subsdec.c b/modules/codec/subsdec.c
index 7545cbbd1b5e8dc6f0f85a8170af11aa1567f02e..3e073d3b1d95eef84f337ccdcbf5de5720adfc3b 100644 (file)
--- a/modules/codec/subsdec.c
+++ b/modules/codec/subsdec.c
@@ -214,7 +214,7 @@ vlc_module_begin ()
 
     add_integer( "subsdec-align", 0, NULL, ALIGN_TEXT, ALIGN_LONGTEXT,
                  false )
-        change_integer_list( pi_justification, ppsz_justification_text, NULL )
+        change_integer_list( pi_justification, ppsz_justification_text )
     add_string( "subsdec-encoding", "", NULL,
                 ENCODING_TEXT, ENCODING_LONGTEXT, false )
         change_string_list( ppsz_encodings, ppsz_encoding_names, 0 )

diff --git a/modules/codec/twolame.c b/modules/codec/twolame.c
index 9b0649ee6704d73193301b81e42720a0ab753927..3e3b43b047bddacff46e31a3c134a0946cb32555 100644 (file)
--- a/modules/codec/twolame.c
+++ b/modules/codec/twolame.c
@@ -83,7 +83,7 @@ vlc_module_begin ()
                ENC_QUALITY_LONGTEXT, false )
     add_integer( ENC_CFG_PREFIX "mode", 0, NULL, ENC_MODE_TEXT,
                  ENC_MODE_LONGTEXT, false )
-        change_integer_list( pi_stereo_values, ppsz_stereo_descriptions, NULL );
+        change_integer_list( pi_stereo_values, ppsz_stereo_descriptions );
     add_bool( ENC_CFG_PREFIX "vbr", false, NULL, ENC_VBR_TEXT,
               ENC_VBR_LONGTEXT, false )
     add_integer( ENC_CFG_PREFIX "psy", 3, NULL, ENC_PSY_TEXT,

diff --git a/modules/codec/zvbi.c b/modules/codec/zvbi.c
index 4c7ecc7e2809bcd6d94c2cc48a0893a4b7c1fea8..60f0d91d847702852bd0744800098caba95b4713 100644 (file)
--- a/modules/codec/zvbi.c
+++ b/modules/codec/zvbi.c
@@ -91,7 +91,7 @@ vlc_module_begin ()
     add_bool( "vbi-opaque", true, NULL,
                  OPAQUE_TEXT, OPAQUE_LONGTEXT, false )
     add_integer( "vbi-position", 4, NULL, POS_TEXT, POS_LONGTEXT, false )
-        change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL );
+        change_integer_list( pi_pos_values, ppsz_pos_descriptions );
     add_bool( "vbi-text", false, NULL,
               TELX_TEXT, TELX_LONGTEXT, false )
 vlc_module_end ()

diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index c9b66396694e4a4ed2877892932cc176426411f5..8191f0c870af5f157b7ff543225162336b5828b5 100644 (file)
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -108,7 +108,7 @@ vlc_module_begin ()
                  N_("MouseWheel x-axis Control"),
                  N_("MouseWheel x-axis can control volume, position or "
                     "mousewheel event can be ignored"), false )
-            change_integer_list( i_mode_list, psz_mode_list_text, NULL )
+            change_integer_list( i_mode_list, psz_mode_list_text )
 
 vlc_module_end ()
 

diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index 4ccd1f73e95f2c4e923b828f83934b7fb14bf17b..d9c0a144d7f8869c46bbe3d3f68833dccf076f1e 100644 (file)
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -75,7 +75,7 @@ vlc_module_begin ()
               INTERLEAVE_TEXT, INTERLEAVE_LONGTEXT, true )
     add_integer( "avi-index", 0, NULL,
               INDEX_TEXT, INDEX_LONGTEXT, false )
-        change_integer_list( pi_index, ppsz_indexes, NULL )
+        change_integer_list( pi_index, ppsz_indexes )
 
     set_callbacks( Open, Close )
 vlc_module_end ()

diff --git a/modules/gui/fbosd.c b/modules/gui/fbosd.c
index 396e059d4dcbc03bca9790d3563904eab5aed53d..7687e984953bb7b9cd78dc4e32bf2734d19f46fd 100644 (file)
--- a/modules/gui/fbosd.c
+++ b/modules/gui/fbosd.c
@@ -199,14 +199,14 @@ vlc_module_begin ()
     add_integer( "fbosd-y", 0, NULL, POSY_TEXT,
                  POSY_LONGTEXT, false )
     add_integer( "fbosd-position", 8, NULL, POS_TEXT, POS_LONGTEXT, true )
-        change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL );
+        change_integer_list( pi_pos_values, ppsz_pos_descriptions );
 
     set_section( N_("Font"), NULL )
     add_integer_with_range( "fbosd-font-opacity", 255, 0, 255, NULL,
         OPACITY_TEXT, OPACITY_LONGTEXT, false )
     add_integer( "fbosd-font-color", 0x00FFFFFF, NULL, COLOR_TEXT, COLOR_LONGTEXT,
                  false )
-        change_integer_list( pi_color_values, ppsz_color_descriptions, NULL );
+        change_integer_list( pi_color_values, ppsz_color_descriptions );
     add_integer( "fbosd-font-size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT,
                  false )
 

diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index e39d8afe595944438bc45bd81a4b3531480603ac..424c8ec5a81007d4fcc4297dd592b76ef9fd5d4f 100644 (file)
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -161,14 +161,14 @@ vlc_module_begin ()
     /* hook to the color values list, with default 0x00ffffff = white */
     add_integer( "freetype-color", 0x00FFFFFF, NULL, COLOR_TEXT,
                  COLOR_LONGTEXT, false )
-        change_integer_list( pi_color_values, ppsz_color_descriptions, NULL )
+        change_integer_list( pi_color_values, ppsz_color_descriptions )
 
     add_integer( "freetype-rel-fontsize", 16, NULL, FONTSIZER_TEXT,
                  FONTSIZER_LONGTEXT, false )
-        change_integer_list( pi_sizes, ppsz_sizes_text, NULL )
+        change_integer_list( pi_sizes, ppsz_sizes_text )
     add_integer( "freetype-effect", 2, NULL, EFFECT_TEXT,
                  EFFECT_LONGTEXT, false )
-        change_integer_list( pi_effects, ppsz_effects_text, NULL )
+        change_integer_list( pi_effects, ppsz_effects_text )
 
     add_bool( "freetype-yuvp", false, NULL, YUVP_TEXT,
               YUVP_LONGTEXT, true )

diff --git a/modules/misc/quartztext.c b/modules/misc/quartztext.c
index 57b599e5d3c0918b812f14aadea44bc80fb73875..297d3536fe19cabbd88fa10e5fe2f91bc6db8599 100644 (file)
--- a/modules/misc/quartztext.c
+++ b/modules/misc/quartztext.c
@@ -113,10 +113,10 @@ vlc_module_begin ()
               false )
     add_integer( "quartztext-rel-fontsize", DEFAULT_REL_FONT_SIZE, NULL, FONTSIZER_TEXT,
                  FONTSIZER_LONGTEXT, false )
-        change_integer_list( pi_sizes, ppsz_sizes_text, NULL );
+        change_integer_list( pi_sizes, ppsz_sizes_text )
     add_integer( "quartztext-color", 0x00FFFFFF, NULL, COLOR_TEXT,
                  COLOR_LONGTEXT, false )
-        change_integer_list( pi_color_values, ppsz_color_descriptions, NULL );
+        change_integer_list( pi_color_values, ppsz_color_descriptions )
     set_capability( "text renderer", 150 )
     add_shortcut( "text" )
     set_callbacks( Create, Destroy )

diff --git a/modules/misc/win32text.c b/modules/misc/win32text.c
index e3464674ed26ea50961fd1afe1b8455918d1fc0e..d5f0580dfacb9b6f6ff2a6afc7d9484cdd0a2a68 100644 (file)
--- a/modules/misc/win32text.c
+++ b/modules/misc/win32text.c
@@ -105,11 +105,11 @@ vlc_module_begin ()
     /* hook to the color values list, with default 0x00ffffff = white */
     add_integer( "win32text-color", 0x00FFFFFF, NULL, COLOR_TEXT,
                  COLOR_LONGTEXT, true )
-        change_integer_list( pi_color_values, ppsz_color_descriptions, NULL );
+        change_integer_list( pi_color_values, ppsz_color_descriptions )
 
     add_integer( "win32text-rel-fontsize", 16, NULL, FONTSIZER_TEXT,
                  FONTSIZER_LONGTEXT, false )
-        change_integer_list( pi_sizes, ppsz_sizes_text, NULL );
+        change_integer_list( pi_sizes, ppsz_sizes_text )
 
     set_capability( "text renderer", 50 )
     add_shortcut( "text" )

diff --git a/modules/video_filter/atmo/atmo.cpp b/modules/video_filter/atmo/atmo.cpp
index 746207468004c494b135009cd1729e83ed08a00d..b3fd071acc1ab1b694d0f13e6159fd33fb742966 100644 (file)
--- a/modules/video_filter/atmo/atmo.cpp
+++ b/modules/video_filter/atmo/atmo.cpp
@@ -372,7 +372,7 @@ set_section( N_("Choose Devicetype and Connection" ), 0 )
 add_integer( CFG_PREFIX "device", DEFAULT_DEVICE, NULL,
             DRIVER_TEXT, DRIVER_LONGTEXT, false )
 change_integer_list( pi_device_type_values,
-                     ppsz_device_type_descriptions, 0 )
+                     ppsz_device_type_descriptions )
 
 #if defined(WIN32)
 add_string(CFG_PREFIX "serialdev", "COM1", NULL,
@@ -510,7 +510,7 @@ add_integer_with_range(CFG_PREFIX "satwinsize",   3, 0, 5, NULL,
 add_integer(CFG_PREFIX "filtermode", (int)afmCombined, NULL,
             FILTERMODE_TEXT, FILTERMODE_LONGTEXT, false )
 
-change_integer_list(pi_filtermode_values, ppsz_filtermode_descriptions, NULL )
+change_integer_list(pi_filtermode_values, ppsz_filtermode_descriptions )
 
 add_integer_with_range(CFG_PREFIX "meanlength",    300, 300, 5000, NULL,
                        MEANLENGTH_TEXT, MEANLENGTH_LONGTEXT, false)
@@ -531,27 +531,27 @@ set_section( N_("Change channel assignment (fixes wrong wiring)" ), 0 )
 add_integer( CFG_PREFIX "channel_0", 4, NULL,
             CHANNEL_0_ASSIGN_TEXT, CHANNELASSIGN_LONGTEXT, false )
 change_integer_list( pi_zone_assignment_values,
-                     ppsz_zone_assignment_descriptions, 0 )
+                     ppsz_zone_assignment_descriptions )
 
 add_integer( CFG_PREFIX "channel_1", 3, NULL,
             CHANNEL_1_ASSIGN_TEXT, CHANNELASSIGN_LONGTEXT, false )
 change_integer_list( pi_zone_assignment_values,
-                     ppsz_zone_assignment_descriptions, 0 )
+                     ppsz_zone_assignment_descriptions )
 
 add_integer( CFG_PREFIX "channel_2", 1, NULL,
             CHANNEL_2_ASSIGN_TEXT, CHANNELASSIGN_LONGTEXT, false )
 change_integer_list( pi_zone_assignment_values,
-                     ppsz_zone_assignment_descriptions, 0 )
+                     ppsz_zone_assignment_descriptions )
 
 add_integer( CFG_PREFIX "channel_3", 0, NULL,
             CHANNEL_3_ASSIGN_TEXT, CHANNELASSIGN_LONGTEXT, false )
 change_integer_list( pi_zone_assignment_values,
-                     ppsz_zone_assignment_descriptions, 0 )
+                     ppsz_zone_assignment_descriptions )
 
 add_integer( CFG_PREFIX "channel_4", 2, NULL,
             CHANNEL_4_ASSIGN_TEXT, CHANNELASSIGN_LONGTEXT, false )
 change_integer_list( pi_zone_assignment_values,
-                     ppsz_zone_assignment_descriptions, 0 )
+                     ppsz_zone_assignment_descriptions )
 
 add_string(CFG_PREFIX "channels", NULL, NULL,
            CHANNELS_ASSIGN_TEXT, CHANNELS_ASSIGN_LONGTEXT, false )

diff --git a/modules/video_filter/audiobargraph_v.c b/modules/video_filter/audiobargraph_v.c
index 156b0ec1747981e961e184c0fffe10556d0ad8a6..21faa61d1022c580ad44ec7cf0fbf331760bcc04 100644 (file)
--- a/modules/video_filter/audiobargraph_v.c
+++ b/modules/video_filter/audiobargraph_v.c
@@ -94,7 +94,7 @@ vlc_module_begin ()
     add_integer_with_range( CFG_PREFIX "transparency", 255, 0, 255, NULL,
         TRANS_TEXT, TRANS_LONGTEXT, false )
     add_integer( CFG_PREFIX "position", -1, NULL, POS_TEXT, POS_LONGTEXT, false )
-        change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL )
+        change_integer_list( pi_pos_values, ppsz_pos_descriptions )
     add_integer( CFG_PREFIX "alarm", 0, NULL, ALARM_TEXT, ALARM_LONGTEXT, true )
     add_integer( CFG_PREFIX "barWidth", 10, NULL, BARWIDTH_TEXT, BARWIDTH_LONGTEXT, true )
 

diff --git a/modules/video_filter/colorthres.c b/modules/video_filter/colorthres.c
index eecbe20ac0bc7d4ab68bf263161b57eee994f0af..9d090a69be178b713b1127766a921ecb56f57552 100644 (file)
--- a/modules/video_filter/colorthres.c
+++ b/modules/video_filter/colorthres.c
@@ -74,7 +74,7 @@ vlc_module_begin ()
     set_capability( "video filter2", 0 )
     add_integer( CFG_PREFIX "color", 0x00FF0000, NULL, COLOR_TEXT,
                  COLOR_LONGTEXT, false )
-        change_integer_list( pi_color_values, ppsz_color_descriptions, NULL )
+        change_integer_list( pi_color_values, ppsz_color_descriptions )
     add_integer( CFG_PREFIX "saturationthres", 20, NULL,
                  N_("Saturaton threshold"), "", false )
     add_integer( CFG_PREFIX "similaritythres", 15, NULL,

diff --git a/modules/video_filter/extract.c b/modules/video_filter/extract.c
index d1d2e2acbce3b32ee33da250ba8176a831767843..b5cbc4cc214bea321bc85b4d9cb0478350abda70 100644 (file)
--- a/modules/video_filter/extract.c
+++ b/modules/video_filter/extract.c
@@ -80,7 +80,7 @@ vlc_module_begin ()
 
     add_integer_with_range( FILTER_PREFIX "component", 0xFF0000, 1, 0xFFFFFF,
                  NULL, COMPONENT_TEXT, COMPONENT_LONGTEXT, false )
-        change_integer_list( pi_component_values, ppsz_component_descriptions, NULL )
+        change_integer_list( pi_component_values, ppsz_component_descriptions )
 
     set_callbacks( Create, Destroy )
 vlc_module_end ()

diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c
index c548e701c47384be90d4b85a59493c72e4c8cefc..158e87d016c3040ff75df2470cae07e80136c328 100644 (file)
--- a/modules/video_filter/logo.c
+++ b/modules/video_filter/logo.c
@@ -102,7 +102,7 @@ vlc_module_begin ()
     add_integer_with_range( CFG_PREFIX "opacity", 255, 0, 255, NULL,
         OPACITY_TEXT, OPACITY_LONGTEXT, false )
     add_integer( CFG_PREFIX "position", -1, NULL, POS_TEXT, POS_LONGTEXT, false )
-        change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL )
+        change_integer_list( pi_pos_values, ppsz_pos_descriptions )
 
     /* video output filter submodule */
     add_submodule ()

diff --git a/modules/video_filter/marq.c b/modules/video_filter/marq.c
index b7cc9e930d0c6431b7750b37ef079bc059d9f891..5f47475557d424994e7f09f01f5b390302d7763a 100644 (file)
--- a/modules/video_filter/marq.c
+++ b/modules/video_filter/marq.c
@@ -158,7 +158,7 @@ vlc_module_begin ()
     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( CFG_PREFIX "position", -1, NULL, POS_TEXT, POS_LONGTEXT, false )
-        change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL )
+        change_integer_list( pi_pos_values, ppsz_pos_descriptions )
 
     set_section( N_("Font"), NULL )
     /* 5 sets the default to top [1] left [4] */
@@ -166,7 +166,7 @@ vlc_module_begin ()
         OPACITY_TEXT, OPACITY_LONGTEXT, false )
     add_integer( CFG_PREFIX "color", 0xFFFFFF, NULL, COLOR_TEXT, COLOR_LONGTEXT,
                  false )
-        change_integer_list( pi_color_values, ppsz_color_descriptions, NULL )
+        change_integer_list( pi_color_values, ppsz_color_descriptions )
     add_integer( CFG_PREFIX "size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT,
                  false )
 

diff --git a/modules/video_filter/mirror.c b/modules/video_filter/mirror.c
index 46b821674b3b582fc7b19df6e869d975fc94bab5..50049ca768dd1f7fe0d6e4c788690d00f3c041c5 100644 (file)
--- a/modules/video_filter/mirror.c
+++ b/modules/video_filter/mirror.c
@@ -84,11 +84,10 @@ vlc_module_begin ()
     add_integer( CFG_PREFIX "split", 0, NULL, ORIENTATION_TEXT,
                 ORIENTATION_LONGTEXT, false )
         change_integer_list( pi_orientation_values,
-                            ppsz_orientation_descriptions, NULL )
+                            ppsz_orientation_descriptions )
     add_integer( CFG_PREFIX "direction", 0, NULL, DIRECTION_TEXT,
                 DIRECTION_LONGTEXT, false )
-        change_integer_list( pi_direction_values, ppsz_direction_descriptions,
-                            NULL )
+        change_integer_list( pi_direction_values, ppsz_direction_descriptions )
     set_callbacks( Create, Destroy )
 vlc_module_end ()
 

diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c
index faae53dd0ea2055c5177f108922738bb87e99aff..f9979379478335b85f17a768b3c91efbde7ee58c 100644 (file)
--- a/modules/video_filter/mosaic.c
+++ b/modules/video_filter/mosaic.c
@@ -191,7 +191,7 @@ vlc_module_begin ()
 
     add_integer( CFG_PREFIX "align", 5, NULL,
                  ALIGN_TEXT, ALIGN_LONGTEXT, true)
-        change_integer_list( pi_align_values, ppsz_align_descriptions, NULL )
+        change_integer_list( pi_align_values, ppsz_align_descriptions )
 
     add_integer( CFG_PREFIX "xoffset", 0, NULL,
                  XOFFSET_TEXT, XOFFSET_LONGTEXT, true )
@@ -207,7 +207,7 @@ vlc_module_begin ()
 
     add_integer( CFG_PREFIX "position", 0, NULL,
                  POS_TEXT, POS_LONGTEXT, false )
-        change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL )
+        change_integer_list( pi_pos_values, ppsz_pos_descriptions )
     add_integer( CFG_PREFIX "rows", 2, NULL,
                  ROWS_TEXT, ROWS_LONGTEXT, false )
     add_integer( CFG_PREFIX "cols", 2, NULL,

diff --git a/modules/video_filter/osdmenu.c b/modules/video_filter/osdmenu.c
index 01560d9b25dbf6e51a55ec6ecee93bbcbf7736d7..23b2e984741fe425687892348af1037a40bff898 100644 (file)
--- a/modules/video_filter/osdmenu.c
+++ b/modules/video_filter/osdmenu.c
@@ -128,7 +128,7 @@ vlc_module_begin ()
     add_integer( OSD_CFG "y", -1, NULL, POSY_TEXT, POSY_LONGTEXT, false )
     add_integer( OSD_CFG "position", 8, NULL, POS_TEXT, POS_LONGTEXT,
                  false )
-        change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL )
+        change_integer_list( pi_pos_values, ppsz_pos_descriptions )
     add_string( OSD_CFG "file", OSD_DEFAULT_CFG, NULL, OSD_FILE_TEXT,
         OSD_FILE_LONGTEXT, false )
     add_string( OSD_CFG "file-path", NULL, NULL, OSD_PATH_TEXT,

diff --git a/modules/video_filter/rss.c b/modules/video_filter/rss.c
index a9ff0c2126879678a8e3ccaa1be977beda758760..5b74847e1a980831aac865881d3e222c861beb88 100644 (file)
--- a/modules/video_filter/rss.c
+++ b/modules/video_filter/rss.c
@@ -201,7 +201,7 @@ vlc_module_begin ()
     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( CFG_PREFIX "position", -1, NULL, POS_TEXT, POS_LONGTEXT, false )
-        change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL )
+        change_integer_list( pi_pos_values, ppsz_pos_descriptions )
 
     set_section( N_("Font"), NULL )
     /* 5 sets the default to top [1] left [4] */
@@ -209,7 +209,7 @@ vlc_module_begin ()
         OPACITY_TEXT, OPACITY_LONGTEXT, false )
     add_integer( CFG_PREFIX "color", 0xFFFFFF, NULL, COLOR_TEXT, COLOR_LONGTEXT,
                   false )
-        change_integer_list( pi_color_values, ppsz_color_descriptions, NULL )
+        change_integer_list( pi_color_values, ppsz_color_descriptions )
     add_integer( CFG_PREFIX "size", -1, NULL, SIZE_TEXT, SIZE_LONGTEXT, false )
 
     set_section( N_("Misc"), NULL )
@@ -220,7 +220,7 @@ vlc_module_begin ()
     add_integer( CFG_PREFIX "ttl", 1800, NULL, TTL_TEXT, TTL_LONGTEXT, false )
     add_bool( CFG_PREFIX "images", true, NULL, IMAGE_TEXT, IMAGE_LONGTEXT, false )
     add_integer( CFG_PREFIX "title", default_title, NULL, TITLE_TEXT, TITLE_LONGTEXT, false )
-        change_integer_list( pi_title_modes, ppsz_title_modes, NULL )
+        change_integer_list( pi_title_modes, ppsz_title_modes )
 
     set_description( N_("RSS and Atom feed display") )
     add_shortcut( "rss", "atom" )

diff --git a/modules/video_filter/swscale.c b/modules/video_filter/swscale.c
index 421c84e05e2909d5e93f458bd62a22d2ae9d7de6..f35747ccca902e1bcd0d6f1533503106a4cc8cb6 100644 (file)
--- a/modules/video_filter/swscale.c
+++ b/modules/video_filter/swscale.c
@@ -71,7 +71,7 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_VIDEO_VFILTER )
     set_callbacks( OpenScaler, CloseScaler )
     add_integer( "swscale-mode", 2, NULL, SCALEMODE_TEXT, SCALEMODE_LONGTEXT, true )
-        change_integer_list( pi_mode_values, ppsz_mode_descriptions, NULL )
+        change_integer_list( pi_mode_values, ppsz_mode_descriptions )
 vlc_module_end ()
 
 /* Version checking */

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 2fc5136f867db157676f8e48152d5f5e0a2aa4f9..c60c13939ce07dbb6d0dcdaffe2cc1a26a85e02f 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1612,7 +1612,7 @@ vlc_module_begin ()
     add_bool( "spdif", 0, NULL, SPDIF_TEXT, SPDIF_LONGTEXT, false )
     add_integer( "force-dolby-surround", 0, NULL, FORCE_DOLBY_TEXT,
                  FORCE_DOLBY_LONGTEXT, false )
-        change_integer_list( pi_force_dolby_values, ppsz_force_dolby_descriptions, NULL )
+        change_integer_list( pi_force_dolby_values, ppsz_force_dolby_descriptions )
     add_integer( "audio-desync", 0, NULL, DESYNC_TEXT,
                  DESYNC_LONGTEXT, true )
         change_safe ()
@@ -1708,7 +1708,7 @@ vlc_module_begin ()
     add_integer( "video-title-position", 8, NULL, VIDEO_TITLE_POSITION_TEXT,
                  VIDEO_TITLE_POSITION_LONGTEXT, false )
         change_safe()
-        change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL )
+        change_integer_list( pi_pos_values, ppsz_pos_descriptions )
     // autohide after 1.5s
     add_integer( "mouse-hide-timeout", 1500, NULL, MOUSE_HIDE_TIMEOUT_TEXT,
                  MOUSE_HIDE_TIMEOUT_LONGTEXT, false )
@@ -1759,11 +1759,11 @@ vlc_module_begin ()
     add_string( "video-title", NULL, NULL, VIDEO_TITLE_TEXT,
                  VIDEO_TITLE_LONGTEXT, true )
     add_integer( "align", 0, NULL, ALIGN_TEXT, ALIGN_LONGTEXT, true )
-        change_integer_list( pi_align_values, ppsz_align_descriptions, NULL )
+        change_integer_list( pi_align_values, ppsz_align_descriptions )
     add_float( "zoom", 1, NULL, ZOOM_TEXT, ZOOM_LONGTEXT, true )
     add_integer( "deinterlace", 0, NULL,
                  DEINTERLACE_TEXT, DEINTERLACE_LONGTEXT, false )
-        change_integer_list( pi_deinterlace, ppsz_deinterlace_text, 0 )
+        change_integer_list( pi_deinterlace, ppsz_deinterlace_text )
         change_safe()
     add_string( "deinterlace-mode", "blend", NULL,
                 DEINTERLACE_MODE_TEXT, DEINTERLACE_MODE_LONGTEXT, false )
@@ -1938,7 +1938,7 @@ vlc_module_begin ()
                  CR_AVERAGE_LONGTEXT, true )
     add_integer( "clock-synchro", -1, NULL, CLOCK_SYNCHRO_TEXT,
                  CLOCK_SYNCHRO_LONGTEXT, true )
-        change_integer_list( pi_clock_values, ppsz_clock_descriptions, NULL )
+        change_integer_list( pi_clock_values, ppsz_clock_descriptions )
     add_integer( "clock-jitter", 5 * CLOCK_FREQ/1000, NULL, CLOCK_JITTER_TEXT,
               CLOCK_JITTER_LONGTEXT, true )
         change_safe()
@@ -2158,7 +2158,7 @@ vlc_module_begin ()
     add_integer( "album-art", ALBUM_ART_WHEN_ASKED, NULL, ALBUM_ART_TEXT,
                  ALBUM_ART_LONGTEXT, false )
         change_integer_list( pi_albumart_values,
-                             ppsz_albumart_descriptions, 0 )
+                             ppsz_albumart_descriptions )
 
     set_subcategory( SUBCAT_PLAYLIST_SD )
     add_module_list_cat( "services-discovery", SUBCAT_PLAYLIST_SD, NULL,