vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Jan 13 15:26:25 2019 +0200| [c184b4b9ddb913a581f775f93a27abe73807ee1e] | committer: Rémi Denis-Courmont
splitter: remove unused parameter to mouse callback > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c184b4b9ddb913a581f775f93a27abe73807ee1e --- include/vlc_video_splitter.h | 8 +++----- modules/video_splitter/panoramix.c | 7 ++----- modules/video_splitter/wall.c | 7 ++----- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/include/vlc_video_splitter.h b/include/vlc_video_splitter.h index f7847413b0..3dad42ace9 100644 --- a/include/vlc_video_splitter.h +++ b/include/vlc_video_splitter.h @@ -93,8 +93,7 @@ struct video_splitter_t int (*pf_filter)( video_splitter_t *, picture_t *pp_dst[], picture_t *p_src ); int (*pf_mouse) ( video_splitter_t *, vlc_mouse_t *, - int i_index, - const vlc_mouse_t *p_old, const vlc_mouse_t *p_new ); + int i_index, const vlc_mouse_t *p_new ); void *p_sys; }; @@ -145,15 +144,14 @@ static inline int video_splitter_Filter( video_splitter_t *p_splitter, } static inline int video_splitter_Mouse( video_splitter_t *p_splitter, vlc_mouse_t *p_mouse, - int i_index, - const vlc_mouse_t *p_old, const vlc_mouse_t *p_new ) + int i_index, const vlc_mouse_t *p_new ) { if( !p_splitter->pf_mouse ) { *p_mouse = *p_new; return VLC_SUCCESS; } - return p_splitter->pf_mouse( p_splitter, p_mouse, i_index, p_old, p_new ); + return p_splitter->pf_mouse( p_splitter, p_mouse, i_index, p_new ); } #endif /* VLC_VIDEO_SPLITTER_H */ diff --git a/modules/video_splitter/panoramix.c b/modules/video_splitter/panoramix.c index 9d122b679c..591415f96a 100644 --- a/modules/video_splitter/panoramix.c +++ b/modules/video_splitter/panoramix.c @@ -299,8 +299,7 @@ typedef struct static int Filter( video_splitter_t *, picture_t *pp_dst[], picture_t * ); static int Mouse( video_splitter_t *, vlc_mouse_t *, - int i_index, - const vlc_mouse_t *p_old, const vlc_mouse_t *p_new ); + int i_index, const vlc_mouse_t *p_new ); /* */ @@ -786,11 +785,9 @@ static int Filter( video_splitter_t *p_splitter, picture_t *pp_dst[], picture_t * It converts mouse events */ static int Mouse( video_splitter_t *p_splitter, vlc_mouse_t *p_mouse, - int i_index, - const vlc_mouse_t *p_old, const vlc_mouse_t *p_new ) + int i_index, const vlc_mouse_t *p_new ) { video_splitter_sys_t *p_sys = p_splitter->p_sys; - VLC_UNUSED(p_old); for( int y = 0; y < p_sys->i_row; y++ ) { diff --git a/modules/video_splitter/wall.c b/modules/video_splitter/wall.c index 84360665f2..0328043e6e 100644 --- a/modules/video_splitter/wall.c +++ b/modules/video_splitter/wall.c @@ -109,8 +109,7 @@ typedef struct static int Filter( video_splitter_t *, picture_t *pp_dst[], picture_t * ); static int Mouse( video_splitter_t *, vlc_mouse_t *, - int i_index, - const vlc_mouse_t *p_old, const vlc_mouse_t *p_new ); + int i_index, const vlc_mouse_t *p_new ); /** * This function allocates and initializes a Wall splitter module. @@ -424,10 +423,8 @@ static int Filter( video_splitter_t *p_splitter, picture_t *pp_dst[], picture_t return VLC_SUCCESS; } static int Mouse( video_splitter_t *p_splitter, vlc_mouse_t *p_mouse, - int i_index, - const vlc_mouse_t *p_old, const vlc_mouse_t *p_new ) + int i_index, const vlc_mouse_t *p_new ) { - VLC_UNUSED(p_old); video_splitter_sys_t *p_sys = p_splitter->p_sys; for( int y = 0; y < p_sys->i_row; y++ ) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
