[vlc-commits] window: inline vout_SendEventKey()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu May 31 21:38:39 2018 +0300| [0f0cd959af07a90d8adc62d143792b8c7afcd9bd] | committer: Rémi Denis-Courmont

window: inline vout_SendEventKey()

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

 src/video_output/event.h  | 4 ----
 src/video_output/window.c | 6 ++----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/video_output/event.h b/src/video_output/event.h
index 1e237d7142..949ca2ccb2 100644
--- a/src/video_output/event.h
+++ b/src/video_output/event.h
@@ -37,10 +37,6 @@
  * (Some case may infinite loop otherwise here)
  */
 
-static inline void vout_SendEventKey(vout_thread_t *vout, int key)
-{
-    var_SetInteger(vout->obj.libvlc, "key-pressed", key);
-}
 static inline void vout_SendEventViewpointMoved(vout_thread_t *vout,
                                                 const vlc_viewpoint_t *p_viewpoint)
 {
diff --git a/src/video_output/window.c b/src/video_output/window.c
index 4362ef72b5..97f19ff055 100644
--- a/src/video_output/window.c
+++ b/src/video_output/window.c
@@ -123,7 +123,7 @@ void vout_window_SetInhibition(vout_window_t *window, bool enabled)
 #include <vlc_vout.h>
 #include <vlc_vout_display.h>
 #include "window.h"
-#include "event.h"
+#include "vout_internal.h"
 
 #define DOUBLE_CLICK_TIME (3 * CLOCK_FREQ / 10)
 
@@ -235,9 +235,7 @@ static void vout_display_window_MouseEvent(vout_window_t *window,
 static void vout_display_window_KeyboardEvent(vout_window_t *window,
                                               unsigned key)
 {
-    vout_thread_t *vout = (vout_thread_t *)window->obj.parent;
-
-    vout_SendEventKey(vout, key);
+    var_SetInteger(window->obj.libvlc, "key-pressed", key);
 }
 
 static void vout_display_window_OutputEvent(vout_window_t *window,