[vlc-commits] vout_window: inline vout_window_Control()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Sep 13 17:41:43 2014 +0300| [09b7f634fc142409a288e509f3e6a4e1b41b534d] | committer: Rémi Denis-Courmont

vout_window: inline vout_window_Control()

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

 include/vlc_vout_window.h |   11 ++++++++++-
 src/libvlccore.sym        |    1 -
 src/video_output/window.c |   11 -----------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/include/vlc_vout_window.h b/include/vlc_vout_window.h
index 265e7cb..acfe160 100644
--- a/include/vlc_vout_window.h
+++ b/include/vlc_vout_window.h
@@ -148,7 +148,16 @@ static inline int vout_window_vaControl(vout_window_t *window, int query,
  *
  * @warning The caller must own the window, as vout_window_t is not thread safe.
  */
-VLC_API int vout_window_Control(vout_window_t *, int query, ...);
+static inline int vout_window_Control(vout_window_t *window, int query, ...)
+{
+    va_list ap;
+    int ret;
+
+    va_start(ap, query);
+    ret = vout_window_vaControl(window, query, ap);
+    va_end(ap);
+    return ret;
+}
 
 /**
  * Configures the window manager state for this window.
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index bdd7b06..2808f5f 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -623,7 +623,6 @@ vout_OSDSlider
 vout_OSDText
 vout_Request
 vout_window_New
-vout_window_Control
 vout_window_Delete
 vout_NewDisplay
 vout_DeleteDisplay
diff --git a/src/video_output/window.c b/src/video_output/window.c
index 8be5492..95d7d14 100644
--- a/src/video_output/window.c
+++ b/src/video_output/window.c
@@ -138,14 +138,3 @@ void vout_window_Delete(vout_window_t *window)
     vlc_module_unload(w->module, vout_window_stop, window);
     vlc_object_release(window);
 }
-
-int vout_window_Control(vout_window_t *window, int query, ...)
-{
-    va_list args;
-    va_start(args, query);
-    int ret = window->control(window, query, args);
-    va_end(args);
-
-    return ret;
-}
-