VLM class almost done

[vlc] / include / main.h

diff --git a/include/main.h b/include/main.h
index 6a1d847def77c311fcfbc93ba6e86f1b98fb661d..97ba2cc78f151b389f18074358b9c94bc9584bf5 100644 (file)
--- a/include/main.h
+++ b/include/main.h
@@ -26,6 +26,8 @@
   #error You are not libvlc or one of its plugins. You cannot include this file
 #endif
 
+TYPEDEF_ARRAY(input_item_t*, input_item_array_t);
+
 /*****************************************************************************
  * libvlc_internal_instance_t
  *****************************************************************************
@@ -36,14 +38,29 @@ struct libvlc_int_t
     VLC_COMMON_MEMBERS
 
     /* Global properties */
-    int                    i_argc;           ///< command line arguments count
-    char **                ppsz_argv;        ///< command line arguments
-    char *                 psz_homedir;      ///< configuration directory
-    char *                 psz_userdir;      ///< user's home directory
+    char *                 psz_homedir;      ///< user's home directory
+    char *                 psz_configdir;    ///< user's configuration directory
+    char *                 psz_datadir;      ///< user's data directory
+    char *                 psz_cachedir;     ///< user's cache directory
+
     char *                 psz_configfile;   ///< location of config file
 
     playlist_t            *p_playlist;       ///< playlist object
 
+    vlc_object_t          *p_interaction;    ///< interface interaction object
+
+    vlc_object_t          *p_vlm;            ///< vlm if created from libvlc-common.
+                                             /// (this is clearly private and
+                                             //  shouldn't be used)
+
+    void                 *p_stats_computer;  ///< Input thread computing stats (needs cleanup)
+    global_stats_t       *p_stats;           ///< Global statistics
+
+    /* There is no real reason to keep a list of items, but not to break
+     * everything, let's keep it */
+    input_item_array_t    input_items;       ///< Array of all created input items
+    int                   i_last_input_id ;  ///< Last id of input item
+
     /* Messages */
     msg_bank_t             msg_bank;    ///< The message bank
     int                    i_verbose;   ///< info messages
@@ -69,11 +86,6 @@ struct libvlc_int_t
         const char *psz_action;
         int i_action;
         int i_key;
-
-        /* hotkey accounting information */
-        mtime_t i_delta_date;/*< minimum delta time between two key presses */
-        mtime_t i_last_date; /*< last date key was pressed */
-        int     i_times;     /*< n times pressed within delta date*/
     } *p_hotkeys;
 };