Use var_InheritString for --decklink-video-connection.

[vlc] / include / vlc_configuration.h

diff --git a/include/vlc_configuration.h b/include/vlc_configuration.h
index 4360fad7d632dfd5fddb07e2be7cd14389275f1e..c2c544a22af89bd462a499ca3ff06b5a4bc0f2d4 100644 (file)
--- a/include/vlc_configuration.h
+++ b/include/vlc_configuration.h
@@ -137,29 +137,21 @@ struct config_category_t
 typedef union
 {
     char       *psz;
-    int         i;
+    int64_t     i;
     float       f;
 } module_value_t;
 
-typedef union
-{
-    int         i;
-    float       f;
-} module_nvalue_t;
-
 struct module_config_t
 {
-    int          i_type;                               /* Configuration type */
     char        *psz_type;                          /* Configuration subtype */
     char        *psz_name;                                    /* Option name */
-    char         i_short;                      /* Optional short option name */
     char        *psz_text;      /* Short comment on the configuration option */
     char        *psz_longtext;   /* Long comment on the configuration option */
     module_value_t value;                                    /* Option value */
     module_value_t orig;
     module_value_t saved;
-    module_nvalue_t min;
-    module_nvalue_t max;
+    module_value_t min;
+    module_value_t max;
 
     /* Function to call when commiting a change */
     vlc_callback_t pf_callback;
@@ -170,12 +162,18 @@ struct module_config_t
     int         *pi_list;                              /* Idem for integers */
     char       **ppsz_list_text;          /* Friendly names for list values */
     int          i_list;                               /* Options list size */
+    int          i_type;                               /* Configuration type */
     vlc_callback_t pf_update_list; /*callback to initialize dropdownlists */
+    char         i_short;                      /* Optional short option name */
 
     /* Actions list */
+    int            i_action;                           /* actions list size */
     vlc_callback_t *ppf_action;    /* List of possible actions for a config */
     char          **ppsz_action_text;         /* Friendly names for actions */
-    int            i_action;                           /* actions list size */
+
+    /* Deprecated */
+    char        *psz_oldname;                          /* Old option name */
+    bool        b_removed;
 
     /* Misc */
     bool        b_dirty;          /* Dirty flag to indicate a config change */
@@ -183,11 +181,6 @@ struct module_config_t
     bool        b_internal;   /* Flag to indicate option is not to be shown */
     bool        b_restart;   /* Flag to indicate the option needs a restart */
                               /* to take effect */
-
-    /* Deprecated */
-    char        *psz_oldname;                          /* Old option name */
-    bool        b_removed;
-
     /* Option values loaded from config file */
     bool        b_autosave;      /* Config will be auto-saved at exit time */
     bool        b_unsaveable;                /* Config should not be saved */
@@ -200,8 +193,8 @@ struct module_config_t
  * data.
  *****************************************************************************/
 VLC_EXPORT( int,    config_GetType,  (vlc_object_t *, const char *) LIBVLC_USED );
-VLC_EXPORT( int,    config_GetInt,   (vlc_object_t *, const char *) LIBVLC_USED );
-VLC_EXPORT( void,   config_PutInt,   (vlc_object_t *, const char *, int) );
+VLC_EXPORT( int64_t, config_GetInt,  (vlc_object_t *, const char *) LIBVLC_USED );
+VLC_EXPORT( void,   config_PutInt,   (vlc_object_t *, const char *, int64_t) );
 VLC_EXPORT( float,  config_GetFloat, (vlc_object_t *, const char *) LIBVLC_USED );
 VLC_EXPORT( void,   config_PutFloat, (vlc_object_t *, const char *, float) );
 VLC_EXPORT( char *, config_GetPsz,   (vlc_object_t *, const char *) LIBVLC_USED );
@@ -215,6 +208,7 @@ VLC_EXPORT( void,   config_ResetAll, ( vlc_object_t * ) );
 VLC_EXPORT( module_config_t *, config_FindConfig,( vlc_object_t *, const char * ) LIBVLC_USED );
 VLC_EXPORT(char *, config_GetDataDir, ( vlc_object_t * ) LIBVLC_USED);
 #define config_GetDataDir(a) config_GetDataDir(VLC_OBJECT(a))
+VLC_EXPORT(const char *, config_GetLibDir, ( void ) LIBVLC_USED);
 VLC_EXPORT(const char *, config_GetConfDir, ( void ) LIBVLC_USED);
 
 typedef enum vlc_userdir