[vlc-commits] display: move vout_display_Control() to public header

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Dec 30 21:35:44 2018 +0200| [7943781bd6acbceafa5268e1e1433f9b0d9d6d9c] | committer: Rémi Denis-Courmont

display: move vout_display_Control() to public header

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

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

diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h
index c0d44dd33d..8c8d7b1b8f 100644
--- a/include/vlc_vout_display.h
+++ b/include/vlc_vout_display.h
@@ -334,6 +334,17 @@ static inline void vout_display_Display(vout_display_t *vd, picture_t *picture)
     picture_Release(picture);
 }
 
+static inline int vout_display_Control(vout_display_t *vd, int query, ...)
+{
+    va_list ap;
+    int ret;
+
+    va_start(ap, query);
+    ret = vd->control(vd, query, ap);
+    va_end(ap);
+    return ret;
+}
+
 static inline void vout_display_SendEvent(vout_display_t *vd, int query, ...)
 {
     va_list args;
diff --git a/src/video_output/display.c b/src/video_output/display.c
index 5bff2867b2..d9acf089af 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -94,21 +94,6 @@ static void vout_display_stop(void *func, va_list ap)
     deactivate(va_arg(ap, vout_display_t *));
 }
 
-/**
- * It controls a vout_display_t
- */
-static int vout_display_Control(vout_display_t *vd, int query, ...)
-{
-    va_list args;
-    int result;
-
-    va_start(args, query);
-    result = vd->control(vd, query, args);
-    va_end(args);
-
-    return result;
-}
-
 /* */
 void vout_display_GetDefaultDisplaySize(unsigned *width, unsigned *height,
                                         const video_format_t *source,