Commit 69b0b5a8 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

include: fold trivial vlc_main.h into vlc_object.h

parent 2007dae6
......@@ -1021,7 +1021,6 @@ VLC_API const char * VLC_Compiler( void ) VLC_USED;
#include "vlc_messages.h"
#include "vlc_objects.h"
#include "vlc_variables.h"
#include "vlc_main.h"
#include "vlc_configuration.h"
#if defined( _WIN32 ) || defined( __OS2__ )
......
/*****************************************************************************
* vlc_main.h: access to all program variables
* Declaration and extern access to LibVLC instance object.
*****************************************************************************
* 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 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 Lesser General Public License for more details.
*
* 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.
*****************************************************************************/
/**
* \file
* This file defines libvlc_int_t internal libvlc instance
*/
/*****************************************************************************
* libvlc_internal_instance_t
*****************************************************************************
* This structure is a LibVLC instance, for use by libvlc core and plugins
*****************************************************************************/
struct libvlc_int_t
{
VLC_COMMON_MEMBERS
};
......@@ -41,6 +41,12 @@ struct vlc_object_t
VLC_COMMON_MEMBERS
};
/* The root object */
struct libvlc_int_t
{
VLC_COMMON_MEMBERS
};
/*****************************************************************************
* Prototypes
*****************************************************************************/
......
......@@ -27,7 +27,6 @@ include/vlc_image.h
include/vlc_input.h
include/vlc_intf_strings.h
include/vlc_iso_lang.h
include/vlc_main.h
include/vlc_md5.h
include/vlc_messages.h
include/vlc_meta.h
......
......@@ -60,7 +60,6 @@ pluginsinclude_HEADERS = \
../include/vlc_input_item.h \
../include/vlc_interface.h \
../include/vlc_keystore.h \
../include/vlc_main.h \
../include/vlc_md5.h \
../include/vlc_messages.h \
../include/vlc_meta.h \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment