]> git.sesse.net Git - vlc/commitdiff
vout: inline vout_NewDisplayWindow into SplitterNewWindow and simplify
authorRémi Denis-Courmont <remi@remlab.net>
Sat, 11 Oct 2014 14:23:47 +0000 (17:23 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Thu, 16 Oct 2014 17:23:38 +0000 (20:23 +0300)
src/video_output/display.c

index 0f1af5042717b34bda9f2f7c0fed34249f582f6d..cdd3b91d3fab720535e546242d57005a0cea9cd1 100644 (file)
@@ -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)