[vlc-commits] vout: inline vout_NewDisplayWindow into SplitterNewWindow and simplify

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Oct 11 17:23:47 2014 +0300| [f7314b4abee66be80dd52d0b2351a668ae1f1309] | committer: Rémi Denis-Courmont

vout: inline vout_NewDisplayWindow into SplitterNewWindow and simplify

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

 src/video_output/display.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/video_output/display.c b/src/video_output/display.c
index 0f1af50..cdd3b91 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -1445,14 +1445,14 @@ static vout_window_t *SplitterNewWindow(vout_display_t *vd, const vout_window_cf
     vout_window_cfg_t cfg = *cfg_ptr;
     cfg.is_standalone = true;
 
-    return vout_NewDisplayWindow(osys->vout, &cfg);
+    return vout_window_New(VLC_OBJECT(osys->vout), "$window", &cfg);
 }
 
 static void SplitterDelWindow(vout_display_t *vd, vout_window_t *window)
 {
-    vout_display_owner_sys_t *osys = vd->owner.sys;
-
-    vout_DeleteDisplayWindow(osys->vout, window);
+    if (window != NULL)
+        vout_window_Delete(window);
+    (void) vd;
 }
 
 static void SplitterEvent(vout_display_t *vd, int event, va_list args)