Merge branch 'master' into server

gframe/sound_manager.cpp

@@ -36,7 +36,6 @@ bool SoundManager::Init() {
 	}
 	engineConfig.pResourceManager = &resourceManager;
 #endif
-	playingSoundEffect = FALSE;
 	if(ma_engine_init(&engineConfig, &engineSound) != MA_SUCCESS || ma_engine_init(&engineConfig, &engineMusic) != MA_SUCCESS) {
 		return false;
 	} else {
@@ -90,21 +89,38 @@ void SoundManager::PlaySound(char* sound) {
 #ifdef YGOPRO_USE_AUDIO
 	if(!mainGame->chkEnableSound->isChecked())
 		return;
-#ifdef YGOPRO_USE_MINIAUDIO
-	StopSound();
 	SetSoundVolume(mainGame->gameConf.sound_volume);
-	playingSoundEffect = TRUE;
+#ifdef YGOPRO_USE_MINIAUDIO
+	ma_sound *usingSoundEffectPointer = nullptr;
+	for(int i = 0; i < 10; i++) {
+		if(playingSoundEffect[i] && !ma_sound_is_playing(playingSoundEffect[i])) {
+			ma_sound_uninit(playingSoundEffect[i]);
+			if(usingSoundEffectPointer) {
+				free(playingSoundEffect[i]);
+				playingSoundEffect[i] = nullptr;
+			} else {
+				usingSoundEffectPointer = playingSoundEffect[i];
+			}
+		}
+		if(!playingSoundEffect[i] && !usingSoundEffectPointer) {
+			usingSoundEffectPointer = playingSoundEffect[i] = (ma_sound*)malloc(sizeof(ma_sound));
+		}
+	}
+	if (!usingSoundEffectPointer) {
+		// force to stop the first sound
+		usingSoundEffectPointer = playingSoundEffect[0];
+		ma_sound_uninit(usingSoundEffectPointer);
+	}
 #ifdef _WIN32
 	wchar_t sound_w[1024];
 	BufferIO::DecodeUTF8(sound, sound_w);
-	ma_sound_init_from_file_w(&engineSound, sound_w, MA_SOUND_FLAG_ASYNC | MA_SOUND_FLAG_STREAM, nullptr, nullptr, &soundEffect);
+	ma_sound_init_from_file_w(&engineSound, sound_w, MA_SOUND_FLAG_ASYNC | MA_SOUND_FLAG_STREAM, nullptr, nullptr, usingSoundEffectPointer);
 #else
-	ma_sound_init_from_file(&engineSound, sound, MA_SOUND_FLAG_ASYNC | MA_SOUND_FLAG_STREAM, nullptr, nullptr, &soundEffect);
+	ma_sound_init_from_file(&engineSound, sound, MA_SOUND_FLAG_ASYNC | MA_SOUND_FLAG_STREAM, nullptr, nullptr, usingSoundEffectPointer);
 #endif
-	ma_sound_start(&soundEffect);
+	ma_sound_start(usingSoundEffectPointer);
 #endif
 #ifdef YGOPRO_USE_IRRKLANG
-	SetSoundVolume(mainGame->gameConf.sound_volume);
 	engineSound->play2D(soundPath);
 #endif
 #endif
@@ -358,10 +374,13 @@ void SoundManager::StopBGM() {
 }
 void SoundManager::StopSound() {
 #ifdef YGOPRO_USE_MINIAUDIO
-	if(!playingSoundEffect)
-		return;
-	playingSoundEffect = FALSE;
-	ma_sound_uninit(&soundEffect);
+	for(int i = 0; i < 10; i++) {
+		if(playingSoundEffect[i]) {
+			ma_sound_uninit(playingSoundEffect[i]);
+			free(playingSoundEffect[i]);
+			playingSoundEffect[i] = nullptr;
+		}
+	}
 #endif
 #ifdef YGOPRO_USE_IRRKLANG
 	engineSound->stopAllSounds();

gframe/sound_manager.h

@@ -29,8 +29,7 @@ private:
 	ma_engine engineMusic;
 	ma_sound soundBGM;
 	char currentPlayingMusic[1024]{};
-	ma_sound soundEffect;
-	char playingSoundEffect;
+	ma_sound* playingSoundEffect[10]{};
 #endif
 #ifdef YGOPRO_USE_IRRKLANG
 	irrklang::ISoundEngine* engineSound;

ocgcore @ ca5bd0f5

-Subproject commit cd8598dd962280fabc48971c5de0e434682bb1df
+Subproject commit ca5bd0f5e1b4113d7e046d8228b70fc2281d08eb

script @ 3e5aeb86

-Subproject commit 9f141e8cdfc7adee127eaca1a7981e816b555ae3
+Subproject commit 3e5aeb86a3e4fc20bdf14a89fb3b4ba2f35f1cbe