vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sat Dec 8 19:32:31 2018 +0200| [b4214e0e2f63e2781814296618c5f450f9c11b58] | committer: Rémi Denis-Courmont
vout: remove vout_display_state_t.wm_state > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b4214e0e2f63e2781814296618c5f450f9c11b58 --- src/video_output/display.c | 14 ++++++-------- src/video_output/video_output.c | 9 --------- src/video_output/vout_wrapper.h | 3 --- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/src/video_output/display.c b/src/video_output/display.c index 4979e1997f..7f0dfb33be 100644 --- a/src/video_output/display.c +++ b/src/video_output/display.c @@ -956,7 +956,10 @@ static vout_display_t *DisplayNew(vout_thread_t *vout, #if defined(_WIN32) || defined(__OS2__) osys->is_fullscreen = osys->cfg.is_fullscreen; - osys->wm_state = state->wm_state; + osys->wm_state = var_InheritBool(vout, "video-wallpaper") + ? VOUT_WINDOW_STATE_BELOW + : var_InheritBool(vout, "video-on-top") + ? VOUT_WINDOW_STATE_ABOVE : VOUT_WINDOW_STATE_NORMAL; osys->ch_wm_state = true; #endif @@ -1002,13 +1005,8 @@ void vout_DeleteDisplay(vout_display_t *vd, vout_display_state_t *state) { vout_display_owner_sys_t *osys = vd->owner.sys; - if (state) { - if (!osys->is_splitter) - state->cfg = osys->cfg; -#if defined(_WIN32) || defined(__OS2__) - state->wm_state = osys->wm_state; -#endif - } + if (state != NULL && !osys->is_splitter) + state->cfg = osys->cfg; VoutDisplayDestroyRender(vd); if (osys->is_splitter) diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index 819f8d4168..f2e0a79588 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -1453,15 +1453,6 @@ static int ThreadStart(vout_thread_t *vout, vout_display_state_t *state) vout_display_state_t state_default; if (!state) { VoutGetDisplayCfg(vout, &state_default.cfg); - -#if defined(_WIN32) || defined(__OS2__) - bool below = var_InheritBool(vout, "video-wallpaper"); - bool above = var_InheritBool(vout, "video-on-top"); - - state_default.wm_state = below ? VOUT_WINDOW_STATE_BELOW - : above ? VOUT_WINDOW_STATE_ABOVE - : VOUT_WINDOW_STATE_NORMAL; -#endif state = &state_default; } diff --git a/src/video_output/vout_wrapper.h b/src/video_output/vout_wrapper.h index 28ca12744f..5a422e4f73 100644 --- a/src/video_output/vout_wrapper.h +++ b/src/video_output/vout_wrapper.h @@ -63,9 +63,6 @@ static inline void vout_display_Display(vout_display_t *vd, picture_t *picture) */ typedef struct { vout_display_cfg_t cfg; -#if defined(_WIN32) || defined(__OS2__) - unsigned wm_state; -#endif } vout_display_state_t; /** _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
