unit tests update

[vlc] / include / main.h

diff --git a/include/main.h b/include/main.h
index 69e290db184f41933835c5e13a9daebdc65495e4..c798a60898197738a9de224299f48b9492b1f3b4 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,9 +38,6 @@ 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;      ///< user's home directory
     char *                 psz_configdir;    ///< user's configuration directory
     char *                 psz_datadir;      ///< user's data directory
@@ -48,6 +47,13 @@ struct libvlc_int_t
 
     playlist_t            *p_playlist;       ///< playlist object
 
+    vlc_object_t          *p_interaction;       ///< interface interaction object
+
+    /* 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
@@ -73,11 +79,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;
 };