X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_configuration.h;h=e66f6a9d480476ff7ed33627bf997c0aa08509e5;hb=becf1111d668e6cf36c3d4bd53b1dc633c25bea9;hp=4360fad7d632dfd5fddb07e2be7cd14389275f1e;hpb=a87edce45b66ec85ad3b4dbd3e970c5dd67838af;p=vlc

diff --git a/include/vlc_configuration.h b/include/vlc_configuration.h
index 4360fad7d6..e66f6a9d48 100644
--- a/include/vlc_configuration.h
+++ b/include/vlc_configuration.h
@@ -149,10 +149,8 @@ typedef union
 
 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 */
@@ -170,12 +168,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 +187,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 */
@@ -215,6 +214,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