vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Dec 9 12:42:25 2018 +0200| [e7b0032f5bbdc3e16a08501eae55f3211a574fd7] | committer: Rémi Denis-Courmont
vout_wrapper: reorder code No functional changes > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e7b0032f5bbdc3e16a08501eae55f3211a574fd7 --- src/video_output/vout_wrapper.c | 52 ++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/src/video_output/vout_wrapper.c b/src/video_output/vout_wrapper.c index ec0efdc513..102370c6b2 100644 --- a/src/video_output/vout_wrapper.c +++ b/src/video_output/vout_wrapper.c @@ -43,6 +43,17 @@ static int Forward(vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void *); #endif +/* Minimum number of display picture */ +#define DISPLAY_PICTURE_COUNT (1) + +static void NoDrInit(vout_thread_sys_t *sys) +{ + if (sys->display.use_dr) + sys->display_pool = vout_display_Pool(sys->display.vd, 3); + else + sys->display_pool = NULL; +} + /***************************************************************************** * *****************************************************************************/ @@ -79,32 +90,6 @@ int vout_OpenWrapper(vout_thread_t *vout, /***************************************************************************** * *****************************************************************************/ -void vout_CloseWrapper(vout_thread_t *vout, vout_display_cfg_t *cfg) -{ - vout_thread_sys_t *sys = vout->p; - -#ifdef _WIN32 - var_DelCallback(vout, "video-wallpaper", Forward, NULL); -#endif - sys->decoder_pool = NULL; /* FIXME remove */ - - vout_DeleteDisplay(sys->display.vd, cfg); -} - -/***************************************************************************** - * - *****************************************************************************/ -/* Minimum number of display picture */ -#define DISPLAY_PICTURE_COUNT (1) - -static void NoDrInit(vout_thread_sys_t *sys) -{ - if (sys->display.use_dr) - sys->display_pool = vout_display_Pool(sys->display.vd, 3); - else - sys->display_pool = NULL; -} - int vout_InitWrapper(vout_thread_t *vout) { vout_thread_sys_t *sys = vout->p; @@ -179,6 +164,21 @@ void vout_EndWrapper(vout_thread_t *vout) /***************************************************************************** * *****************************************************************************/ +void vout_CloseWrapper(vout_thread_t *vout, vout_display_cfg_t *cfg) +{ + vout_thread_sys_t *sys = vout->p; + +#ifdef _WIN32 + var_DelCallback(vout, "video-wallpaper", Forward, NULL); +#endif + sys->decoder_pool = NULL; /* FIXME remove */ + + vout_DeleteDisplay(sys->display.vd, cfg); +} + +/***************************************************************************** + * + *****************************************************************************/ void vout_ManageWrapper(vout_thread_t *vout) { vout_thread_sys_t *sys = vout->p; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
