add_directory: remove callback parameter

diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h
index 5a1ec86cd905d64d6a68328def2a9c92be47ce6b..1dcee2d1c945b7ad2595629b8ec102161e8f1f56 100644 (file)
--- a/include/vlc_plugin.h
+++ b/include/vlc_plugin.h
@@ -315,7 +315,7 @@ enum vlc_module_properties
     add_string_inner( CONFIG_ITEM_SAVEFILE, name, text, longtext, advc, \
                       value )
 
-#define add_directory( name, value, p_callback, text, longtext, advc ) \
+#define add_directory( name, value, text, longtext, advc ) \
     add_string_inner( CONFIG_ITEM_DIRECTORY, name, text, longtext, advc, \
                       value )
 

diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c
index e1f190a3f503a6562d79d8d8ae4b0517c3f05797..143b8716d608e42edb1721cc0358a4ddcf689861 100644 (file)
--- a/modules/gui/ncurses.c
+++ b/modules/gui/ncurses.c
@@ -113,7 +113,7 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_INTERFACE_MAIN )
     set_callbacks( Open, Close )
     add_shortcut( "curses" )
-    add_directory( "browse-dir", NULL, NULL, BROWSE_TEXT, BROWSE_LONGTEXT, false )
+    add_directory( "browse-dir", NULL, BROWSE_TEXT, BROWSE_LONGTEXT, false )
 vlc_module_end ()
 
 /*****************************************************************************

diff --git a/modules/video_filter/atmo/atmo.cpp b/modules/video_filter/atmo/atmo.cpp
index bbb19f6d107f591f9678af9ea59b8456c2e743a1..f19ee4b01278ffeeb52d9d2db2ce9cc9a0812012 100644 (file)
--- a/modules/video_filter/atmo/atmo.cpp
+++ b/modules/video_filter/atmo/atmo.cpp
@@ -593,7 +593,7 @@ add_loadfile(CFG_PREFIX "gradient_zone_3", NULL,
              ZONE_3_GRADIENT_TEXT, ZONE_X_GRADIENT_LONG_TEXT, true )
 add_loadfile(CFG_PREFIX "gradient_zone_4", NULL,
              ZONE_4_GRADIENT_TEXT, ZONE_X_GRADIENT_LONG_TEXT, true )
-add_directory(CFG_PREFIX "gradient_path", NULL, NULL,
+add_directory(CFG_PREFIX "gradient_path", NULL,
            GRADIENT_PATH_TEXT, GRADIENT_PATH_LONGTEXT, false )
 
 #if defined(__ATMO_DEBUG__)

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index bff8677b51b84bdc6ede00c9ad528a12306c7300..ae0c7df8ade2914bb94bc74b1f4edd8c65774051 100644 (file)
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1713,7 +1713,7 @@ vlc_module_begin ()
     add_integer( "mouse-hide-timeout", 1500, NULL, MOUSE_HIDE_TIMEOUT_TEXT,
                  MOUSE_HIDE_TIMEOUT_LONGTEXT, false )
     set_section( N_("Snapshot") , NULL )
-    add_directory( "snapshot-path", NULL, NULL, SNAP_PATH_TEXT,
+    add_directory( "snapshot-path", NULL, SNAP_PATH_TEXT,
                    SNAP_PATH_LONGTEXT, false )
     add_string( "snapshot-prefix", "vlcsnap-", SNAP_PREFIX_TEXT,
                    SNAP_PREFIX_LONGTEXT, false )
@@ -2074,10 +2074,10 @@ vlc_module_begin ()
     add_bool( "plugins-cache", true, NULL, PLUGINS_CACHE_TEXT,
               PLUGINS_CACHE_LONGTEXT, true )
         change_need_restart ()
-    add_directory( "plugin-path", NULL, NULL, PLUGIN_PATH_TEXT,
+    add_directory( "plugin-path", NULL, PLUGIN_PATH_TEXT,
                    PLUGIN_PATH_LONGTEXT, true )
         change_need_restart ()
-    add_directory( "data-path", NULL, NULL, DATA_PATH_TEXT,
+    add_directory( "data-path", NULL, DATA_PATH_TEXT,
                    DATA_PATH_LONGTEXT, true )
         change_need_restart ()