rewrite DmPlayer to avoid "while"

app.py

@@ -63,7 +63,7 @@ class MyHandler(blivedm.BaseHandler):
         uname = command['data']['uname']
         msg_type = command['data']['msg_type']
         if msg_type == 2:
-            dmplayer.Add(f'谢谢{uname}的关注喵', "bubu.wav")
+            dmplayer.Pend(f'谢谢{uname}的关注喵', "bubu.wav")
 
     _CMD_CALLBACK_DICT['INTERACT_WORD'] = __interact_word_callback
 
@@ -71,20 +71,19 @@ class MyHandler(blivedm.BaseHandler):
         pass
 
     def _on_danmaku(self, client: blivedm.BLiveClient, message: web_models.DanmakuMessage):
-        dmplayer.Add(message.msg, "bubu.wav", test_callback, message.uname, message.msg) # 带有callback的加入队列
+        dmplayer.Pend(message.msg, "bubu.wav", test_callback, message.uname, message.msg) # 带有callback的加入队列
 
     def _on_gift(self, client: blivedm.BLiveClient, message: web_models.GiftMessage):
-        dmplayer.Add(f'感谢{message.uname}赠送的{message.num}个{message.gift_name}，阿里嘎多！', "po.wav") # 普通的加入队列
+        dmplayer.Pend(f'感谢{message.uname}赠送的{message.num}个{message.gift_name}，阿里嘎多！', "po.wav") # 普通的加入队列
 
     def _on_buy_guard(self, client: blivedm.BLiveClient, message: web_models.GuardBuyMessage):
-        dmplayer.Add(f'感谢{message.uname}的{message.gift_name}，阿里嘎多！', "po.wav")
+        dmplayer.Pend(f'感谢{message.uname}的{message.gift_name}，阿里嘎多！', "po.wav")
 
     def _on_super_chat(self, client: blivedm.BLiveClient, message: web_models.SuperChatMessage):
-        dmplayer.Add(f'{message.uname}说：{message.message}', "dingding.wav")
+        dmplayer.Pend(f'{message.uname}说：{message.message}', "dingding.wav")
 
 
 if __name__ == '__main__':
-    dmplayer.Start()
-    dmplayer.LoadCharacter("圣园未花")
+    dmplayer.LoadCharacter("德丽莎")
     dmplayer.SetVoiceOption(0.6, 0.668, 0.9)
     asyncio.run(dm_monitor())

dm_player.py

@@ -6,21 +6,37 @@ import time
 def PlaySound(filename):
     winsound.PlaySound(filename, winsound.SND_FILENAME)
 
+def Play(text, notify, cb_before_play, args):
+    if cb_before_play != None:
+        cb_before_play(*args)
+    result, wav = tts.GenerateTTS(text)
+    if result == True:
+        if notify != None:
+            PlaySound(f"{notify}")
+        PlaySound(wav)
+
 class DmPlayer:
 
     def __init__(self):
-        self.running = True
-        self.dm_text_list = []
-        self.th = None
-
-    def Start(self):
-        if self.th == None:
-            self.th = threading.Thread(target=self.Run, args=())
-            self.th.start()
-    
-    def Add(self, text, notify = None, callback_before = None, *args):
-        self.dm_text_list.append((text, notify, callback_before, args))
-        print(f'queue len: {len(self.dm_text_list)}')
+        self.pending_list = []
+        self.playing = False
+
+    def Pend(self, text, notify = None, cb_before_play = None, *args):
+        self.pending_list.append((text, notify, cb_before_play, args))
+        if self.playing == False:
+            self.playing = True
+            threading.Thread(target=self.Play, args=()).start()
+
+    def Play(self):
+        try:
+            (text, notify, cb_before_play, args) = self.pending_list.pop(0)
+        except:
+            self.playing = False
+            print('Queue empty')
+        else:
+            Play(text, notify, cb_before_play, args)
+            time.sleep(0.5)
+            self.Play()
 
     def LoadCharacter(self, name):
         tts.LoadCharacter(name)
@@ -29,26 +45,4 @@ class DmPlayer:
     # nsw "控制音素发音长度", minimum=0.1, maximum=1.0
     # ls "控制整体语速", minimum=0.1, maximum=2.0
     def SetVoiceOption(self, ns, nsw, ls):
-        tts.SetVoiceOption(ns, nsw, ls)
-
-    def Run(self):
-        text = ""
-        while self.running:
-            try:
-                (text, notify, cb_before, args) = self.dm_text_list.pop(0)
-            except:
-                time.sleep(1)
-            else:
-                if cb_before != None:
-                    cb_before(*args)
-
-                print(f'Generating TTS {text}')
-                result, wav = tts.GenerateTTS(text)
-                if result == True:
-                    if notify != None:
-                        PlaySound(f"{notify}")
-                    PlaySound(wav)
-
-    def Terminate(self):
-        self.running = False
-        self.th = None
+        tts.SetVoiceOption(ns, nsw, ls)