[vlc-commits] vout: remove/inline vout_SendEventClose

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun May 20 12:37:27 2018 +0300| [f31997e041955da6d51477ca820dabdbdd8956ae] | committer: Rémi Denis-Courmont

vout: remove/inline vout_SendEventClose

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

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

diff --git a/src/video_output/event.h b/src/video_output/event.h
index 4348f7792b..63323fc719 100644
--- a/src/video_output/event.h
+++ b/src/video_output/event.h
@@ -37,13 +37,6 @@
  * (Some case may infinite loop otherwise here)
  */
 
-static inline void vout_SendEventClose(vout_thread_t *vout)
-{
-#warning FIXME: implement video close event
-    /* FIXME: this code is disabled as it breaks the non-playlist cases */
-    //playlist_Stop(pl_Get(vout));
-    (void) vout;
-}
 static inline void vout_SendEventKey(vout_thread_t *vout, int key)
 {
     var_SetInteger(vout->obj.libvlc, "key-pressed", key);
diff --git a/src/video_output/window.c b/src/video_output/window.c
index 0fdbd2c9fb..19a93cbc17 100644
--- a/src/video_output/window.c
+++ b/src/video_output/window.c
@@ -145,9 +145,9 @@ static void vout_display_window_ResizeNotify(vout_window_t *window,
 
 static void vout_display_window_CloseNotify(vout_window_t *window)
 {
-    vout_thread_t *vout = (vout_thread_t *)window->obj.parent;
-
-    vout_SendEventClose(vout);
+    /* TODO: Nowhere to dispatch to currently.
+     * Needs callback to ES output to deselect ES? */
+    msg_Err(window, "window closed");
 }
 
 static void vout_display_window_MouseEvent(vout_window_t *window,