X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_main.h;h=1d1810efedf393ec2fe3eccb6485a24d594fbb18;hb=848489c3863b1b7ddbe542aa3e746063722b9280;hp=4892e1d8ffcd1362e25869ba426982d7683deb44;hpb=651e249197e50e39b02c011d77f0e0f1373ba590;p=vlc

diff --git a/include/vlc_main.h b/include/vlc_main.h
index 4892e1d8ff..1d1810efed 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,10 +21,6 @@
  * 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
-
 TYPEDEF_ARRAY(input_item_t*, input_item_array_t);
 
 /*****************************************************************************
@@ -37,46 +32,9 @@ 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)
+    /* FIXME: this is only used by the logger module! */
     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?
-
-    module_t *             p_memcpy_module;  ///< Fast memcpy plugin used
-    void* ( *pf_memcpy ) ( void *, const void *, size_t ); ///< fast memcpy
-    void* ( *pf_memset ) ( void *, int, size_t );          ///< fast memset
-
-    bool             b_stats;       ///< Should we collect stats ?
-    vlc_mutex_t            timer_lock;    ///< Lock to protect timers
-    int                    i_timers;      ///< Number of timers
-    counter_t            **pp_timers;     ///< Array of all timers
-
-    vlc_mutex_t            config_lock;    ///< Lock for the config file
-
     /* Structure storing the action name / key associations */
     struct hotkey
     {