vout: remove no longer used display size event parameter

diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h
index bfe5a8cfd7d40a68ced95ec15a05f10a02a503d3..e5b12681eaa23c89d3288da5fa0b7a709665b3ff 100644 (file)
--- a/include/vlc_vout_display.h
+++ b/include/vlc_vout_display.h
@@ -191,7 +191,7 @@ enum {
     VOUT_DISPLAY_EVENT_FULLSCREEN,
     VOUT_DISPLAY_EVENT_WINDOW_STATE,
 
-    VOUT_DISPLAY_EVENT_DISPLAY_SIZE,        /* The display size need to change : int i_width, int i_height, bool is_fullscreen */
+    VOUT_DISPLAY_EVENT_DISPLAY_SIZE,        /* The display size need to change : int i_width, int i_height */
 
     /* */
     VOUT_DISPLAY_EVENT_CLOSE,
@@ -340,9 +340,9 @@ static inline void vout_display_SendEvent(vout_display_t *vd, int query, ...)
     va_end(args);
 }
 
-static inline void vout_display_SendEventDisplaySize(vout_display_t *vd, int width, int height, bool is_fullscreen)
+static inline void vout_display_SendEventDisplaySize(vout_display_t *vd, int width, int height)
 {
-    vout_display_SendEvent(vd, VOUT_DISPLAY_EVENT_DISPLAY_SIZE, width, height, is_fullscreen);
+    vout_display_SendEvent(vd, VOUT_DISPLAY_EVENT_DISPLAY_SIZE, width, height);
 }
 static inline void vout_display_SendEventPicturesInvalid(vout_display_t *vd)
 {

diff --git a/modules/hw/mmal/vout.c b/modules/hw/mmal/vout.c
index ed727bca844041fb32a0a07e0baca9d0085d2b4f..2b7ee671125ec1d8f58105ed6d92edac26d701ef 100644 (file)
--- a/modules/hw/mmal/vout.c
+++ b/modules/hw/mmal/vout.c
@@ -301,8 +301,7 @@ static int Open(vlc_object_t *object)
     vc_tv_register_callback(tvservice_cb, vd);
 
     if (query_resolution(vd, &sys->display_width, &sys->display_height) >= 0) {
-        vout_display_SendEventDisplaySize(vd, sys->display_width, sys->display_height,
-                        vd->cfg->is_fullscreen);
+        vout_display_SendEventDisplaySize(vd, sys->display_width, sys->display_height);
     } else {
         sys->display_width = vd->cfg->display.width;
         sys->display_height = vd->cfg->display.height;
@@ -607,7 +606,7 @@ static int vd_control(vout_display_t *vd, int query, va_list args)
         case VOUT_DISPLAY_CHANGE_FULLSCREEN:
             tmp_cfg = va_arg(args, const vout_display_cfg_t *);
             vout_display_SendEventDisplaySize(vd, sys->display_width,
-                            sys->display_height, tmp_cfg->is_fullscreen);
+                            sys->display_height);
             ret = VLC_SUCCESS;
             break;
 
@@ -658,7 +657,7 @@ static void vd_manage(vout_display_t *vd)
         if (query_resolution(vd, &width, &height) >= 0) {
             sys->display_width = width;
             sys->display_height = height;
-            vout_display_SendEventDisplaySize(vd, width, height, vd->cfg->is_fullscreen);
+            vout_display_SendEventDisplaySize(vd, width, height);
         }
 
         sys->need_configure_display = false;

diff --git a/modules/hw/vdpau/display.c b/modules/hw/vdpau/display.c
index 044ac3372d3a379119bdf6cad2b772356506bad2..b7f526338f903d7fcc748d3b3785f99b9946bd8a 100644 (file)
--- a/modules/hw/vdpau/display.c
+++ b/modules/hw/vdpau/display.c
@@ -687,7 +687,7 @@ static int Open(vlc_object_t *obj)
     if (is_fullscreen && vout_window_SetFullScreen(sys->embed, true))
         is_fullscreen = false;
     vout_display_SendEventFullscreen(vd, is_fullscreen);
-    vout_display_SendEventDisplaySize(vd, width, height, is_fullscreen);
+    vout_display_SendEventDisplaySize(vd, width, height);
 
     return VLC_SUCCESS;
 

diff --git a/modules/video_output/aa.c b/modules/video_output/aa.c
index 5a848cf6b57636d9982aba93473c8420cedc7455..5379185fb7da8eff42a279501ba409102d38581e 100644 (file)
--- a/modules/video_output/aa.c
+++ b/modules/video_output/aa.c
@@ -139,7 +139,7 @@ static int Open(vlc_object_t *object)
     sys->state = *vd->cfg;
     sys->state.is_fullscreen = false;
     vout_display_SendEventFullscreen(vd, false);
-    vout_display_SendEventDisplaySize(vd, fmt.i_width, fmt.i_height, false);
+    vout_display_SendEventDisplaySize(vd, fmt.i_width, fmt.i_height);
 
     return VLC_SUCCESS;
 
@@ -297,7 +297,7 @@ static void Manage(vout_display_t *vd)
             aa_resize(sys->aa_context);
             vout_display_SendEventDisplaySize(vd,
                                               aa_imgwidth(sys->aa_context),
-                                              aa_imgheight(sys->aa_context), false);
+                                              aa_imgheight(sys->aa_context));
             break;
 
         /* TODO keys support to complete */

diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c
index 2958abd9a6d431bc4f1a5d5560e9853d361577cc..63e964b1501b3b0c205e579cc0871a5d2dda2ead 100644 (file)
--- a/modules/video_output/caca.c
+++ b/modules/video_output/caca.c
@@ -361,7 +361,7 @@ static void Refresh(vout_display_t *vd)
 
     if (width  != vd->cfg->display.width ||
         height != vd->cfg->display.height)
-        vout_display_SendEventDisplaySize(vd, width, height, false);
+        vout_display_SendEventDisplaySize(vd, width, height);
 }
 
 /**
@@ -504,7 +504,7 @@ static void Manage(vout_display_t *vd)
         }
         case CACA_EVENT_RESIZE:
             vout_display_SendEventDisplaySize(vd, caca_get_event_resize_width(&ev),
-                                                  caca_get_event_resize_height(&ev), false);
+                                                  caca_get_event_resize_height(&ev));
             break;
         case CACA_EVENT_MOUSE_MOTION: {
             vout_display_place_t place;

diff --git a/modules/video_output/caopengllayer.m b/modules/video_output/caopengllayer.m
index 9ee27b97c130a686cc9c7b04f8a503dcb3e169ed..0fea9a56ed08f410ab0cd2005790186f48a6239e 100644 (file)
--- a/modules/video_output/caopengllayer.m
+++ b/modules/video_output/caopengllayer.m
@@ -203,7 +203,7 @@ static int Open (vlc_object_t *p_this)
     else
         outputSize = [sys->container visibleRect].size;
     vout_display_SendEventFullscreen(vd, false);
-    vout_display_SendEventDisplaySize(vd, (int)outputSize.width, (int)outputSize.height, false);
+    vout_display_SendEventDisplaySize(vd, (int)outputSize.width, (int)outputSize.height);
 
     [pool release];
     return VLC_SUCCESS;
@@ -429,7 +429,7 @@ static void *OurGetProcAddress (vlc_gl_t *gl, const char *name)
 
     CGSize boundsSize = self.bounds.size;
     if (_vd)
-        vout_display_SendEventDisplaySize(_vd, boundsSize.width, boundsSize.height, _vd->cfg->is_fullscreen);
+        vout_display_SendEventDisplaySize(_vd, boundsSize.width, boundsSize.height);
 }
 
 - (BOOL)canDrawInCGLContext:(CGLContextObj)glContext pixelFormat:(CGLPixelFormatObj)pixelFormat forLayerTime:(CFTimeInterval)timeInterval displayTime:(const CVTimeStamp *)timeStamp

diff --git a/modules/video_output/directfb.c b/modules/video_output/directfb.c
index 6f283a887521d48ec2ef746cc1dda64a39bcab99..710743534e0caabe4e52c1128ed2d514a4c6db80 100644 (file)
--- a/modules/video_output/directfb.c
+++ b/modules/video_output/directfb.c
@@ -157,7 +157,7 @@ static int Open(vlc_object_t *object)
 
     /* */
     vout_display_SendEventFullscreen(vd, true);
