将音频播放挪至新线程运行

HalcyonAlcedo · Sep 20, 2021 · 9d9327c · 9d9327c
1 parent ac3986e
commit 9d9327c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/Base.h b/Base.h
@@ -401,14 +401,7 @@ namespace Base {
 	//音频播放
 #pragma region SoundPlay
 	namespace SoundPlay {
-		static void PlaySoundFile(string SoundFile) {
-			Player* player = new Player();
-			Sound* sound = new Sound();
-			player->Create();
-			sound->LoadFromFile(SoundFile);
-			player->SetSound(*sound);
-			player->Play();
-		}
+		vector<string> SoundList;
 	}
 #pragma endregion
 	//委托

diff --git a/ControlProgram.h b/ControlProgram.h
@@ -51,6 +51,15 @@ namespace ControlProgram {
 	};
 	map<string, TextureCache> ImgTextureCache;
 
+	static void PlaySoundFile(string SoundFile) {
+		Player* player = new Player();
+		Sound* sound = new Sound();
+		player->Create();
+		sound->LoadFromFile(SoundFile);
+		player->SetSound(*sound);
+		player->Play();
+	}
+
 	void InitImGui()
 	{
 		ImGui::CreateContext();
@@ -180,6 +189,12 @@ namespace ControlProgram {
 			Checkhotkey[(string)ImHotKey::hotkeys.at(hotkey).functionName] = true;
 		}
 
+		//声音处理
+		if (!Base::SoundPlay::SoundList.empty()) {
+			PlaySoundFile(Base::SoundPlay::SoundList.back());
+			Base::SoundPlay::SoundList.pop_back();
+		}
+
 		ImGui_ImplDX11_NewFrame();
 		ImGui_ImplWin32_NewFrame();
 		ImGui::NewFrame();
@@ -554,4 +569,5 @@ namespace ControlProgram {
 			initConsole = true;
 		CreateThread(nullptr, 0, MainThread, hMod, 0, nullptr);
 	}
+
 }
diff --git a/LuaScript.h b/LuaScript.h
@@ -1360,7 +1360,7 @@ static int System_UI_GetGameWindowSize(lua_State* pL) {
 }
 static int System_Sound_PlaySound(lua_State* pL) {
     string file = (string)lua_tostring(pL, 1);
-    Base::SoundPlay::PlaySoundFile(file);
+    Base::SoundPlay::SoundList.push_back(file);
     return 0;
 }
 static int System_GetProcessList(lua_State* pL)