[vlc-commits] window: inline vout_display_window_Attach()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat May 19 12:52:06 2018 +0300| [a731e29f28b6ef010ae65a215b9993df2db48186] | committer: Rémi Denis-Courmont

window: inline vout_display_window_Attach()

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

 src/video_output/display.c |  3 ++-
 src/video_output/window.c  | 10 ----------
 src/video_output/window.h  |  1 -
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/video_output/display.c b/src/video_output/display.c
index 08e1311a58..a8e8fe3338 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -115,7 +115,8 @@ static vout_display_t *vout_display_New(vlc_object_t *obj,
     }
 
     if (cfg->window != NULL)
-        vout_display_window_Attach(cfg->window, vd);
+        vout_window_SetSize(cfg->window,
+                            cfg->display.width, cfg->display.height);
 
     return vd;
 }
diff --git a/src/video_output/window.c b/src/video_output/window.c
index ea8f4106f3..0fdbd2c9fb 100644
--- a/src/video_output/window.c
+++ b/src/video_output/window.c
@@ -245,16 +245,6 @@ vout_window_t *vout_display_window_New(vout_thread_t *vout,
 }
 
 /**
- * Attaches a window to a display. Window events will be dispatched to the
- * display until they are detached.
- */
-void vout_display_window_Attach(vout_window_t *window, vout_display_t *vd)
-{
-    vout_window_SetSize(window,
-                        vd->cfg->display.width, vd->cfg->display.height);
-}
-
-/**
  * Destroys a video window.
  * \note The window must be detached.
  */
diff --git a/src/video_output/window.h b/src/video_output/window.h
index 459d6c38cb..a3272caef8 100644
--- a/src/video_output/window.h
+++ b/src/video_output/window.h
@@ -20,5 +20,4 @@
 
 vout_window_t *vout_display_window_New(vout_thread_t *,
                                        const vout_window_cfg_t *);
-void vout_display_window_Attach(vout_window_t *, vout_display_t *);
 void vout_display_window_Delete(vout_window_t *);