[vlc-commits] config: remove advanced from add_rgb()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Apr 24 21:01:54 2018 +0300| [1bbbe098ff4b68081ac190e3114e88ca49a11377] | committer: Rémi Denis-Courmont

config: remove advanced from add_rgb()

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1bbbe098ff4b68081ac190e3114e88ca49a11377
---

 include/vlc_plugin.h                      |  2 +-
 modules/spu/marq.c                        |  3 +--
 modules/spu/rss.c                         |  3 +--
 modules/text_renderer/freetype/freetype.c | 12 ++++--------
 modules/video_filter/colorthres.c         |  3 +--
 5 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h
index 6adef10644..f2c0d48b8e 100644
--- a/include/vlc_plugin.h
+++ b/include/vlc_plugin.h
@@ -407,7 +407,7 @@ VLC_METADATA_EXPORTS
 #define add_integer( name, value, text, longtext, advc ) \
     add_int_inner(CONFIG_ITEM_INTEGER, name, text, longtext, value)
 
-#define add_rgb( name, value, text, longtext, advc ) \
+#define add_rgb(name, value, text, longtext) \
     add_int_inner(CONFIG_ITEM_RGB, name, text, longtext, value) \
     change_integer_range( 0, 0xFFFFFF )
 
diff --git a/modules/spu/marq.c b/modules/spu/marq.c
index ebd1704374..2ac1f41a3f 100644
--- a/modules/spu/marq.c
+++ b/modules/spu/marq.c
@@ -158,8 +158,7 @@ vlc_module_begin ()
     /* 5 sets the default to top [1] left [4] */
     add_integer_with_range( CFG_PREFIX "opacity", 255, 0, 255,
         OPACITY_TEXT, OPACITY_LONGTEXT, false )
-    add_rgb( CFG_PREFIX "color", 0xFFFFFF, COLOR_TEXT, COLOR_LONGTEXT,
-                 false )
+    add_rgb(CFG_PREFIX "color", 0xFFFFFF, COLOR_TEXT, COLOR_LONGTEXT)
         change_integer_list( pi_color_values, ppsz_color_descriptions )
     add_integer( CFG_PREFIX "size", 0, SIZE_TEXT, SIZE_LONGTEXT,
                  false )
diff --git a/modules/spu/rss.c b/modules/spu/rss.c
index 8fbefd05ff..6df542ce80 100644
--- a/modules/spu/rss.c
+++ b/modules/spu/rss.c
@@ -205,8 +205,7 @@ vlc_module_begin ()
     /* 5 sets the default to top [1] left [4] */
     add_integer_with_range( CFG_PREFIX "opacity", 255, 0, 255,
         OPACITY_TEXT, OPACITY_LONGTEXT, false )
-    add_rgb( CFG_PREFIX "color", 0xFFFFFF, COLOR_TEXT, COLOR_LONGTEXT,
-                  false )
+    add_rgb(CFG_PREFIX "color", 0xFFFFFF, COLOR_TEXT, COLOR_LONGTEXT)
         change_integer_list( pi_color_values, ppsz_color_descriptions )
     add_integer( CFG_PREFIX "size", 0, SIZE_TEXT, SIZE_LONGTEXT, false )
         change_integer_range( 0, 4096)
diff --git a/modules/text_renderer/freetype/freetype.c b/modules/text_renderer/freetype/freetype.c
index 7eb8699229..a810816144 100644
--- a/modules/text_renderer/freetype/freetype.c
+++ b/modules/text_renderer/freetype/freetype.c
@@ -163,8 +163,7 @@ vlc_module_begin ()
         change_safe()
 
     /* hook to the color values list, with default 0x00ffffff = white */
-    add_rgb( "freetype-color", 0x00FFFFFF, COLOR_TEXT,
-                 COLOR_LONGTEXT, false )
+    add_rgb("freetype-color", 0x00FFFFFF, COLOR_TEXT, COLOR_LONGTEXT)
         change_integer_list( pi_color_values, ppsz_color_descriptions )
         change_integer_range( 0x000000, 0xFFFFFF )
         change_safe()
@@ -175,8 +174,7 @@ vlc_module_begin ()
     add_integer_with_range( "freetype-background-opacity", 0, 0, 255,
                             BG_OPACITY_TEXT, NULL, false )
         change_safe()
-    add_rgb( "freetype-background-color", 0x00000000, BG_COLOR_TEXT,
-             NULL, false )
+    add_rgb("freetype-background-color", 0x00000000, BG_COLOR_TEXT, NULL)
         change_integer_list( pi_color_values, ppsz_color_descriptions )
         change_integer_range( 0x000000, 0xFFFFFF )
         change_safe()
@@ -184,8 +182,7 @@ vlc_module_begin ()
     add_integer_with_range( "freetype-outline-opacity", 255, 0, 255,
                             OUTLINE_OPACITY_TEXT, NULL, false )
         change_safe()
-    add_rgb( "freetype-outline-color", 0x00000000, OUTLINE_COLOR_TEXT,
-             NULL, false )
+    add_rgb("freetype-outline-color", 0x00000000, OUTLINE_COLOR_TEXT, NULL)
         change_integer_list( pi_color_values, ppsz_color_descriptions )
         change_integer_range( 0x000000, 0xFFFFFF )
         change_safe()
@@ -197,8 +194,7 @@ vlc_module_begin ()
     add_integer_with_range( "freetype-shadow-opacity", 128, 0, 255,
                             SHADOW_OPACITY_TEXT, NULL, false )
         change_safe()
-    add_rgb( "freetype-shadow-color", 0x00000000, SHADOW_COLOR_TEXT,
-             NULL, false )
+    add_rgb("freetype-shadow-color", 0x00000000, SHADOW_COLOR_TEXT, NULL)
         change_integer_list( pi_color_values, ppsz_color_descriptions )
         change_integer_range( 0x000000, 0xFFFFFF )
         change_safe()
diff --git a/modules/video_filter/colorthres.c b/modules/video_filter/colorthres.c
index 1900c56807..319b806915 100644
--- a/modules/video_filter/colorthres.c
+++ b/modules/video_filter/colorthres.c
@@ -73,8 +73,7 @@ vlc_module_begin ()
     set_category( CAT_VIDEO )
     set_subcategory( SUBCAT_VIDEO_VFILTER )
     set_capability( "video filter", 0 )
-    add_rgb( CFG_PREFIX "color", 0x00FF0000, COLOR_TEXT,
-                 COLOR_LONGTEXT, false )
+    add_rgb(CFG_PREFIX "color", 0x00FF0000, COLOR_TEXT, COLOR_LONGTEXT)
         change_integer_list( pi_color_values, ppsz_color_descriptions )
     add_integer( CFG_PREFIX "saturationthres", 20,
                  N_("Saturation threshold"), "", false )