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

[Rémi Denis-Courmont]

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

config: remove advanced from add_directory()

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

 include/vlc_plugin.h               |  2 +-
 modules/gui/ncurses.c              |  2 +-
 modules/visualization/projectm.cpp |  4 ++--
 src/libvlc-module.c                | 11 +++++------
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h
index 015ea817ea..6f7c2565d5 100644
--- a/include/vlc_plugin.h
+++ b/include/vlc_plugin.h
@@ -379,7 +379,7 @@ VLC_METADATA_EXPORTS
 #define add_savefile(name, value, text, longtext) \
     add_string_inner(CONFIG_ITEM_SAVEFILE, name, text, longtext, value)
 
-#define add_directory( name, value, text, longtext, advc ) \
+#define add_directory(name, value, text, longtext) \
     add_string_inner(CONFIG_ITEM_DIRECTORY, name, text, longtext, value)
 
 #define add_font( name, value, text, longtext, advc )\
diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c
index ef4d5c0bf2..876eda8ac4 100644
--- a/modules/gui/ncurses.c
+++ b/modules/gui/ncurses.c
@@ -81,7 +81,7 @@ vlc_module_begin ()
     set_subcategory(SUBCAT_INTERFACE_MAIN)
     set_callbacks(Open, Close)
     add_shortcut("curses")
-    add_directory("browse-dir", NULL, BROWSE_TEXT, BROWSE_LONGTEXT, false)
+    add_directory("browse-dir", NULL, BROWSE_TEXT, BROWSE_LONGTEXT)
 vlc_module_end ()
 
 #include "eject.c"
diff --git a/modules/visualization/projectm.cpp b/modules/visualization/projectm.cpp
index e6dbe8d85a..746c7c92ea 100644
--- a/modules/visualization/projectm.cpp
+++ b/modules/visualization/projectm.cpp
@@ -107,8 +107,8 @@ vlc_module_begin ()
     add_loadfile("projectm-config", "/usr/share/projectM/config.inp",
                  CONFIG_TEXT, CONFIG_LONGTEXT)
 #else
-    add_directory( "projectm-preset-path", PRESET_PATH,
-                  PRESET_PATH_TXT, PRESET_PATH_LONGTXT, true )
+    add_directory("projectm-preset-path", PRESET_PATH,
+                  PRESET_PATH_TXT, PRESET_PATH_LONGTXT)
     add_loadfile("projectm-title-font", FONT_PATH,
                  TITLE_FONT_TXT, TITLE_FONT_LONGTXT)
     add_loadfile("projectm-menu-font", FONT_PATH_MENU,
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index f88d1c78c1..9b50d63184 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1596,8 +1596,7 @@ vlc_module_begin ()
     add_integer( "mouse-hide-timeout", 1000, MOUSE_HIDE_TIMEOUT_TEXT,
                  MOUSE_HIDE_TIMEOUT_LONGTEXT, false )
     set_section( N_("Snapshot") , NULL )
-    add_directory( "snapshot-path", NULL, SNAP_PATH_TEXT,
-                   SNAP_PATH_LONGTEXT, false )
+    add_directory("snapshot-path", NULL, SNAP_PATH_TEXT, SNAP_PATH_LONGTEXT)
     add_string( "snapshot-prefix", "vlcsnap-", SNAP_PREFIX_TEXT,
                    SNAP_PREFIX_LONGTEXT, false )
     add_string( "snapshot-format", "png", SNAP_FORMAT_TEXT,
@@ -1914,13 +1913,13 @@ vlc_module_begin ()
     add_bool( "network-synchronisation", false, NETSYNC_TEXT,
               NETSYNC_LONGTEXT, true )
 
-    add_directory( "input-record-path", NULL, INPUT_RECORD_PATH_TEXT,
-                INPUT_RECORD_PATH_LONGTEXT, true )
+    add_directory("input-record-path", NULL,
+                  INPUT_RECORD_PATH_TEXT, INPUT_RECORD_PATH_LONGTEXT)
     add_bool( "input-record-native", true, INPUT_RECORD_NATIVE_TEXT,
               INPUT_RECORD_NATIVE_LONGTEXT, true )
 
-    add_directory( "input-timeshift-path", NULL, INPUT_TIMESHIFT_PATH_TEXT,
-                INPUT_TIMESHIFT_PATH_LONGTEXT, true )
+    add_directory("input-timeshift-path", NULL,
+                  INPUT_TIMESHIFT_PATH_TEXT, INPUT_TIMESHIFT_PATH_LONGTEXT)
     add_integer( "input-timeshift-granularity", -1, INPUT_TIMESHIFT_GRANULARITY_TEXT,
                  INPUT_TIMESHIFT_GRANULARITY_LONGTEXT, true )