-    vout_display_SendEventDisplaySize(vd, fmt.i_width, fmt.i_height, true);
+    vout_display_SendEventDisplaySize(vd, fmt.i_width, fmt.i_height);
     return VLC_SUCCESS;
 
 error:

diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c
index 1251b85a83b4e4b568b8df35c8878f74c454ae2d..9199c6b468f8002840e73a10a928249219bab5a5 100644 (file)
--- a/modules/video_output/fb.c
+++ b/modules/video_output/fb.c
@@ -315,7 +315,7 @@ static int Open(vlc_object_t *object)
 
     /* */
     vout_display_SendEventFullscreen(vd, true);
-    vout_display_SendEventDisplaySize(vd, fmt.i_visible_width, fmt.i_visible_height, true);
+    vout_display_SendEventDisplaySize(vd, fmt.i_visible_width, fmt.i_visible_height);
     return VLC_SUCCESS;
 }
 

diff --git a/modules/video_output/ios2.m b/modules/video_output/ios2.m
index e369307920b7a8c154e4e6ddd375dfa800e335d1..13e90991513deb560bc20c4a4fb3d94dd1a386db 100644 (file)
--- a/modules/video_output/ios2.m
+++ b/modules/video_output/ios2.m
@@ -201,7 +201,7 @@ static int Open(vlc_object_t *this)
     /* forward our dimensions to the vout core */
     CGSize viewSize = sys->viewContainer.frame.size;
     vout_display_SendEventFullscreen(vd, false);
-    vout_display_SendEventDisplaySize(vd, (int)viewSize.width, (int)viewSize.height, false);
+    vout_display_SendEventDisplaySize(vd, (int)viewSize.width, (int)viewSize.height);
 
     /* */
     [[NSNotificationCenter defaultCenter] addObserver:sys->glESView
@@ -502,8 +502,7 @@ static void OpenglESSwap(vlc_gl_t *gl)
             vout_display_PlacePicture(&place, &_voutDisplay->source, &cfg_tmp, false);
             _voutDisplay->sys->place = place;
             vout_display_SendEventDisplaySize(_voutDisplay, viewSize.width * scaleFactor,
-                                              viewSize.height * scaleFactor,
-                                              _voutDisplay->cfg->is_fullscreen);
+                                              viewSize.height * scaleFactor);
         }
     }
 

diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index 01392045e8e911af0a1fae7f02c531ff7173d35f..3cc66b2b605eecc26b0c398e8ddc4db64ab14d9d 100644 (file)
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -239,7 +239,7 @@ static int Open (vlc_object_t *this)
     vd->control = Control;
 
     /* */
-    vout_display_SendEventDisplaySize (vd, vd->fmt.i_visible_width, vd->fmt.i_visible_height, false);
+    vout_display_SendEventDisplaySize (vd, vd->fmt.i_visible_width, vd->fmt.i_visible_height);
 
     return VLC_SUCCESS;
 
@@ -644,7 +644,7 @@ static void OpenglSwap (vlc_gl_t *gl)
 
             vout_display_PlacePicture (&place, &vd->source, &cfg_tmp, false);
             vd->sys->place = place;
-            vout_display_SendEventDisplaySize (vd, bounds.size.width, bounds.size.height, vd->cfg->is_fullscreen);
+            vout_display_SendEventDisplaySize (vd, bounds.size.width, bounds.size.height);
         }
     }
 

diff --git a/modules/video_output/msw/common.c b/modules/video_output/msw/common.c
index d1728b08481d3f498df59a702429daf41e6885ff..f8c1ceb61526235062677d37bd19f561e412c4cb 100644 (file)
--- a/modules/video_output/msw/common.c
+++ b/modules/video_output/msw/common.c
@@ -328,8 +328,8 @@ void UpdateRects(vout_display_t *vd,
                                     point.x, point.y,
                                     rect.right, rect.bottom);
     if (is_resized)
