win32: quantize taskbar playback position into uint8 range

Also, if the position is valid, set it to 1 / INF. Windows interprets 0 as non-progress. Progress is quantized into uint8 range, it is good enough for this use-case. This avoids unnecessary vo_control and ITaskbarList3::SetProgressValue calls and should be visually indistinguishable in practice. Fixes #14282

Kacper Michajłow committed 2 years ago

Commit 37127271 parent d3b251b3 files · +17 −8Browse files

Unified · Split

3 files

player/misc.c +8 −6
video/out/vo.h +1 −1
video/out/w32_common.c +8 −1

player/misc.c+8−6

  * License along with mpv.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <stddef.h>
-#include <stdbool.h>
-#include <errno.h>
 #include <assert.h>
+#include <errno.h>
+#include <math.h>
+#include <stdbool.h>
+#include <stddef.h>
 #include "mpv_talloc.h"
 {
     if (mpctx->video_out && mpctx->video_out->config_ok) {
         struct voctrl_playback_state oldstate = mpctx->vo_playback_state;
+        double pos = get_current_pos_ratio(mpctx, false);
         struct voctrl_playback_state newstate = {
-            .taskbar_progress = mpctx->opts->vo->taskbar_progress,
+            .taskbar_progress = mpctx->opts->vo->taskbar_progress && pos >= 0,
             .playing = mpctx->playing,
             .paused = mpctx->paused,
-            .percent_pos = get_percent_pos(mpctx),
+            .position = pos > 0 ? lrint(pos * UINT8_MAX) : 0,
         };
         if (oldstate.taskbar_progress != newstate.taskbar_progress ||
             oldstate.playing != newstate.playing ||
             oldstate.paused != newstate.paused ||
-            oldstate.percent_pos != newstate.percent_pos)
+            oldstate.position != newstate.position)
         {
             // Don't update progress bar if it was and still is hidden
             if ((oldstate.playing && oldstate.taskbar_progress) ||

video/out/vo.h+1−1

@@ -149,7 +149,7 @@ struct voctrl_playback_state { · 148 unmodified lines
149	bool taskbar_progress;	149	bool taskbar_progress;
150	bool playing;	150	bool playing;
151	bool paused;	151	bool paused;
152	int percent_pos;	152	uint8_t position;
153	};	153	};
154		154
155	// VOCTRL_PERFORMANCE_DATA	155	// VOCTRL_PERFORMANCE_DATA

video/out/w32_common.c+8−1

         return;
     }
+    ULONGLONG completed = pstate->position;
+    ULONGLONG total = UINT8_MAX;
+    if (!pstate->position) {
+        completed = 1;
+        total = MAXULONGLONG;
+    }
     ITaskbarList3_SetProgressValue(w32->taskbar_list3, w32->window,
-                                   pstate->percent_pos, 100);
+                                   completed, total);
     ITaskbarList3_SetProgressState(w32->taskbar_list3, w32->window,
                                    pstate->paused ? TBPF_PAUSED :
                                                     TBPF_NORMAL);

win32: quantize taskbar playback position into uint8 range

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code