[vlc-commits] display: remove the manage callback

[Rémi Denis-Courmont]

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

display: remove the manage callback

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

 include/vlc_vout_display.h |  3 ---
 src/video_output/display.c | 12 +++---------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h
index 5da04e82b1..9f6bf4cc91 100644
--- a/include/vlc_vout_display.h
+++ b/include/vlc_vout_display.h
@@ -309,9 +309,6 @@ struct vout_display_t {
     /* Control on the module (mandatory) */
     int        (*control)(vout_display_t *, int, va_list);
 
-    /* Manage pending event (optional) */
-    void       (*manage)(vout_display_t *) VLC_DEPRECATED;
-
     /* Private place holder for the vout_display_t module (optional)
      *
      * A module is free to use it as it wishes.
diff --git a/src/video_output/display.c b/src/video_output/display.c
index 6b3b8160e2..004525b606 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -45,6 +45,7 @@
 
 #include "event.h"
 
+static void SplitterManage(vout_display_t *vd);
 static void SplitterClose(vout_display_t *vd);
 
 /*****************************************************************************
@@ -100,7 +101,6 @@ static vout_display_t *vout_display_New(vlc_object_t *obj,
     vd->prepare = NULL;
     vd->display = NULL;
     vd->control = NULL;
-    vd->manage = NULL;
     vd->sys = NULL;
 
     vd->owner = *owner;
@@ -146,12 +146,6 @@ static int vout_display_Control(vout_display_t *vd, int query, ...)
     return result;
 }
 
-static void vout_display_Manage(vout_display_t *vd)
-{
-    if (vd->manage)
-        vd->manage(vd);
-}
-
 /* */
 void vout_display_GetDefaultDisplaySize(unsigned *width, unsigned *height,
                                         const video_format_t *source,
@@ -717,7 +711,8 @@ bool vout_ManageDisplay(vout_display_t *vd, bool allow_reset_pictures)
 {
     vout_display_owner_sys_t *osys = vd->owner.sys;
 
-    vout_display_Manage(vd);
+    if (osys->is_splitter)
+        SplitterManage(vd);
 
     /* Handle mouse timeout */
     const mtime_t date = mdate();
@@ -1447,7 +1442,6 @@ vout_display_t *vout_NewSplitter(vout_thread_t *vout,
     wrapper->prepare = SplitterPrepare;
     wrapper->display = SplitterDisplay;
     wrapper->control = SplitterControl;
-    wrapper->manage  = SplitterManage;
     wrapper->sys     = sys;
 
     /* */