Use var_Inherit* instead of var_CreateGet*.

[vlc] / include / vlc_main.h

diff --git a/include/vlc_main.h b/include/vlc_main.h
index b6c8b8c5949c8aab7f37c3381498a3633cac7f68..bfa7e47114045a79a39995560b66cd624bb0131e 100644 (file)
--- 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,20 +39,7 @@ struct libvlc_int_t
 {
     VLC_COMMON_MEMBERS
 
-    /* Global properties */
-    char *                 psz_homedir;      ///< user's home directory
-
-    playlist_t            *p_playlist;       ///< playlist object
-
-    global_stats_t       *p_stats;           ///< Global statistics
-
-
     /* 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;
 };