From f15f2bd7749f2fcb618cde7bca738afd9ae9d055 Mon Sep 17 00:00:00 2001 From: Laurent Aimar Date: Sun, 28 Sep 2008 08:59:04 +0200 Subject: [PATCH] Added vout_internal.h. --- include/vlc_vout.h | 8 ------- src/Makefile.am | 1 + src/video_output/video_output.c | 3 ++- src/video_output/vout_internal.h | 41 ++++++++++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 src/video_output/vout_internal.h diff --git a/include/vlc_vout.h b/include/vlc_vout.h index 584942fc33..b58730ccb3 100644 --- a/include/vlc_vout.h +++ b/include/vlc_vout.h @@ -483,7 +483,6 @@ struct vout_thread_t /** \name Thread properties and locks */ /**@{*/ vlc_mutex_t picture_lock; /**< picture heap lock */ - vlc_mutex_t subpicture_lock; /**< subpicture heap lock */ vlc_mutex_t change_lock; /**< thread change lock */ vlc_mutex_t vfilter_lock; /**< video filter2 change lock */ vout_sys_t * p_sys; /**< system output method */ @@ -701,13 +700,6 @@ VLC_EXPORT( void, vout_LinkPicture, ( vout_thread_t *, picture_t * VLC_EXPORT( void, vout_UnlinkPicture, ( vout_thread_t *, picture_t * ) ); VLC_EXPORT( void, vout_PlacePicture, ( vout_thread_t *, unsigned int, unsigned int, unsigned int *, unsigned int *, unsigned int *, unsigned int * ) ); -/* DO NOT use vout_RenderPicture unless you are in src/video_ouput */ -picture_t * vout_RenderPicture ( vout_thread_t *, picture_t *, - subpicture_t *, bool b_paused ); - -/* DO NOT use vout_CountPictureAvailable unless your are in src/input/dec.c (no exception) */ -int vout_CountPictureAvailable( vout_thread_t * ); - VLC_EXPORT( int, vout_vaControlDefault, ( vout_thread_t *, int, va_list ) ); VLC_EXPORT( void *, vout_RequestWindow, ( vout_thread_t *, int *, int *, unsigned int *, unsigned int * ) ); VLC_EXPORT( void, vout_ReleaseWindow, ( vout_thread_t *, void * ) ); diff --git a/src/Makefile.am b/src/Makefile.am index ac8b134417..db0d31bf33 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -321,6 +321,7 @@ SOURCES_libvlc_common = \ video_output/video_widgets.c \ video_output/vout_subpictures.c \ video_output/vout_intf.c \ + video_output/vout_internal.h \ audio_output/aout_internal.h \ audio_output/common.c \ audio_output/dec.c \ diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index 0da340638f..1b05a377c9 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -47,6 +47,7 @@ #include #include +#include #if defined( __APPLE__ ) /* Include darwin_specific.h here if needed */ @@ -57,8 +58,8 @@ #include "input/input_internal.h" #include "modules/modules.h" -#include #include "vout_pictures.h" +#include "vout_internal.h" /***************************************************************************** * Local prototypes diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h new file mode 100644 index 0000000000..fad85fcec4 --- /dev/null +++ b/src/video_output/vout_internal.h @@ -0,0 +1,41 @@ +/***************************************************************************** + * vout_internal.h : Internal vout definitions + ***************************************************************************** + * Copyright (C) 2008 the VideoLAN team + * Copyright (C) 2008 Laurent Aimar + * $Id$ + * + * Authors: Laurent Aimar < fenrir _AT_ videolan _DOT_ org > + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 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 General Public License for more details. + * + * You should have received a copy of the GNU 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. + *****************************************************************************/ + + +#if defined(__PLUGIN__) || defined(__BUILTIN__) || !defined(__LIBVLC__) +# error This header file can only be included from LibVLC. +#endif + +#ifndef _VOUT_INTERNAL_H +#define _VOUT_INTERNAL_H 1 + +/* DO NOT use vout_RenderPicture unless you are in src/video_ouput */ +picture_t *vout_RenderPicture( vout_thread_t *, picture_t *, + subpicture_t *, bool b_paused ); + +/* DO NOT use vout_CountPictureAvailable unless your are in src/input/decoder.c (no exception) */ +int vout_CountPictureAvailable( vout_thread_t * ); + +#endif + -- 2.39.5