[vlc-commits] window: deinline window/fullscreen event callbacks

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Mar 30 14:23:06 2019 +0200| [4a43cfdd4ba5d75dcc23dcdc88c0d5e9a36668c9] | committer: Rémi Denis-Courmont

window: deinline window/fullscreen event callbacks

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

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

diff --git a/include/vlc_vout_window.h b/include/vlc_vout_window.h
index 11752116bf..aea7a1f4cd 100644
--- a/include/vlc_vout_window.h
+++ b/include/vlc_vout_window.h
@@ -575,23 +575,14 @@ static inline void vout_window_ReportState(vout_window_t *window,
  * This notifies the owner of the window that the window is windowed, i.e. not
  * in full screen mode.
  */
-static inline void vout_window_ReportWindowed(vout_window_t *window)
-{
-    if (window->owner.cbs->windowed != NULL)
-        window->owner.cbs->windowed(window);
-}
+VLC_API void vout_window_ReportWindowed(vout_window_t *wnd);
 
 /**
  * Reports that the window is in full screen.
  *
  * \param id fullscreen output nul-terminated identifier, NULL for default
  */
-static inline void vout_window_ReportFullscreen(vout_window_t *window,
-                                                const char *id)
-{
-    if (window->owner.cbs->fullscreened != NULL)
-        window->owner.cbs->fullscreened(window, id);
-}
+VLC_API void vout_window_ReportFullscreen(vout_window_t *wnd, const char *id);
 
 static inline void vout_window_SendMouseEvent(vout_window_t *window,
                                               const vout_window_mouse_event_t *mouse)
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 347522e68c..ed5e1ee661 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -765,6 +765,8 @@ vout_window_New
 vout_window_Delete
 vout_window_Enable
 vout_window_Disable
+vout_window_ReportWindowed
+vout_window_ReportFullscreen
 vout_display_GetDefaultDisplaySize
 vout_display_PlacePicture
 vout_display_SendEventPicturesInvalid
diff --git a/src/video_output/window.c b/src/video_output/window.c
index f6599b3eff..3eba9d8344 100644
--- a/src/video_output/window.c
+++ b/src/video_output/window.c
@@ -127,6 +127,18 @@ void vout_window_SetInhibition(vout_window_t *window, bool enabled)
         vlc_inhibit_Set(w->inhibit, flags);
 }
 
+void vout_window_ReportWindowed(vout_window_t *window)
+{
+    if (window->owner.cbs->windowed != NULL)
+        window->owner.cbs->windowed(window);
+}
+
+void vout_window_ReportFullscreen(vout_window_t *window, const char *id)
+{
+    if (window->owner.cbs->fullscreened != NULL)
+        window->owner.cbs->fullscreened(window, id);
+}
+
 /* Video output display integration */
 #include <vlc_vout.h>
 #include <vlc_vout_display.h>