vlc | branch: master | Steve Lhomme <[email protected]> | Tue Mar 26 16:36:55 2019 +0100| [1476772a3f8803a4acb08f4082114c06cfea5021] | committer: Steve Lhomme
vout:win32: do not use vout_display_SendWindowState anymore on Windows nor VOUT_DISPLAY_CHANGE_WINDOW_STATE which are both deprecated. We either use the above/normal mode in the GUI or it's handled by the non-embedded window internally. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1476772a3f8803a4acb08f4082114c06cfea5021 --- include/vlc_vout_display.h | 8 ++------ src/video_output/display.c | 2 ++ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h index ef965ebeab..9b532d2557 100644 --- a/include/vlc_vout_display.h +++ b/include/vlc_vout_display.h @@ -130,6 +130,8 @@ enum { /* Ask the module to acknowledge/refuse the fullscreen state change after * being requested (externally or by VOUT_DISPLAY_EVENT_FULLSCREEN */ VOUT_DISPLAY_CHANGE_FULLSCREEN VLC_DEPRECATED_ENUM, /* bool fs */ +#endif +#if defined(__OS2__) /* Ask the module to acknowledge/refuse the window management state change * after being requested externally or by VOUT_DISPLAY_WINDOW_STATE */ VOUT_DISPLAY_CHANGE_WINDOW_STATE VLC_DEPRECATED_ENUM, /* unsigned state */ @@ -381,12 +383,6 @@ static inline void vout_display_SendEventFullscreen(vout_display_t *vd, bool is_ is_fullscreen) == VLC_SUCCESS) ((vout_display_cfg_t *)vd->cfg)->is_fullscreen = is_fullscreen; } - -VLC_DEPRECATED -static inline void vout_display_SendWindowState(vout_display_t *vd, unsigned state) -{ - vout_display_Control(vd, VOUT_DISPLAY_CHANGE_WINDOW_STATE, state); -} #endif static inline void vout_display_SendEventMousePressed(vout_display_t *vd, int button) { diff --git a/src/video_output/display.c b/src/video_output/display.c index 2928631a29..8395758bb1 100644 --- a/src/video_output/display.c +++ b/src/video_output/display.c @@ -784,7 +784,9 @@ vout_display_t *vout_display_New(vlc_object_t *parent, && vout_display_Control(vd, VOUT_DISPLAY_CHANGE_FULLSCREEN, true) == VLC_SUCCESS) osys->cfg.is_fullscreen = true; +#endif +#if defined(__OS2__) if (var_InheritBool(parent, "video-on-top")) vout_display_Control(vd, VOUT_DISPLAY_CHANGE_WINDOW_STATE, (unsigned)VOUT_WINDOW_STATE_ABOVE); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