-        vout_display_SendEventDisplaySize(vd, rect.right, rect.bottom, cfg->is_fullscreen);
-    if (!is_forced && !has_moved && !is_resized )
+        vout_display_SendEventDisplaySize(vd, rect.right, rect.bottom);
+    if (!is_forced && !has_moved && !is_resized)
         return;
 
     /* Update the window position and size */

diff --git a/modules/video_output/sdl.c b/modules/video_output/sdl.c
index 211ab5cde101cf2110ea8075af5e4a83497b3037..168949f535d6a5206e5faaec68dbd6c1b4c391e1 100644 (file)
--- a/modules/video_output/sdl.c
+++ b/modules/video_output/sdl.c
@@ -342,7 +342,7 @@ static int Open(vlc_object_t *object)
     vd->manage  = Manage;
 
     /* */
-    vout_display_SendEventDisplaySize(vd, display_width, display_height, vd->cfg->is_fullscreen);
+    vout_display_SendEventDisplaySize(vd, display_width, display_height);
     return VLC_SUCCESS;
 
 error:
@@ -510,7 +510,7 @@ static int Control(vout_display_t *vd, int query, va_list args)
 
             vout_display_PlacePicture(&sys->place, &vd->source, &cfg, !sys->overlay);
         }
-        vout_display_SendEventDisplaySize(vd, cfg.display.width, cfg.display.height, cfg.is_fullscreen);
+        vout_display_SendEventDisplaySize(vd, cfg.display.width, cfg.display.height);
         return VLC_SUCCESS;
     }
     case VOUT_DISPLAY_CHANGE_ZOOM:
@@ -648,7 +648,7 @@ static void Manage(vout_display_t *vd)
         }
 
         case SDL_VIDEORESIZE:
-            vout_display_SendEventDisplaySize(vd, event.resize.w, event.resize.h, vd->cfg->is_fullscreen);
+            vout_display_SendEventDisplaySize(vd, event.resize.w, event.resize.h);
             break;
 
         default:

diff --git a/modules/video_output/vmem.c b/modules/video_output/vmem.c
index 089631a8d8833cc1c873827cac4abfd1152cf875..0b9efd0eb8b049bf4a7cb1cc75b9367e20609aa7 100644 (file)
--- a/modules/video_output/vmem.c
+++ b/modules/video_output/vmem.c
@@ -228,7 +228,7 @@ static int Open(vlc_object_t *object)
 
     /* */
     vout_display_SendEventFullscreen(vd, false);
-    vout_display_SendEventDisplaySize(vd, fmt.i_width, fmt.i_height, false);
+    vout_display_SendEventDisplaySize(vd, fmt.i_width, fmt.i_height);
     vout_display_DeleteWindow(vd, NULL);
     return VLC_SUCCESS;
 }

diff --git a/modules/video_output/wayland/shm.c b/modules/video_output/wayland/shm.c
index 87e13997bf1a63760469c764d656a469c5ea1a95..67bc359ad785264c8699985a7e0fda2dd3300c8d 100644 (file)
--- a/modules/video_output/wayland/shm.c
+++ b/modules/video_output/wayland/shm.c
@@ -308,8 +308,7 @@ static int Control(vout_display_t *vd, int query, va_list ap)
             if (query == VOUT_DISPLAY_CHANGE_DISPLAY_SIZE && va_arg(ap, int))
             {
                 vout_display_SendEventDisplaySize(vd, cfg->display.width,
-                                                  cfg->display.height,
-                                                  vd->cfg->is_fullscreen);
+                                                  cfg->display.height);
                 return VLC_EGENERIC;
             }
 
@@ -492,7 +491,7 @@ static int Open(vlc_object_t *obj)
         is_fullscreen = false;
     vout_display_SendEventFullscreen(vd, is_fullscreen);
     vout_display_SendEventDisplaySize(vd, vd->cfg->display.width,
-                                      vd->cfg->display.height, is_fullscreen);
+                                      vd->cfg->display.height);
     return VLC_SUCCESS;
 
 error:

