[feat] 增加演奏进度条

1. 单人与多人ui上增加静态的演奏进度条

Author: Nomination-NRB

src/app.py

@@ -1,6 +1,6 @@
 import os
 import tkinter as tk
-from tkinter import filedialog, messagebox
+from tkinter import filedialog, messagebox, ttk
 from typing import List, Optional
 
 from src.player import Player
@@ -44,6 +44,13 @@ def _create_params_frame(self):
         self.ent_latency = tk.Entry(params, width=8)
         self.ent_latency.insert(0, "0")
         self.ent_latency.grid(row=0, column=5, sticky="w", padx=6)
+        
+        # 添加进度更新频率配置
+        tk.Label(params, text="进度更新频率：").grid(row=1, column=0, sticky="e")
+        self.ent_progress_freq = tk.Entry(params, width=8)
+        self.ent_progress_freq.insert(0, "1")
+        self.ent_progress_freq.grid(row=1, column=1, sticky="w", padx=6)
+        tk.Label(params, text="(1=每个动作都更新, 2=每2个动作更新, 以此类推)").grid(row=1, column=2, columnspan=4, sticky="w")
 
     def _create_control_frame(self):
         ctrl = tk.Frame(self.frm)
@@ -54,6 +61,14 @@ def _create_control_frame(self):
         self.btn_stop.pack(side="left", padx=4)
         self.lbl_status = tk.Label(ctrl, text="状态：等待载入乐谱")
         self.lbl_status.pack(side="left", padx=10)
+        
+        # 添加进度条框架
+        progress_frame = tk.Frame(self.frm)
+        progress_frame.pack(fill="x", pady=4)
+        self.lbl_progress = tk.Label(progress_frame, text="进度：0%")
+        self.lbl_progress.pack(side="left", padx=10)
+        self.progress_bar = ttk.Progressbar(progress_frame, mode='determinate', length=300)
+        self.progress_bar.pack(side="left", padx=4, fill="x", expand=True)
 
     def _create_tips_frame(self):
         tips = tk.LabelFrame(self.frm, text="使用提示")
@@ -65,6 +80,21 @@ def _create_tips_frame(self):
             "4) 如无响应尝试以管理员身份运行 Python。"
         )).pack(fill="x")
 
+    def update_progress(self, current: int, total: int):
+        """更新进度条和进度标签"""
+        if total > 0:
+            percentage = int((current / total) * 100)
+            self.progress_bar['value'] = percentage
+            self.lbl_progress.config(text=f"进度：{percentage}% ({current}/{total})")
+        else:
+            self.progress_bar['value'] = 0
+            self.lbl_progress.config(text="进度：0%")
+
+    def reset_progress(self):
+        """重置进度条"""
+        self.progress_bar['value'] = 0
+        self.lbl_progress.config(text="进度：0%")
+
     def load_score(self):
         """加载乐谱文件，支持 .lrcp 或 .mid；若为 .mid 则先自动转换为 .lrcp 再读取"""
         path = filedialog.askopenfilename(
@@ -119,6 +149,7 @@ def stop_play(self):
         if self.player:
             self.player.stop()
             self.player = None
+            self.reset_progress()
 
 
 if __name__ == '__main__':

src/app_multi.py

@@ -26,13 +26,13 @@ def __init__(self, root: tk.Tk):
             '4) 适度调整偏移可减少漏音（建议 -20~20 范围内微调）。'
         )).pack(fill="x")
 
-        # 添加多人模式特有的参数
+        # 添加多人模式特有的参数 - 使用正确的行数
         params = self.frm.winfo_children()[1]  # 获取第二个子元素（params）
-        tk.Label(params, text="多音偏移(ms):").grid(row=1, column=0, sticky="e")
+        tk.Label(params, text="多音偏移(ms):").grid(row=2, column=0, sticky="e")
         self.ent_offsets = tk.Entry(params, width=20)
         self.ent_offsets.insert(0, "-15,0,15")
-        self.ent_offsets.grid(row=1, column=1, columnspan=3, sticky="w", padx=4)
-        tk.Label(params, text="范围-50~50，按顺序循环应用到同一时间的多个音").grid(row=1, column=4, columnspan=2, sticky="w")
+        self.ent_offsets.grid(row=2, column=1, columnspan=3, sticky="w", padx=4)
+        tk.Label(params, text="范围-50~50，按顺序循环应用到同一时间的多个音").grid(row=2, column=4, columnspan=2, sticky="w")
 
     def _parse_score(self, score_text: str) -> List[Event]:
         return parse_score(score_text, multi=True)
