vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Dec 10 20:59:38 2017 +0200| [69b0b5a86c18efe8b2fc3688b0a37dc7216f0a3a] | committer: Rémi Denis-Courmont
include: fold trivial vlc_main.h into vlc_object.h > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=69b0b5a86c18efe8b2fc3688b0a37dc7216f0a3a --- include/vlc_common.h | 1 - include/vlc_main.h | 38 -------------------------------------- include/vlc_objects.h | 6 ++++++ po/POTFILES.in | 1 - src/Makefile.am | 1 - 5 files changed, 6 insertions(+), 41 deletions(-) diff --git a/include/vlc_common.h b/include/vlc_common.h index 936df33bb6..a677d0dc19 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -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__ ) diff --git a/include/vlc_main.h b/include/vlc_main.h deleted file mode 100644 index 77866f2d31..0000000000 --- a/include/vlc_main.h +++ /dev/null @@ -1,38 +0,0 @@ -/***************************************************************************** - * 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 <[email protected]> - * - * 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 -}; - diff --git a/include/vlc_objects.h b/include/vlc_objects.h index a5b5dc21dc..3da6820bfd 100644 --- a/include/vlc_objects.h +++ b/include/vlc_objects.h @@ -41,6 +41,12 @@ struct vlc_object_t VLC_COMMON_MEMBERS }; +/* The root object */ +struct libvlc_int_t +{ + VLC_COMMON_MEMBERS +}; + /***************************************************************************** * Prototypes *****************************************************************************/ diff --git a/po/POTFILES.in b/po/POTFILES.in index c1a1facd88..1610fb6192 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -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 diff --git a/src/Makefile.am b/src/Makefile.am index 7a4fe5dafd..096dfc2a24 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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 \ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
