[vlc-commits] display: move prepare & display helpers

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Dec 27 12:23:18 2018 +0200| [1864d449a22f858a0f78b5019e444ae103bcfb1c] | committer: Rémi Denis-Courmont

display: move prepare & display helpers

...to public headers.

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

 include/vlc_vout_display.h      | 20 ++++++++++++++++++++
 src/video_output/vout_wrapper.h | 22 ----------------------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h
index d37b05b8af..c740f210c0 100644
--- a/include/vlc_vout_display.h
+++ b/include/vlc_vout_display.h
@@ -314,6 +314,26 @@ struct vout_display_t {
     vout_display_owner_t owner;
 };
 
+/**
+ * Prepares a picture for display.
+ */
+static inline void vout_display_Prepare(vout_display_t *vd, picture_t *picture,
+                                        subpicture_t *subpic, vlc_tick_t date)
+{
+    if (vd->prepare != NULL)
+        vd->prepare(vd, picture, subpic, date);
+}
+
+/**
+ * Displays a picture.
+ */
+static inline void vout_display_Display(vout_display_t *vd, picture_t *picture)
+{
+    if (vd->display != NULL)
+        vd->display(vd, picture);
+    picture_Release(picture);
+}
+
 static inline void vout_display_SendEvent(vout_display_t *vd, int query, ...)
 {
     va_list args;
diff --git a/src/video_output/vout_wrapper.h b/src/video_output/vout_wrapper.h
index 9fc42704b4..fe14100abc 100644
--- a/src/video_output/vout_wrapper.h
+++ b/src/video_output/vout_wrapper.h
@@ -31,28 +31,6 @@
 picture_pool_t *vout_GetPool(vout_display_t *vd, unsigned count);
 
 /**
- * It preparse a picture for display.
- */
-static inline void vout_display_Prepare(vout_display_t *vd,
-                                        picture_t *picture,
-                                        subpicture_t *subpicture,
-                                        vlc_tick_t date)
-{
-    if (vd->prepare)
-        vd->prepare(vd, picture, subpicture, date);
-}
-
-/**
- * It display a picture.
- */
-static inline void vout_display_Display(vout_display_t *vd, picture_t *picture)
-{
-    if (vd->display)
-        vd->display(vd, picture);
-    picture_Release(picture);
-}
-
-/**
  * It creates a vout managed display.
  */
 vout_display_t *vout_NewDisplay( vout_thread_t *, const video_format_t *,