X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_main.h;h=44299df77333ff09640560ad8919d8645b61f383;hb=5ff67322e0237a3506fe4a48a7ac01dd4eda444d;hp=f4162289c3f77195add798d0bae739fdb744b7e4;hpb=04a4af73ffcb9602a697e5b2bd8df21c9e9b3c6d;p=vlc diff --git a/include/vlc_main.h b/include/vlc_main.h index f4162289c3..44299df773 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 * @@ -22,9 +21,10 @@ * 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); @@ -37,19 +37,8 @@ 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 - - playlist_t *p_playlist; ///< playlist object - - global_stats_t *p_stats; ///< Global statistics - - /* Structure storing the action name / key associations */ - struct hotkey + const struct hotkey { const char *psz_action; int i_action;