decoder: add input_DecoderFlush()

[vlc] / include / vlc_configuration.h

diff --git a/include/vlc_configuration.h b/include/vlc_configuration.h
index 02a8486b96b2e5010af1a02d466a1fb7e849304b..fe0aba5ca8b9d5bb60afd0ac9027d023b1862f2f 100644 (file)
--- a/include/vlc_configuration.h
+++ b/include/vlc_configuration.h
@@ -54,23 +54,19 @@ typedef union
 
 typedef int (*vlc_string_list_cb)(vlc_object_t *, const char *,
                                   char ***, char ***);
+typedef int (*vlc_integer_list_cb)(vlc_object_t *, const char *,
+                                   int64_t **, char ***);
 
 struct module_config_t
 {
-    union
-    {
-        struct
-        {
-            uint8_t     i_type;                        /* Configuration type */
-            char        i_short;               /* Optional short option name */
-            unsigned    b_advanced:1;                     /* Advanced option */
-            unsigned    b_internal:1;          /* Hidden from prefs and help */
-            unsigned    b_unsaveable:1;       /* Not stored in configuration */
-            unsigned    b_safe:1;       /* Safe in web plugins and playlists */
-            unsigned    b_removed:1;                           /* Deprecated */
-        };
-        uint32_t flags;
-    };
+    uint8_t     i_type;                        /* Configuration type */
+    char        i_short;               /* Optional short option name */
+    unsigned    b_advanced:1;                     /* Advanced option */
+    unsigned    b_internal:1;          /* Hidden from prefs and help */
+    unsigned    b_unsaveable:1;       /* Not stored in configuration */
+    unsigned    b_safe:1;       /* Safe in web plugins and playlists */
+    unsigned    b_removed:1;                           /* Deprecated */
+
     char *psz_type;                                 /* Configuration subtype */
     char *psz_name;                                           /* Option name */
     char *psz_text;             /* Short comment on the configuration option */
@@ -88,6 +84,7 @@ struct module_config_t
         char **psz;               /* List of possible values for the option */
         int   *i;
         vlc_string_list_cb psz_cb;
+        vlc_integer_list_cb i_cb;
     } list;
     char **list_text;                      /* Friendly names for list values */
 };
@@ -117,7 +114,6 @@ VLC_API void config_ResetAll( vlc_object_t * );
 VLC_API module_config_t * config_FindConfig( vlc_object_t *, const char * ) VLC_USED;
 VLC_API char * config_GetDataDir(void) VLC_USED VLC_MALLOC;
 VLC_API char *config_GetLibDir(void) VLC_USED;
-VLC_API const char * config_GetConfDir( void ) VLC_USED;
 
 typedef enum vlc_userdir
 {