@@ -62,19 +62,27 @@ def start_play(self):
             latency = int(float(self.ent_latency.get()))
         except:
             latency = 0
+            
+        try:
+            progress_freq = int(float(self.ent_progress_freq.get()))
+        except:
+            progress_freq = 1
 
         # 每次开始前按当前偏移重新生成
         self.update_play_events()
         self.btn_start.config(state="disabled")
         self.btn_stop.config(state="normal")
         self.lbl_status.config(text=f'演奏中… (总 {len(self.play_events)} 单音事件)')
+        
+        # 重置进度条
+        self.reset_progress()
 
         def on_done():
             self.btn_start.config(state="normal")
             self.btn_stop.config(state="disabled")
             self.lbl_status.config(text='完成/已停止')
 
-        self.player = Player(self.play_events, countin, latency, speed, on_done)
+        self.player = Player(self.play_events, countin, latency, speed, on_done, self.update_progress, progress_freq)
         self.player.start()
 
     def parse_offsets(self) -> List[int]:

src/app_single.py

@@ -55,17 +55,25 @@ def start_play(self):
             latency = int(float(self.ent_latency.get()))
         except:
             latency = 0
+            
+        try:
+            progress_freq = int(float(self.ent_progress_freq.get()))
+        except:
+            progress_freq = 1
 
         self.btn_start.config(state="disabled")
         self.btn_stop.config(state="normal")
         self.lbl_status.config(text="演奏中…（切到游戏保持焦点）")
+        
+        # 重置进度条
+        self.reset_progress()
 
         def on_done():
             self.btn_start.config(state="normal")
             self.btn_stop.config(state="disabled")
             self.lbl_status.config(text="完成/已停止")
 
-        self.player = Player(self.events, countin, latency, speed, on_done)
+        self.player = Player(self.events, countin, latency, speed, on_done, self.update_progress, progress_freq)
         self.player.start()
 
 

src/player.py

@@ -1,25 +1,28 @@
 import time
 import threading
-from typing import List, Tuple, Union
+from typing import List, Tuple, Union, Optional, Callable
 
 from src.event import Event, SimpleEvent
 from src.key_sender import key_sender
 
 
 class Player(threading.Thread):
-    def __init__(self, events: List[Union[Event, SimpleEvent]], start_delay: float, global_latency_ms: int, speed_ratio: float, on_done):
+    def __init__(self, events: List[Union[Event, SimpleEvent]], start_delay: float, global_latency_ms: int, speed_ratio: float, on_done, progress_callback: Optional[Callable[[int, int], None]] = None, progress_update_freq: int = 1):
         super().__init__(daemon=True)
         self.events = events
         self.start_delay = max(0.0, start_delay)
         self.global_latency = max(0, global_latency_ms) / 1000.0
         self.speed_ratio = max(0.05, speed_ratio)
         self._stop = threading.Event()
         self.on_done = on_done
+        self.progress_callback = progress_callback
+        self.progress_update_freq = max(1, progress_update_freq)  # 确保至少为1
 
     def stop(self):
         self._stop.set()
 
     def run(self):
+        total_actions = 0
         try:
             if not self.events:
                 return
@@ -48,7 +51,9 @@ def run(self):
             actions.sort(key=lambda x: x[0])
             t0 = time.perf_counter() + self.start_delay
             idx = 0
-            while idx < len(actions) and not self._stop.is_set():
+            total_actions = len(actions)
+
+            while idx < total_actions and not self._stop.is_set():
                 now = time.perf_counter()
                 target = t0 + actions[idx][0] + self.global_latency
                 wait = target - now
@@ -61,9 +66,17 @@ def run(self):
                 else:
                     key_sender.release(keys)
                 idx += 1
+                
+                # 根据用户配置的频率更新进度
+                if self.progress_callback and (idx % self.progress_update_freq == 0 or idx == total_actions):
+                    self.progress_callback(idx, total_actions)
+                    
         finally:
             # 确保释放所有剩余按键
             key_sender.release_all()
+            # 报告完成进度
+            if self.progress_callback:
+                self.progress_callback(total_actions, total_actions)
             if self.on_done:
                 self.on_done()