*: unify 'none' vs. 'None' (-1 l10n string)

[vlc] / include / vlc_plugin.h

diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h
index 49adb532edf14dae5ea2be2b14339bab091d6b2b..276ebc3ab5c7f40b611abff445ed51e184a24195 100644 (file)
--- a/include/vlc_plugin.h
+++ b/include/vlc_plugin.h
@@ -91,13 +91,20 @@ enum vlc_module_properties
     VLC_CONFIG_DESC,
     /* description (args=const char *, const char *, const char *) */
 
-    VLC_CONFIG_LIST,
-    /* possible values list
-     * (args=const char *, size_t, const <type> *, const char *const *) */
+    VLC_CONFIG_LIST_OBSOLETE,
+    /* unused (ignored) */
 
     VLC_CONFIG_ADD_ACTION_OBSOLETE,
     /* unused (ignored) */
 
+    VLC_CONFIG_LIST,
+    /* list of suggested values
+     * (args=size_t, const <type> *, const char *const *) */
+
+    VLC_CONFIG_LIST_CB,
+    /* callback for suggested values
+     * (args=size_t (*)(vlc_object_t *, <type> **, char ***)) */
+
     /* Insert new VLC_CONFIG_* here */
 };
 
@@ -148,9 +155,7 @@ enum vlc_module_properties
 #define SUBCAT_VIDEO_GENERAL 301
 #define SUBCAT_VIDEO_VOUT 302
 #define SUBCAT_VIDEO_VFILTER 303
-#define SUBCAT_VIDEO_TEXT 304
 #define SUBCAT_VIDEO_SUBPIC 305
-#define SUBCAT_VIDEO_VFILTER2 306
 
 #define CAT_INPUT 4
 #define SUBCAT_INPUT_GENERAL 401
@@ -167,23 +172,17 @@ enum vlc_module_properties
 #define SUBCAT_SOUT_MUX 503
 #define SUBCAT_SOUT_ACO 504
 #define SUBCAT_SOUT_PACKETIZER 505
-#define SUBCAT_SOUT_SAP 506
 #define SUBCAT_SOUT_VOD 507
 
 #define CAT_ADVANCED 6
-#define SUBCAT_ADVANCED_CPU 601
 #define SUBCAT_ADVANCED_MISC 602
 #define SUBCAT_ADVANCED_NETWORK 603
-#define SUBCAT_ADVANCED_XML 604
 
 #define CAT_PLAYLIST 7
 #define SUBCAT_PLAYLIST_GENERAL 701
 #define SUBCAT_PLAYLIST_SD 702
 #define SUBCAT_PLAYLIST_EXPORT 703
 
-#define CAT_OSD 8
-#define SUBCAT_OSD_IMPORT 801
-
 
 /**
  * Current plugin ABI version
@@ -473,18 +472,19 @@ VLC_METADATA_EXPORTS
     vlc_config_set (VLC_CONFIG_LIST, \
                     (size_t)(sizeof (list) / sizeof (char *)), \
                     (const char *const *)(list), \
-                    (const char *const *)(list_text), \
-                    (vlc_callback_t)NULL);
+                    (const char *const *)(list_text));
 
 #define change_string_cb( cb ) \
-    vlc_config_set (VLC_CONFIG_LIST, 0, NULL, NULL, (vlc_callback_t)(cb));
+    vlc_config_set (VLC_CONFIG_LIST_CB, (cb));
 
 #define change_integer_list( list, list_text ) \
     vlc_config_set (VLC_CONFIG_LIST, \
                     (size_t)(sizeof (list) / sizeof (int)), \
                     (const int *)(list), \
-                    (const char *const *)(list_text), \
-                    (vlc_callback_t)(NULL));
+                    (const char *const *)(list_text));
+
+#define change_integer_cb( cb ) \
+    vlc_config_set (VLC_CONFIG_LIST_CB, (cb));
 
 #define change_integer_range( minv, maxv ) \
     vlc_config_set (VLC_CONFIG_RANGE, (int64_t)(minv), (int64_t)(maxv));