vlc | branch: master | Rémi Denis-Courmont <r...@remlab.net> | Wed May 16 22:54:50 2018 +0300| [50629defb19b577bc48a75e7f11a3d19578fd50d] | committer: Rémi Denis-Courmont
display: attach window automatically Rather than attach the window to the same vout display for each plugin sequentially probed, attach the window once after probe. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=50629defb19b577bc48a75e7f11a3d19578fd50d --- 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 68c1dc91e8..08e1311a58 100644 --- a/src/video_output/display.c +++ b/src/video_output/display.c @@ -113,6 +113,10 @@ static vout_display_t *vout_display_New(vlc_object_t *obj, } else { vd->module = NULL; } + + if (cfg->window != NULL) + vout_display_window_Attach(cfg->window, vd); + return vd; } @@ -643,8 +647,6 @@ static vout_window_t *VoutDisplayNewWindow(vout_display_t *vd, unsigned type) return NULL; if (type != VOUT_WINDOW_TYPE_INVALID && type != window->type) return NULL; - - vout_display_window_Attach(window, vd); return window; } @@ -1231,8 +1233,6 @@ static vout_window_t *SplitterNewWindow(vout_display_t *vd, unsigned type) return NULL; if (type != VOUT_WINDOW_TYPE_INVALID && type != window->type) return NULL; - - vout_display_window_Attach(window, vd); return window; } _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
