vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Wed Jan 2 11:20:12 2019 +0200| [9a2d9b117e7517f14ff5fb0df3c3d940e4e79cc0] | committer: Rémi Denis-Courmont
display: remove dead code > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9a2d9b117e7517f14ff5fb0df3c3d940e4e79cc0 --- src/video_output/display.c | 45 --------------------------------------------- src/video_output/display.h | 3 --- 2 files changed, 48 deletions(-) diff --git a/src/video_output/display.c b/src/video_output/display.c index 3c9dec4eea..cf863df80e 100644 --- a/src/video_output/display.c +++ b/src/video_output/display.c @@ -992,48 +992,3 @@ vout_display_t *vout_NewSplitter(vout_thread_t *vout, return wrapper; } - -/***************************************************************************** - * TODO move out - *****************************************************************************/ -#include "vout_internal.h" - -void vout_SendDisplayEventMouse(vout_thread_t *vout, const vlc_mouse_t *m) -{ - vlc_mouse_t tmp1, tmp2; - - /* The check on spu is needed as long as ALLOW_DUMMY_VOUT is defined */ - if (vout->p->spu && spu_ProcessMouse( vout->p->spu, m, &vout->p->display->source)) - return; - - vlc_mutex_lock( &vout->p->filter.lock ); - if (vout->p->filter.chain_static && vout->p->filter.chain_interactive) { - if (!filter_chain_MouseFilter(vout->p->filter.chain_interactive, &tmp1, m)) - m = &tmp1; - if (!filter_chain_MouseFilter(vout->p->filter.chain_static, &tmp2, m)) - m = &tmp2; - } - vlc_mutex_unlock( &vout->p->filter.lock ); - - if (vlc_mouse_HasMoved(&vout->p->mouse, m)) - var_SetCoords(vout, "mouse-moved", m->i_x, m->i_y); - - if (vlc_mouse_HasButton(&vout->p->mouse, m)) { - var_SetInteger(vout, "mouse-button-down", m->i_pressed); - - if (vlc_mouse_HasPressed(&vout->p->mouse, m, MOUSE_BUTTON_LEFT)) { - /* FIXME? */ - int x, y; - - var_GetCoords(vout, "mouse-moved", &x, &y); - var_SetCoords(vout, "mouse-clicked", x, y); - } - } - - if (m->b_double_click) - var_ToggleBool(vout, "fullscreen"); - vout->p->mouse = *m; - - if (vout->p->mouse_event) - vout->p->mouse_event(m, vout->p->opaque); -} diff --git a/src/video_output/display.h b/src/video_output/display.h index 6566f8f21f..2a17604e2d 100644 --- a/src/video_output/display.h +++ b/src/video_output/display.h @@ -29,7 +29,4 @@ vout_display_t *vout_NewSplitter(vout_thread_t *vout, const char *module, const char *splitter_module); -/* FIXME should not be there */ -void vout_SendDisplayEventMouse(vout_thread_t *, const vlc_mouse_t *); - void vout_UpdateDisplaySourceProperties(vout_display_t *vd, const video_format_t *); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
