From 718807b78b689f8f478b08ebaa101afce9ffd3dd Mon Sep 17 00:00:00 2001 From: James Ross-Gowan Date: Sun, 22 Nov 2015 21:40:20 +1100 Subject: win32: don't show progress indicator in idle mode --- video/out/vo.h | 1 + video/out/w32_common.c | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) (limited to 'video') diff --git a/video/out/vo.h b/video/out/vo.h index 3a8231a295..a9000ebb86 100644 --- a/video/out/vo.h +++ b/video/out/vo.h @@ -133,6 +133,7 @@ struct voctrl_get_equalizer_args { // VOCTRL_UPDATE_PLAYBACK_STATE struct voctrl_playback_state { + bool playing; bool paused; int percent_pos; }; diff --git a/video/out/w32_common.c b/video/out/w32_common.c index 6f0bb82ed3..6d02c62c57 100644 --- a/video/out/w32_common.c +++ b/video/out/w32_common.c @@ -1376,13 +1376,20 @@ static int gui_thread_control(struct vo_w32_state *w32, int request, void *arg) struct voctrl_playback_state *pstate = (struct voctrl_playback_state *)arg; - if (w32->taskbar_list3 && w32->tbtnCreated) { - ITaskbarList3_SetProgressValue(w32->taskbar_list3, w32->window, - pstate->percent_pos, 100); + if (!w32->taskbar_list3 || !w32->tbtnCreated) + return VO_TRUE; + + if (!pstate->playing) { ITaskbarList3_SetProgressState(w32->taskbar_list3, w32->window, - pstate->paused ? TBPF_PAUSED : - TBPF_NORMAL); + TBPF_NOPROGRESS); + return VO_TRUE; } + + ITaskbarList3_SetProgressValue(w32->taskbar_list3, w32->window, + pstate->percent_pos, 100); + ITaskbarList3_SetProgressState(w32->taskbar_list3, w32->window, + pstate->paused ? TBPF_PAUSED : + TBPF_NORMAL); return VO_TRUE; } case VOCTRL_GET_DISPLAY_FPS: -- cgit v1.2.3