vlc | branch: master | Thomas Guillem <[email protected]> | Mon Apr 25 10:30:27 2016 +0200| [c2d32945841a4bfc523c6e0c2457481fd4af7f6c] | committer: Thomas Guillem
libvlc: remove (almost unused) libvlc_structures.h Move the only 2 remaining typedef into vlc/libvlc.h > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c2d32945841a4bfc523c6e0c2457481fd4af7f6c --- include/vlc/libvlc.h | 8 ++++-- include/vlc/libvlc_media.h | 8 +++--- include/vlc/libvlc_structures.h | 54 --------------------------------------- include/vlc/vlc.h | 1 - lib/Makefile.am | 1 - lib/libvlc_internal.h | 1 - lib/media_list_internal.h | 1 - lib/media_player_internal.h | 1 - po/POTFILES.in | 1 - src/test/headers.c | 1 - 10 files changed, 9 insertions(+), 68 deletions(-) diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h index e2305ea..78600be 100644 --- a/include/vlc/libvlc.h +++ b/include/vlc/libvlc.h @@ -55,13 +55,12 @@ #include <stdio.h> #include <stdarg.h> +#include <stdint.h> # ifdef __cplusplus extern "C" { # endif -#include <vlc/libvlc_structures.h> - /** \defgroup libvlc_core LibVLC core * \ingroup libvlc * Before it can do anything useful, LibVLC must be initialized. @@ -74,6 +73,11 @@ extern "C" { * @{ */ +/** This structure is opaque. It represents a libvlc instance */ +typedef struct libvlc_instance_t libvlc_instance_t; + +typedef int64_t libvlc_time_t; + /** \defgroup libvlc_error LibVLC error handling * @{ */ diff --git a/include/vlc/libvlc_media.h b/include/vlc/libvlc_media.h index 79873e8..3e711ef 100644 --- a/include/vlc/libvlc_media.h +++ b/include/vlc/libvlc_media.h @@ -575,11 +575,9 @@ LIBVLC_API int libvlc_media_save_meta( libvlc_media_t *p_md ); /** - * Get current state of media descriptor object. Possible media states - * are defined in libvlc_structures.c ( libvlc_NothingSpecial=0, - * libvlc_Opening, libvlc_Buffering, libvlc_Playing, libvlc_Paused, - * libvlc_Stopped, libvlc_Ended, - * libvlc_Error). + * Get current state of media descriptor object. Possible media states are + * libvlc_NothingSpecial=0, libvlc_Opening, libvlc_Playing, libvlc_Paused, + * libvlc_Stopped, libvlc_Ended, libvlc_Error. * * \see libvlc_state_t * \param p_md a media descriptor object diff --git a/include/vlc/libvlc_structures.h b/include/vlc/libvlc_structures.h deleted file mode 100644 index d7ad4a5..0000000 --- a/include/vlc/libvlc_structures.h +++ /dev/null @@ -1,54 +0,0 @@ -/***************************************************************************** - * libvlc_structures.h: libvlc_* new external API structures - ***************************************************************************** - * Copyright (C) 1998-2008 VLC authors and VideoLAN - * $Id $ - * - * Authors: Filippo Carone <[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. - *****************************************************************************/ - -#ifndef LIBVLC_STRUCTURES_H -#define LIBVLC_STRUCTURES_H 1 - -/** - * \file - * This file defines libvlc_* new external API structures - */ - -#include <stdint.h> - -# ifdef __cplusplus -extern "C" { -# endif - -/** - * \ingroup libvlc_core - * @{ - */ - -/** This structure is opaque. It represents a libvlc instance */ -typedef struct libvlc_instance_t libvlc_instance_t; - -typedef int64_t libvlc_time_t; - -/**@} */ - -# ifdef __cplusplus -} -# endif - -#endif diff --git a/include/vlc/vlc.h b/include/vlc/vlc.h index 1a30571..1e2cf65 100644 --- a/include/vlc/vlc.h +++ b/include/vlc/vlc.h @@ -37,7 +37,6 @@ extern "C" { # endif -#include <vlc/libvlc_structures.h> #include <vlc/libvlc.h> #include <vlc/libvlc_media.h> #include <vlc/libvlc_media_player.h> diff --git a/lib/Makefile.am b/lib/Makefile.am index a4f87d0..ae46dbe 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -19,7 +19,6 @@ pkginclude_HEADERS = \ ../include/vlc/libvlc_media_list.h \ ../include/vlc/libvlc_media_list_player.h \ ../include/vlc/libvlc_media_player.h \ - ../include/vlc/libvlc_structures.h \ ../include/vlc/libvlc_vlm.h \ ../include/vlc/vlc.h diff --git a/lib/libvlc_internal.h b/lib/libvlc_internal.h index ac853b6..9fa3a47 100644 --- a/lib/libvlc_internal.h +++ b/lib/libvlc_internal.h @@ -29,7 +29,6 @@ # include "config.h" #endif -#include <vlc/libvlc_structures.h> #include <vlc/libvlc.h> #include <vlc/libvlc_dialog.h> #include <vlc/libvlc_media.h> diff --git a/lib/media_list_internal.h b/lib/media_list_internal.h index 40b34da..ded1efc 100644 --- a/lib/media_list_internal.h +++ b/lib/media_list_internal.h @@ -30,7 +30,6 @@ #endif #include <vlc/vlc.h> -#include <vlc/libvlc_structures.h> #include <vlc/libvlc_media.h> #include <vlc_common.h> diff --git a/lib/media_player_internal.h b/lib/media_player_internal.h index 27fbf1f..f5f101b 100644 --- a/lib/media_player_internal.h +++ b/lib/media_player_internal.h @@ -30,7 +30,6 @@ #endif #include <vlc/vlc.h> -#include <vlc/libvlc_structures.h> #include <vlc/libvlc_media.h> #include <vlc_input.h> diff --git a/po/POTFILES.in b/po/POTFILES.in index cbe4c85..6451cc2 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -31,7 +31,6 @@ include/vlc_keys.h include/vlc/libvlc_events.h include/vlc/libvlc.h include/vlc/libvlc_media_list.h -include/vlc/libvlc_structures.h include/vlc/libvlc_vlm.h include/vlc_main.h include/vlc_md5.h diff --git a/src/test/headers.c b/src/test/headers.c index 305d73e..7c396c8 100644 --- a/src/test/headers.c +++ b/src/test/headers.c @@ -35,7 +35,6 @@ #include <vlc/vlc.h> #include <vlc/deprecated.h> #include <vlc/libvlc.h> -#include <vlc/libvlc_structures.h> #include <vlc/libvlc_events.h> #include <vlc/libvlc_media.h> #include <vlc/libvlc_media_discoverer.h> _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
