vlc | branch: master | Thomas Guillem <[email protected]> | Sun Oct 28 15:57:44 2018 +0100| [3f6e104b51ed2eb3d7357034718b670d1694a490] | committer: Steve Lhomme
vout: remove deprecated window controls > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3f6e104b51ed2eb3d7357034718b670d1694a490 --- include/vlc_vout_display.h | 30 ------------------------------ include/vlc_vout_window.h | 3 +-- 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h index cb96629d75..04b5e78dbd 100644 --- a/include/vlc_vout_display.h +++ b/include/vlc_vout_display.h @@ -302,32 +302,12 @@ static inline void vout_display_SendEvent(vout_display_t *vd, int query, ...) va_end(args); } -VLC_DEPRECATED /* Use vout_window_ReportSize() in window provider instead. */ -static inline void vout_display_SendEventDisplaySize(vout_display_t *vd, - int width, int height) -{ - vout_window_ReportSize(vd->cfg->window, width, height); -} - static inline void vout_display_SendEventPicturesInvalid(vout_display_t *vd) { vout_display_SendEvent(vd, VOUT_DISPLAY_EVENT_PICTURES_INVALID); } -VLC_DEPRECATED /* Use vout_window_ReportClose() in window provider instead. */ -static inline void vout_display_SendEventClose(vout_display_t *vd) -{ - vout_window_ReportClose(vd->cfg->window); -} - #if defined(_WIN32) || defined(__OS2__) -VLC_DEPRECATED -/* Use vout_window_ReportKeyPress() in window provider instead. */ -static inline void vout_display_SendEventKey(vout_display_t *vd, int key) -{ - vout_window_ReportKeyPress(vd->cfg->window, key); -} - static inline void vout_display_SendEventFullscreen(vout_display_t *vd, bool is_fullscreen) { vout_display_SendEvent(vd, VOUT_DISPLAY_EVENT_FULLSCREEN, is_fullscreen); @@ -361,16 +341,6 @@ static inline void vout_display_SendEventViewpointMoved(vout_display_t *vd, vout_display_SendEvent(vd, VOUT_DISPLAY_EVENT_VIEWPOINT_MOVED, vp); } -/** - * Asks for a new window of a given type. - */ -static inline vout_window_t *vout_display_NewWindow(vout_display_t *vd, unsigned type) -{ - vout_window_t *wnd = vd->cfg->window; - - return (type == wnd->type) ? wnd : NULL; -} - static inline bool vout_display_cfg_IsWindowed(const vout_display_cfg_t *cfg) { return cfg->window->type != VOUT_WINDOW_TYPE_DUMMY; diff --git a/include/vlc_vout_window.h b/include/vlc_vout_window.h index 3ba0e0f864..00977d9bb2 100644 --- a/include/vlc_vout_window.h +++ b/include/vlc_vout_window.h @@ -218,8 +218,7 @@ struct vout_window_t { * Creates a new window. * * @param module plugin name (usually "$window") - * @note If you are inside a "vout display", you must use - * vout_display_NewWindow() instead. This enables recycling windows. + * @note don't use it inside a "vout display" module */ VLC_API vout_window_t * vout_window_New(vlc_object_t *, const char *module, const vout_window_cfg_t *, const vout_window_owner_t *); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
