[vlc-commits] win32: remove manage callbacks

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu May 17 19:45:33 2018 +0300| [ef3fd40f6c374094fa4968b97a8ad26342ddeed9] | committer: Rémi Denis-Courmont

win32: remove manage callbacks

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ef3fd40f6c374094fa4968b97a8ad26342ddeed9
---

 modules/video_output/win32/direct3d11.c | 7 +++----
 modules/video_output/win32/direct3d9.c  | 6 +++---
 modules/video_output/win32/directdraw.c | 3 ++-
 modules/video_output/win32/glwin32.c    | 2 +-
 modules/video_output/win32/wingdi.c     | 8 +-------
 5 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c
index 1cb2c2b614..c9d6d99871 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -245,7 +245,6 @@ static void ReleaseQuad(d3d_quad_t *);
 static void UpdatePicQuadPosition(vout_display_t *);
 
 static int Control(vout_display_t *vd, int query, va_list args);
-static void Manage(vout_display_t *vd);
 
 /* TODO: Move to a direct3d11_shaders header */
 static const char* globVertexShaderFlat = "\
@@ -551,7 +550,6 @@ static int Open(vlc_object_t *object)
     vd->prepare = Prepare;
     vd->display = Display;
     vd->control = Control;
-    vd->manage  = Manage;
 
     msg_Dbg(vd, "Direct3D11 Open Succeeded");
 
@@ -1149,9 +1147,10 @@ static float GetFormatLuminance(vlc_object_t *o, const video_format_t *fmt)
     }
 }
 
-static void Prepare(vout_display_t *vd, picture_t *picture, subpicture_t *subpicture,
-                    mtime_t date)
+static void Prepare(vout_display_t *vd, picture_t *picture,
+                    subpicture_t *subpicture, mtime_t date)
 {
+    Manage(vd);
     VLC_UNUSED(date);
     vout_display_sys_t *sys = vd->sys;
 
diff --git a/modules/video_output/win32/direct3d9.c b/modules/video_output/win32/direct3d9.c
index 3d12e454f5..2f8184a0ca 100644
--- a/modules/video_output/win32/direct3d9.c
+++ b/modules/video_output/win32/direct3d9.c
@@ -330,7 +330,6 @@ static int Open(vlc_object_t *object)
     vd->prepare = Prepare;
     vd->display = Display;
     vd->control = Control;
-    vd->manage  = Manage;
 
     /* Fix state in case of desktop mode */
     if (sys->sys.use_desktop && vd->cfg->is_fullscreen)
@@ -495,9 +494,10 @@ static picture_pool_t *DisplayPool(vout_display_t *vd, unsigned count)
     return vd->sys->sys.pool;
 }
 
-static void Prepare(vout_display_t *vd, picture_t *picture, subpicture_t *subpicture,
-                    mtime_t date)
+static void Prepare(vout_display_t *vd, picture_t *picture,
+                    subpicture_t *subpicture, mtime_t date)
 {
+    Manage(vd);
     VLC_UNUSED(date);
     vout_display_sys_t *sys = vd->sys;
     picture_sys_t *p_sys = picture->p_sys;
diff --git a/modules/video_output/win32/directdraw.c b/modules/video_output/win32/directdraw.c
index a8c45437d9..61fde29a51 100644
--- a/modules/video_output/win32/directdraw.c
+++ b/modules/video_output/win32/directdraw.c
@@ -256,7 +256,6 @@ static int Open(vlc_object_t *object)
     vd->prepare = NULL;
     vd->display = Display;
     vd->control = Control;
-    vd->manage  = Manage;
     return VLC_SUCCESS;
 
 error:
@@ -354,6 +353,8 @@ static void Display(vout_display_t *vd, picture_t *picture, subpicture_t *subpic
 
     picture_Release(picture);
     VLC_UNUSED(subpicture);
+
+    Manage(vd);
 }
 static int Control(vout_display_t *vd, int query, va_list args)
 {
diff --git a/modules/video_output/win32/glwin32.c b/modules/video_output/win32/glwin32.c
index ec45764586..cb7d383046 100644
--- a/modules/video_output/win32/glwin32.c
+++ b/modules/video_output/win32/glwin32.c
@@ -161,7 +161,6 @@ static int Open(vlc_object_t *object)
     vd->prepare = Prepare;
     vd->display = Display;
     vd->control = Control;
-    vd->manage  = Manage;
 
     return VLC_SUCCESS;
 
@@ -213,6 +212,7 @@ static picture_pool_t *Pool(vout_display_t *vd, unsigned count)
 static void Prepare(vout_display_t *vd, picture_t *picture, subpicture_t *subpicture,
                     mtime_t date)
 {
+    Manage(vd);
     VLC_UNUSED(date);
     vout_display_sys_t *sys = vd->sys;
 
diff --git a/modules/video_output/win32/wingdi.c b/modules/video_output/win32/wingdi.c
index c0b12b333a..dd99281b73 100644
--- a/modules/video_output/win32/wingdi.c
+++ b/modules/video_output/win32/wingdi.c
@@ -80,7 +80,6 @@ struct vout_display_sys_t
 static picture_pool_t *Pool  (vout_display_t *, unsigned);
 static void           Display(vout_display_t *, picture_t *, subpicture_t *subpicture);
 static int            Control(vout_display_t *, int, va_list);
-static void           Manage (vout_display_t *);
 
 static int            Init(vout_display_t *, video_format_t *, int, int);
 static void           Clean(vout_display_t *);
@@ -118,7 +117,6 @@ static int Open(vlc_object_t *object)
     vd->pool    = Pool;
     vd->prepare = NULL;
     vd->display = Display;
-    vd->manage  = Manage;
     vd->control = Control;
     return VLC_SUCCESS;
 
@@ -188,6 +186,7 @@ static void Display(vout_display_t *vd, picture_t *picture, subpicture_t *subpic
     VLC_UNUSED(subpicture);
 
     CommonDisplay(vd);
+    CommonManage(vd);
 }
 
 static int Control(vout_display_t *vd, int query, va_list args)
@@ -202,11 +201,6 @@ static int Control(vout_display_t *vd, int query, va_list args)
 
 }
 
-static void Manage(vout_display_t *vd)
-{
-    CommonManage(vd);
-}
-
 static int Init(vout_display_t *vd,
                 video_format_t *fmt, int width, int height)
 {