From 815afd60319676fc49a816ce96918d84cebae3cc Mon Sep 17 00:00:00 2001 From: Thomas Guillem Date: Thu, 3 May 2018 10:20:32 +0200 Subject: [PATCH] vout: merge vout_control.h with vout_internal.h --- po/POTFILES.in | 1 - src/Makefile.am | 1 - src/input/decoder.c | 2 +- src/input/resource.c | 2 +- src/video_output/event.h | 2 +- src/video_output/vout_control.h | 77 ---------------------------------------- src/video_output/vout_internal.h | 52 +++++++++++++++++++++++++-- 7 files changed, 53 insertions(+), 84 deletions(-) delete mode 100644 src/video_output/vout_control.h diff --git a/po/POTFILES.in b/po/POTFILES.in index fb48d6884f..dbcd292e3a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -143,7 +143,6 @@ src/video_output/interlacing.c src/video_output/video_output.c src/video_output/video_text.c src/video_output/video_widgets.c -src/video_output/vout_control.h src/video_output/vout_internal.h src/video_output/vout_intf.c src/video_output/vout_subpictures.c diff --git a/src/Makefile.am b/src/Makefile.am index baacf5233f..d96df97ce0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -295,7 +295,6 @@ libvlccore_la_SOURCES = \ video_output/opengl.c \ video_output/vout_intf.c \ video_output/vout_internal.h \ - video_output/vout_control.h \ video_output/vout_wrapper.c \ network/getaddrinfo.c \ network/http_auth.c \ diff --git a/src/input/decoder.c b/src/input/decoder.c index 335de896b8..e708d3e485 100644 --- a/src/input/decoder.c +++ b/src/input/decoder.c @@ -51,7 +51,7 @@ #include "event.h" #include "resource.h" -#include "../video_output/vout_control.h" +#include "../video_output/vout_internal.h" /* * Possibles values set in p_owner->reload atomic diff --git a/src/input/resource.c b/src/input/resource.c index 4c376ae5a6..f806cfeb2c 100644 --- a/src/input/resource.c +++ b/src/input/resource.c @@ -39,7 +39,7 @@ #include "../libvlc.h" #include "../stream_output/stream_output.h" #include "../audio_output/aout_internal.h" -#include "../video_output/vout_control.h" +#include "../video_output/vout_internal.h" #include "input_interface.h" #include "resource.h" diff --git a/src/video_output/event.h b/src/video_output/event.h index ac40ef3405..4348f7792b 100644 --- a/src/video_output/event.h +++ b/src/video_output/event.h @@ -24,7 +24,7 @@ #include #include -#include "vout_control.h" +#include "vout_internal.h" /* TODO/FIXME * diff --git a/src/video_output/vout_control.h b/src/video_output/vout_control.h deleted file mode 100644 index 25bae8e9aa..0000000000 --- a/src/video_output/vout_control.h +++ /dev/null @@ -1,77 +0,0 @@ -/***************************************************************************** - * vout_control.h : Vout control function definitions - ***************************************************************************** - * Copyright (C) 2008 VLC authors and VideoLAN - * 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 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_VOUT_CONTROL_H -#define LIBVLC_VOUT_CONTROL_H 1 - -typedef struct vout_window_mouse_event_t vout_window_mouse_event_t; - -/** - * This function will (un)pause the display of pictures. - * It is thread safe - */ -void vout_ChangePause( vout_thread_t *, bool b_paused, mtime_t i_date ); - -/** - * This function will apply an offset on subtitle subpicture. - */ -void spu_OffsetSubtitleDate( spu_t *p_spu, mtime_t i_duration ); - -/** - * This function will return and reset internal statistics. - */ -void vout_GetResetStatistic( vout_thread_t *p_vout, unsigned *pi_displayed, - unsigned *pi_lost ); - -/** - * This function will ensure that all ready/displayed pictures have at most - * the provided date. - */ -void vout_Flush( vout_thread_t *p_vout, mtime_t i_date ); - -/* - * Cancel the vout, if cancel is true, it won't return any pictures after this - * call. - */ -void vout_Cancel( vout_thread_t *p_vout, bool b_canceled ); - -/** - * This function will force to display the next picture while paused - */ -void vout_NextPicture( vout_thread_t *p_vout, mtime_t *pi_duration ); - -/** - * This function will ask the display of the input title - */ -void vout_DisplayTitle( vout_thread_t *p_vout, const char *psz_title ); - -void vout_WindowMouseEvent( vout_thread_t *p_vout, - const vout_window_mouse_event_t *mouse ); - -/** - * This function will return true if no more pictures are to be displayed. - */ -bool vout_IsEmpty( vout_thread_t *p_vout ); - -#endif diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h index 400bcb8b61..fae8c92f83 100644 --- a/src/video_output/vout_internal.h +++ b/src/video_output/vout_internal.h @@ -1,7 +1,7 @@ /***************************************************************************** * vout_internal.h : Internal vout definitions ***************************************************************************** - * Copyright (C) 2008 VLC authors and VideoLAN + * Copyright (C) 2008-2018 VLC authors and VideoLAN * Copyright (C) 2008 Laurent Aimar * $Id$ * @@ -29,7 +29,6 @@ #include #include #include -#include "vout_control.h" #include "control.h" #include "snapshot.h" #include "statistic.h" @@ -169,4 +168,53 @@ int spu_ProcessMouse(spu_t *, const vlc_mouse_t *, const video_format_t *); void spu_Attach( spu_t *, vlc_object_t *input, bool ); void spu_ChangeMargin(spu_t *, int); +typedef struct vout_window_mouse_event_t vout_window_mouse_event_t; + +/** + * This function will (un)pause the display of pictures. + * It is thread safe + */ +void vout_ChangePause( vout_thread_t *, bool b_paused, mtime_t i_date ); + +/** + * This function will apply an offset on subtitle subpicture. + */ +void spu_OffsetSubtitleDate( spu_t *p_spu, mtime_t i_duration ); + +/** + * This function will return and reset internal statistics. + */ +void vout_GetResetStatistic( vout_thread_t *p_vout, unsigned *pi_displayed, + unsigned *pi_lost ); + +/** + * This function will ensure that all ready/displayed pictures have at most + * the provided date. + */ +void vout_Flush( vout_thread_t *p_vout, mtime_t i_date ); + +/* + * Cancel the vout, if cancel is true, it won't return any pictures after this + * call. + */ +void vout_Cancel( vout_thread_t *p_vout, bool b_canceled ); + +/** + * This function will force to display the next picture while paused + */ +void vout_NextPicture( vout_thread_t *p_vout, mtime_t *pi_duration ); + +/** + * This function will ask the display of the input title + */ +void vout_DisplayTitle( vout_thread_t *p_vout, const char *psz_title ); + +void vout_WindowMouseEvent( vout_thread_t *p_vout, + const vout_window_mouse_event_t *mouse ); + +/** + * This function will return true if no more pictures are to be displayed. + */ +bool vout_IsEmpty( vout_thread_t *p_vout ); + #endif -- 2.11.4.GIT