X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_main.h;h=bfa7e47114045a79a39995560b66cd624bb0131e;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=545eb74fc539c20a4628272cfc28cd3351f1bfa6;hpb=0a9fffb92ed32d042bc16f76a3c4735d60c6f086;p=vlc

diff --git a/include/vlc_main.h b/include/vlc_main.h
index 545eb74fc5..bfa7e47114 100644
--- a/include/vlc_main.h
+++ b/include/vlc_main.h
@@ -1,9 +1,8 @@
 /*****************************************************************************
  * main.h: access to all program variables
- * Declaration and extern access to global program object.
+ * Declaration and extern access to LibVLC instance object.
  *****************************************************************************
- * Copyright (C) 1999, 2000, 2001, 2002 the VideoLAN team
- * $Id$
+ * Copyright (C) 1999, 2000, 2001, 2002, 2008 the VideoLAN team
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -22,11 +21,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#if !defined( __LIBVLC__ )
-  #error You are not libvlc or one of its plugins. You cannot include this file
-#endif
+/**
+ * \file
+ * This file defines libvlc_int_t internal libvlc instance
+ */
 
-TYPEDEF_ARRAY(input_item_t*, input_item_array_t);
+TYPEDEF_ARRAY(input_item_t*, input_item_array_t)
+
+struct hotkey;
 
 /*****************************************************************************
  * libvlc_internal_instance_t
@@ -37,41 +39,7 @@ struct libvlc_int_t
 {
     VLC_COMMON_MEMBERS
 
-    /* Global properties */
-    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
-
-    vlm_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
-    bool             b_color;     ///< color messages?
-
     /* Structure storing the action name / key associations */
-    struct hotkey
-    {
-        const char *psz_action;
-        int i_action;
-        int i_key;
-    } *p_hotkeys;
+    const struct hotkey *p_hotkeys;
 };