diff --git a/modules/video_output/xcb/events.c b/modules/video_output/xcb/events.c
index ba83de8528635b34c8ed1f54aa6321aa77228dd0..1804e03e669c296fe7a637b1f4ca9daf24446c67 100644 (file)
--- a/modules/video_output/xcb/events.c
+++ b/modules/video_output/xcb/events.c
@@ -249,7 +249,7 @@ static void
 HandleParentStructure (vout_display_t *vd,
                        const xcb_configure_notify_event_t *ev)
 {
-    vout_display_SendEventDisplaySize (vd, ev->width, ev->height, vd->cfg->is_fullscreen);
+    vout_display_SendEventDisplaySize (vd, ev->width, ev->height);
 }
 
 /**

diff --git a/modules/video_output/xcb/glx.c b/modules/video_output/xcb/glx.c
index 6ee7a94d53f213b80d88bc105714acc80c250202..76be97a04b742c81e3a8df2f83ce91075ae36ddf 100644 (file)
--- a/modules/video_output/xcb/glx.c
+++ b/modules/video_output/xcb/glx.c
@@ -134,7 +134,7 @@ static int Open (vlc_object_t *obj)
     if (vout_window_SetFullScreen (surface, fs))
         fs = false;
     vout_display_SendEventFullscreen (vd, fs);
-    vout_display_SendEventDisplaySize (vd, width, height, fs);
+    vout_display_SendEventDisplaySize (vd, width, height);
 
     return VLC_SUCCESS;
 

diff --git a/modules/video_output/xcb/x11.c b/modules/video_output/xcb/x11.c
index ea406a1d1770c330bbf7c4a3c3c7e32bd1193aa4..1a948032614b286d00cd4500e11df039aa833f37 100644 (file)
--- a/modules/video_output/xcb/x11.c
+++ b/modules/video_output/xcb/x11.c
@@ -315,7 +315,7 @@ found_format:;
     if (is_fullscreen && vout_window_SetFullScreen (sys->embed, true))
         is_fullscreen = false;
     vout_display_SendEventFullscreen (vd, is_fullscreen);
-    vout_display_SendEventDisplaySize (vd, width, height, is_fullscreen);
+    vout_display_SendEventDisplaySize (vd, width, height);
 
     return VLC_SUCCESS;
 

diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c
index e237c0136a500006f26334587c23dc92d301872f..e93789808cf61181fbd3dc796b67572c21e8b6f5 100644 (file)
--- a/modules/video_output/xcb/xvideo.c
+++ b/modules/video_output/xcb/xvideo.c
@@ -594,7 +594,7 @@ static int Open (vlc_object_t *obj)
     if (is_fullscreen && vout_window_SetFullScreen (p_sys->embed, true))
         is_fullscreen = false;
     vout_display_SendEventFullscreen (vd, is_fullscreen);
-    vout_display_SendEventDisplaySize (vd, width, height, is_fullscreen);
+    vout_display_SendEventDisplaySize (vd, width, height);
 
     return VLC_SUCCESS;
 

diff --git a/src/video_output/display.c b/src/video_output/display.c
index 12fae33211bf8a81ffedb29e3eece087c666014f..cdd4b35623e4c5dd35045f49d13222d22a2963ea 100644 (file)
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -699,9 +699,7 @@ static void VoutDisplayEvent(vout_display_t *vd, int event, va_list args)
     case VOUT_DISPLAY_EVENT_DISPLAY_SIZE: {
         const int width  = (int)va_arg(args, int);
         const int height = (int)va_arg(args, int);
-        const bool is_fullscreen = (bool)va_arg(args, int);
-        msg_Dbg(vd, "VoutDisplayEvent 'resize' %dx%d %s",
-                width, height, is_fullscreen ? "fullscreen" : "window");
+        msg_Dbg(vd, "VoutDisplayEvent 'resize' %dx%d", width, height);
 
         /* */
         vlc_mutex_lock(&osys->lock);