X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_main.h;h=cd710b2474ab6b61c1653e0d9fefcbb549fa3cb9;hb=45059b5adde4cab5b2559ae960d38d5c147cd4a5;hp=174c8f5f748ff305d037399865b42aff08cd5b75;hpb=e0a120ef811bdb2d1bccdde0838105f6dba99669;p=vlc

diff --git a/include/vlc_main.h b/include/vlc_main.h
index 174c8f5f74..cd710b2474 100644
--- a/include/vlc_main.h
+++ b/include/vlc_main.h
@@ -1,32 +1,34 @@
 /*****************************************************************************
- * main.h: access to all program variables
- * Declaration and extern access to global program object.
+ * vlc_main.h: access to all program variables
+ * 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 VLC authors and VideoLAN
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software 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,37 +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
-
-    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;
 };