vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Thu May 31 21:40:42 2018 +0300| [85fb6b1cbfa63bf82511a84de39e704bd897bb80] | committer: Rémi Denis-Courmont
display: inline viewpoint events > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=85fb6b1cbfa63bf82511a84de39e704bd897bb80 --- src/video_output/display.c | 10 ++++------ src/video_output/event.h | 14 -------------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/src/video_output/display.c b/src/video_output/display.c index d433535e77..e965426647 100644 --- a/src/video_output/display.c +++ b/src/video_output/display.c @@ -44,8 +44,6 @@ #include "display.h" #include "window.h" -#include "event.h" - static void SplitterManage(vout_display_t *vd); static void SplitterClose(vout_display_t *vd); @@ -542,8 +540,8 @@ static void VoutDisplayEvent(vout_display_t *vd, int event, va_list args) break; case VOUT_DISPLAY_EVENT_VIEWPOINT_MOVED: - vout_SendEventViewpointMoved(osys->vout, - va_arg(args, const vlc_viewpoint_t *)); + var_SetAddress(osys->vout, "viewpoint-moved", + (void *)va_arg(args, const vlc_viewpoint_t *)); break; #if defined(_WIN32) || defined(__OS2__) @@ -1020,8 +1018,8 @@ static vout_display_t *DisplayNew(vout_thread_t *vout, osys->sar.den != source->i_sar_den) osys->ch_sar = true; - vout_SendEventViewpointChangeable(osys->vout, - p_display->fmt.projection_mode != PROJECTION_MODE_RECTANGULAR); + var_SetBool(osys->vout, "viewpoint-changeable", + p_display->fmt.projection_mode != PROJECTION_MODE_RECTANGULAR); return p_display; error: diff --git a/src/video_output/event.h b/src/video_output/event.h index 949ca2ccb2..5a7ba8ba7d 100644 --- a/src/video_output/event.h +++ b/src/video_output/event.h @@ -37,20 +37,6 @@ * (Some case may infinite loop otherwise here) */ -static inline void vout_SendEventViewpointMoved(vout_thread_t *vout, - const vlc_viewpoint_t *p_viewpoint) -{ - var_SetAddress(vout, "viewpoint-moved", (void *) p_viewpoint); - /* This variable can only be read from callbacks */ - var_Change(vout, "viewpoint-moved", VLC_VAR_SETVALUE, - &(vlc_value_t) { .p_address = NULL }, NULL); -} -static inline void vout_SendEventViewpointChangeable(vout_thread_t *vout, - bool b_can_change) -{ - var_SetBool(vout, "viewpoint-changeable", b_can_change); -} - #if 0 static inline void vout_SendEventSnapshot(vout_thread_t *vout, const char *filename) { _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
