vlc | branch: master | Rémi Denis-Courmont <r...@remlab.net> | Thu May 17 22:19:30 2018 +0300| [10ee874549d03c2e5b1ca17b5de06478117a43c3] | committer: Rémi Denis-Courmont
caca: remove vout_display_SendEventDisplaySize() calls Since the video output does not handle the CHANGE_DISPLAY_SIZE control, this had no effects. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=10ee874549d03c2e5b1ca17b5de06478117a43c3 --- modules/video_output/caca.c | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c index 9fdae9e9c9..316d91c928 100644 --- a/modules/video_output/caca.c +++ b/modules/video_output/caca.c @@ -125,25 +125,6 @@ static void Place(vout_display_t *vd, vout_display_place_t *place) } } -/** - * Refresh the display and send resize event - */ -static void Refresh(vout_display_t *vd) -{ - vout_display_sys_t *sys = vd->sys; - - /* */ - caca_refresh_display(sys->dp); - - /* */ - const unsigned width = caca_get_display_width(sys->dp); - const unsigned height = caca_get_display_height(sys->dp); - - if (width != vd->cfg->display.width || - height != vd->cfg->display.height) - vout_display_SendEventDisplaySize(vd, width, height); -} - static void Manage(vout_display_t *vd); /** @@ -193,7 +174,9 @@ static void Prepare(vout_display_t *vd, picture_t *picture, */ static void PictureDisplay(vout_display_t *vd, picture_t *picture, subpicture_t *subpicture) { - Refresh(vd); + vout_display_sys_t *sys = vd->sys; + + caca_refresh_display(sys->dp); picture_Release(picture); VLC_UNUSED(subpicture); } @@ -342,8 +325,6 @@ static void Manage(vout_display_t *vd) break; } case CACA_EVENT_RESIZE: - vout_display_SendEventDisplaySize(vd, caca_get_event_resize_width(&ev), - caca_get_event_resize_height(&ev)); break; case CACA_EVENT_MOUSE_MOTION: { vout_display_place_t place; @@ -510,7 +491,7 @@ static int Open(vlc_object_t *object) vd->control = Control; /* Fix initial state */ - Refresh(vd); + caca_refresh_display(sys->dp); return VLC_SUCCESS; _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits