[vlc-commits] config: remove advanced from add_module()
Rémi Denis-Courmont
git at videolan.org
Tue Apr 24 20:42:31 CEST 2018
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Apr 24 21:01:54 2018 +0300| [e66e6b6b03d31be7fa97aff3e59107ad1dba18bd] | committer: Rémi Denis-Courmont
config: remove advanced from add_module()
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e66e6b6b03d31be7fa97aff3e59107ad1dba18bd
---
include/vlc_plugin.h | 2 +-
modules/audio_output/mmdevice.c | 3 +--
modules/codec/avcodec/avcodec.c | 2 +-
modules/demux/demuxdump.c | 4 ++--
modules/stream_out/transcode/transcode.c | 12 +++++------
modules/video_output/opengl/display.c | 6 ++----
modules/video_output/opengl/vout_helper.h | 2 +-
src/libvlc-module.c | 35 +++++++++++++++----------------
8 files changed, 31 insertions(+), 35 deletions(-)
diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h
index a2ed57c2cd..10c0af3255 100644
--- a/include/vlc_plugin.h
+++ b/include/vlc_plugin.h
@@ -385,7 +385,7 @@ VLC_METADATA_EXPORTS
#define add_font(name, value, text, longtext) \
add_string_inner(CONFIG_ITEM_FONT, name, text, longtext, value)
-#define add_module( name, psz_caps, value, text, longtext, advc ) \
+#define add_module(name, psz_caps, value, text, longtext) \
add_string_inner(CONFIG_ITEM_MODULE, name, text, longtext, value) \
vlc_config_set (VLC_CONFIG_CAPABILITY, (const char *)(psz_caps));
diff --git a/modules/audio_output/mmdevice.c b/modules/audio_output/mmdevice.c
index 50fd440639..5949c87009 100644
--- a/modules/audio_output/mmdevice.c
+++ b/modules/audio_output/mmdevice.c
@@ -1471,8 +1471,7 @@ vlc_module_begin()
set_subcategory(SUBCAT_AUDIO_AOUT)
set_callbacks(Open, Close)
add_module("mmdevice-backend", "aout stream", "any",
- N_("Output back-end"), N_("Audio output back-end interface."),
- true)
+ N_("Output back-end"), N_("Audio output back-end interface."))
add_integer( "mmdevice-passthrough", MM_PASSTHROUGH_DEFAULT,
MM_PASSTHROUGH_TEXT, MM_PASSTHROUGH_LONGTEXT, false )
change_integer_list( pi_mmdevice_passthrough_values,
diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c
index 9325b1fb0e..0e08c11fc6 100644
--- a/modules/codec/avcodec/avcodec.c
+++ b/modules/codec/avcodec/avcodec.c
@@ -132,7 +132,7 @@ vlc_module_begin ()
add_obsolete_string( "ffmpeg-codec" ) /* removed since 2.1.0 */
add_string( "avcodec-codec", NULL, CODEC_TEXT, CODEC_LONGTEXT, true )
add_obsolete_bool( "ffmpeg-hw" ) /* removed since 2.1.0 */
- add_module( "avcodec-hw", "hw decoder", "any", HW_TEXT, HW_LONGTEXT, false )
+ add_module("avcodec-hw", "hw decoder", "any", HW_TEXT, HW_LONGTEXT)
#if defined(FF_THREAD_FRAME)
add_obsolete_integer( "ffmpeg-threads" ) /* removed since 2.1.0 */
add_integer( "avcodec-threads", 0, THREADS_TEXT, THREADS_LONGTEXT, true );
diff --git a/modules/demux/demuxdump.c b/modules/demux/demuxdump.c
index 2bd04884e1..ab47bc69b5 100644
--- a/modules/demux/demuxdump.c
+++ b/modules/demux/demuxdump.c
@@ -46,8 +46,8 @@ vlc_module_begin ()
set_subcategory( SUBCAT_INPUT_DEMUX )
set_description( N_("File dumper") )
set_capability( "demux", 0 )
- add_module( "demuxdump-access", "sout access", "file", ACCESS_TEXT,
- ACCESS_TEXT, true )
+ add_module("demuxdump-access", "sout access", "file",
+ ACCESS_TEXT, ACCESS_TEXT)
add_savefile("demuxdump-file", "stream-demux.dump",
FILE_TEXT, FILE_LONGTEXT)
add_bool( "demuxdump-append", false, APPEND_TEXT, APPEND_LONGTEXT,
diff --git a/modules/stream_out/transcode/transcode.c b/modules/stream_out/transcode/transcode.c
index 9cd403f4f6..684c3b9a0d 100644
--- a/modules/stream_out/transcode/transcode.c
+++ b/modules/stream_out/transcode/transcode.c
@@ -151,8 +151,8 @@ vlc_module_begin ()
set_category( CAT_SOUT )
set_subcategory( SUBCAT_SOUT_STREAM )
set_section( N_("Video"), NULL )
- add_module( SOUT_CFG_PREFIX "venc", "encoder", NULL, VENC_TEXT,
- VENC_LONGTEXT, false )
+ add_module(SOUT_CFG_PREFIX "venc", "encoder", NULL,
+ VENC_TEXT, VENC_LONGTEXT)
add_string( SOUT_CFG_PREFIX "vcodec", NULL, VCODEC_TEXT,
VCODEC_LONGTEXT, false )
add_integer( SOUT_CFG_PREFIX "vb", 0, VB_TEXT,
@@ -180,8 +180,8 @@ vlc_module_begin ()
NULL, VFILTER_TEXT, VFILTER_LONGTEXT, false )
set_section( N_("Audio"), NULL )
- add_module( SOUT_CFG_PREFIX "aenc", "encoder", NULL, AENC_TEXT,
- AENC_LONGTEXT, false )
+ add_module(SOUT_CFG_PREFIX "aenc", "encoder", NULL,
+ AENC_TEXT, AENC_LONGTEXT)
add_string( SOUT_CFG_PREFIX "acodec", NULL, ACODEC_TEXT,
ACODEC_LONGTEXT, false )
add_integer( SOUT_CFG_PREFIX "ab", 96, AB_TEXT,
@@ -199,8 +199,8 @@ vlc_module_begin ()
NULL, AFILTER_TEXT, AFILTER_LONGTEXT, false )
set_section( N_("Overlays/Subtitles"), NULL )
- add_module( SOUT_CFG_PREFIX "senc", "encoder", NULL, SENC_TEXT,
- SENC_LONGTEXT, false )
+ add_module(SOUT_CFG_PREFIX "senc", "encoder", NULL,
+ SENC_TEXT, SENC_LONGTEXT)
add_string( SOUT_CFG_PREFIX "scodec", NULL, SCODEC_TEXT,
SCODEC_LONGTEXT, false )
add_bool( SOUT_CFG_PREFIX "soverlay", false, SCODEC_TEXT,
diff --git a/modules/video_output/opengl/display.c b/modules/video_output/opengl/display.c
index e317397c9b..e87311f33c 100644
--- a/modules/video_output/opengl/display.c
+++ b/modules/video_output/opengl/display.c
@@ -51,8 +51,7 @@ vlc_module_begin ()
set_capability ("vout display", 265)
set_callbacks (Open, Close)
add_shortcut ("opengles2", "gles2")
- add_module ("gles2", "opengl es2", NULL,
- GLES2_TEXT, PROVIDER_LONGTEXT, true)
+ add_module("gles2", "opengl es2", NULL, GLES2_TEXT, PROVIDER_LONGTEXT)
#else
@@ -65,8 +64,7 @@ vlc_module_begin ()
set_capability ("vout display", 270)
set_callbacks (Open, Close)
add_shortcut ("opengl", "gl")
- add_module ("gl", "opengl", NULL,
- GL_TEXT, PROVIDER_LONGTEXT, true)
+ add_module("gl", "opengl", NULL, GL_TEXT, PROVIDER_LONGTEXT)
#endif
add_glopts ()
vlc_module_end ()
diff --git a/modules/video_output/opengl/vout_helper.h b/modules/video_output/opengl/vout_helper.h
index bd4126c632..bc76ad956e 100644
--- a/modules/video_output/opengl/vout_helper.h
+++ b/modules/video_output/opengl/vout_helper.h
@@ -202,7 +202,7 @@ static const char * const dither_text[] = {
"Force a \"glconv\" module.")
#define add_glopts() \
- add_module ("glconv", "glconv", NULL, GLCONV_TEXT, GLCONV_LONGTEXT, true) \
+ add_module("glconv", "glconv", NULL, GLCONV_TEXT, GLCONV_LONGTEXT) \
add_glopts_placebo ()
static const vlc_fourcc_t gl_subpicture_chromas[] = {
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 9b50d63184..765ff8f1f7 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1527,8 +1527,7 @@ vlc_module_begin ()
AUDIO_TIME_STRETCH_TEXT, AUDIO_TIME_STRETCH_LONGTEXT, false )
set_subcategory( SUBCAT_AUDIO_AOUT )
- add_module( "aout", "audio output", NULL, AOUT_TEXT, AOUT_LONGTEXT,
- true )
+ add_module("aout", "audio output", NULL, AOUT_TEXT, AOUT_LONGTEXT)
change_short('A')
add_string( "role", "video", ROLE_TEXT, ROLE_LONGTEXT, true )
change_string_list( ppsz_roles, ppsz_roles_text )
@@ -1537,12 +1536,12 @@ vlc_module_begin ()
add_module_list( "audio-filter", "audio filter", NULL,
AUDIO_FILTER_TEXT, AUDIO_FILTER_LONGTEXT, false )
set_subcategory( SUBCAT_AUDIO_VISUAL )
- add_module( "audio-visual", "visualization", "none", AUDIO_VISUAL_TEXT,
- AUDIO_VISUAL_LONGTEXT, false )
+ add_module("audio-visual", "visualization", "none",
+ AUDIO_VISUAL_TEXT, AUDIO_VISUAL_LONGTEXT)
set_subcategory( SUBCAT_AUDIO_RESAMPLER )
- add_module( "audio-resampler", "audio resampler", NULL,
- AUDIO_RESAMPLER_TEXT, AUDIO_RESAMPLER_LONGTEXT, true )
+ add_module("audio-resampler", "audio resampler", NULL,
+ AUDIO_RESAMPLER_TEXT, AUDIO_RESAMPLER_LONGTEXT)
/* Video options */
@@ -1653,7 +1652,7 @@ vlc_module_begin ()
change_safe()
set_subcategory( SUBCAT_VIDEO_VOUT )
- add_module( "vout", "vout display", NULL, VOUT_TEXT, VOUT_LONGTEXT, true )
+ add_module("vout", "vout display", NULL, VOUT_TEXT, VOUT_LONGTEXT)
change_short('V')
set_subcategory( SUBCAT_VIDEO_VFILTER )
@@ -1676,8 +1675,8 @@ vlc_module_begin ()
add_bool( "spu", 1, SPU_TEXT, SPU_LONGTEXT, false )
change_safe ()
add_bool( "osd", 1, OSD_TEXT, OSD_LONGTEXT, false )
- add_module( "text-renderer", "text renderer", NULL, TEXTRENDERER_TEXT,
- TEXTRENDERER_LONGTEXT, true )
+ add_module("text-renderer", "text renderer", NULL,
+ TEXTRENDERER_TEXT, TEXTRENDERER_LONGTEXT)
set_section( N_("Subtitles") , NULL )
add_loadfile("sub-file", NULL, SUB_FILE_TEXT, SUB_FILE_LONGTEXT)
@@ -1937,10 +1936,10 @@ vlc_module_begin ()
set_subcategory( SUBCAT_INPUT_ACCESS )
add_category_hint(N_("Input"), INPUT_CAT_LONGTEXT)
- add_module( "access", "access", NULL, ACCESS_TEXT, ACCESS_LONGTEXT, true )
+ add_module("access", "access", NULL, ACCESS_TEXT, ACCESS_LONGTEXT)
set_subcategory( SUBCAT_INPUT_DEMUX )
- add_module( "demux", "demux", "any", DEMUX_TEXT, DEMUX_LONGTEXT, true )
+ add_module("demux", "demux", "any", DEMUX_TEXT, DEMUX_LONGTEXT)
set_subcategory( SUBCAT_INPUT_ACODEC )
set_subcategory( SUBCAT_INPUT_SCODEC )
add_obsolete_bool( "prefer-system-codecs" )
@@ -1981,18 +1980,18 @@ vlc_module_begin ()
ANN_SAPINTV_LONGTEXT, true )
set_subcategory( SUBCAT_SOUT_MUX )
- add_module( "mux", "sout mux", NULL, MUX_TEXT, MUX_LONGTEXT, true )
+ add_module("mux", "sout mux", NULL, MUX_TEXT, MUX_LONGTEXT)
set_subcategory( SUBCAT_SOUT_ACO )
- add_module( "access_output", "sout access", NULL,
- ACCESS_OUTPUT_TEXT, ACCESS_OUTPUT_LONGTEXT, true )
+ add_module("access_output", "sout access", NULL,
+ ACCESS_OUTPUT_TEXT, ACCESS_OUTPUT_LONGTEXT)
add_integer( "ttl", -1, TTL_TEXT, TTL_LONGTEXT, true )
add_string( "miface", NULL, MIFACE_TEXT, MIFACE_LONGTEXT, true )
add_obsolete_string( "miface-addr" ) /* since 2.0.0 */
add_integer( "dscp", 0, DSCP_TEXT, DSCP_LONGTEXT, true )
set_subcategory( SUBCAT_SOUT_PACKETIZER )
- add_module( "packetizer", "packetizer", NULL,
- PACKETIZER_TEXT, PACKETIZER_LONGTEXT, true )
+ add_module("packetizer", "packetizer", NULL,
+ PACKETIZER_TEXT, PACKETIZER_LONGTEXT)
set_subcategory( SUBCAT_SOUT_VOD )
@@ -2018,8 +2017,8 @@ vlc_module_begin ()
set_subcategory( SUBCAT_ADVANCED_MISC )
set_section( N_("Special modules"), NULL )
add_category_hint(N_("Miscellaneous"), MISC_CAT_LONGTEXT)
- add_module( "vod-server", "vod server", NULL, VOD_SERVER_TEXT,
- VOD_SERVER_LONGTEXT, true )
+ add_module("vod-server", "vod server", NULL,
+ VOD_SERVER_TEXT, VOD_SERVER_LONGTEXT)
set_section( N_("Plugins" ), NULL )
#ifdef HAVE_DYNAMIC_PLUGINS
More information about the vlc-commits
mailing list