fix sound effect command updating

Author: Demonese

LuaSTG/LuaSTG/GameResource/Implement/ResourceSoundEffectImpl.cpp

@@ -2,96 +2,60 @@
 
 namespace luastg {
 	void ResourceSoundEffectImpl::FlushCommand() {
-		// 根据最后的命令对音效进行操作
+		// apply
 		switch (m_last_command.type) {
-		case CommandType::None:
+		case CommandType::none:
 			break;
-		case CommandType::Play:
-			m_player->resume();
-			break;
-		case CommandType::Stop:
-			m_player->pause();
-			break;
-		case CommandType::Reset:
+		case CommandType::play:
 			m_player->setVolume(m_last_command.vol);
 			m_player->setBalance(m_last_command.pan);
 			m_player->play(0.0);
 			break;
-		case CommandType::ResetAndStop:
+		case CommandType::pause:
+			m_player->pause();
+			break;
+		case CommandType::resume:
+			m_player->resume();
+			break;
+		case CommandType::stop:
 			m_player->stop();
 			break;
 		}
-		// 重置为无命令
-		m_last_command.type = CommandType::None;
-		m_last_command.vol = 0.0f;
+		// clear
+		m_last_command.type = CommandType::none;
+		m_last_command.vol = 1.0f;
 		m_last_command.pan = 0.0f;
-		// 刷新状态
-		if (m_status == 2) {
-			if (m_player->getState() != core::AudioPlayerState::playing) {
-				m_status = 0; // 已结束播放
+		// read state
+		if (m_state != core::AudioPlayerState::stopped) {
+			if (m_player->getState() == core::AudioPlayerState::stopped) {
+				m_state = core::AudioPlayerState::stopped;
 			}
 		}
 	}
 	void ResourceSoundEffectImpl::Play(float const vol, float const pan) {
-		// 优先级最高的命令，覆盖其他一切命令
-		m_last_command.type = CommandType::Reset;
-		m_last_command.vol = std::max(m_last_command.vol, vol); // 取音量最高
+		m_last_command.type = CommandType::play;
+		m_last_command.vol = vol;
 		m_last_command.pan = pan;
-		m_status = 2; // playing
+		m_state = core::AudioPlayerState::playing;
 	}
 	void ResourceSoundEffectImpl::Resume() {
-		switch (m_last_command.type) {
-		case CommandType::None: // 初始化命令
-		case CommandType::Play: // 就是这个命令
-		case CommandType::Stop: // 覆盖暂停/停止命令
-			m_last_command.type = CommandType::Play;
-			break;
-		case CommandType::Reset:
-			// 保持当前命令
-			break;
-		case CommandType::ResetAndStop:
-			// 修正为重新播放命令
-			m_last_command.type = CommandType::Reset;
-			break;
+		if (m_state == core::AudioPlayerState::paused) {
+			m_last_command.type = CommandType::resume;
+			m_state = core::AudioPlayerState::playing;
 		}
-		m_status = 2; // playing
 	}
 	void ResourceSoundEffectImpl::Pause() {
-		switch (m_last_command.type) {
-		case CommandType::None: // 初始化命令
-		case CommandType::Play: // 覆盖播放/恢复命令
-		case CommandType::Stop: // 就是这个命令
-			m_last_command.type = CommandType::Stop;
-			break;
-		case CommandType::Reset:
-			// 修正为回到起始命令
-			m_last_command.type = CommandType::ResetAndStop;
-			break;
-		case CommandType::ResetAndStop:
-			// 保持当前命令
-			break;
+		if (m_state == core::AudioPlayerState::playing) {
+			m_last_command.type = CommandType::pause;
+			m_state = core::AudioPlayerState::paused;
 		}
-		m_status = 1; // pause
 	}
 	void ResourceSoundEffectImpl::Stop() {
-		switch (m_last_command.type) {
-		case CommandType::None: // 初始化命令
-		case CommandType::Play: // 覆盖播放/恢复命令
-		case CommandType::Stop: // 就是这个命令
-			m_last_command.type = CommandType::Stop;
-			break;
-		case CommandType::Reset:
-			// 修正为回到起始命令
-			m_last_command.type = CommandType::ResetAndStop;
-			break;
-		case CommandType::ResetAndStop:
-			// 保持当前命令
-			break;
-		}
-		m_status = 0; // stop
+		m_last_command.type = CommandType::stop;
+		m_state = core::AudioPlayerState::stopped;
 	}
-	bool ResourceSoundEffectImpl::IsPlaying() { return m_player->getState() == core::AudioPlayerState::playing || m_status == 2; }
-	bool ResourceSoundEffectImpl::IsStopped() { return !IsPlaying() && m_status != 1; }
+	bool ResourceSoundEffectImpl::IsPlaying() { return m_state == core::AudioPlayerState::playing; }
+	bool ResourceSoundEffectImpl::IsStopped() { return m_state == core::AudioPlayerState::stopped; }
 	bool ResourceSoundEffectImpl::SetSpeed(float const speed) { return m_player->setSpeed(speed); }
 	float ResourceSoundEffectImpl::GetSpeed() { return m_player->getSpeed(); }
 

LuaSTG/LuaSTG/GameResource/Implement/ResourceSoundEffectImpl.hpp

@@ -20,21 +20,21 @@ namespace luastg {
 
 	private:
 		enum class CommandType : uint8_t {
-			None,
-			Play,
-			Stop,
-			Reset,
-			ResetAndStop,
+			none,
+			play,
+			pause,
+			resume,
+			stop,
 		};
 
 		struct Command {
-			CommandType type = CommandType::None;
-			float vol = 0.0f;
-			float pan = 0.0f;
+			CommandType type{ CommandType::none };
+			float vol{ 1.0f };
+			float pan{ 0.0f };
 		};
 
 		core::SmartReference<core::IAudioPlayer> m_player;
-		int m_status = 0; // 0停止 1暂停 2播放
+		core::AudioPlayerState m_state{ core::AudioPlayerState::stopped };
 		Command m_last_command;
 	};
 }