Fixed a shutdown crash in LLAudioEngine::assetCallback, and fixed behavior when soundsource re-issues a sound whilst a sound is currently playing for same source. (LLAudioChannel[Impl]::play now re-starts sound if already playing)

2013-10-13 16:22:24 -05:00
parent daa07d031c
commit dbfd0cb7a6
5 changed files with 35 additions and 8 deletions
--- a/indra/llaudio/llaudioengine_fmod.cpp
+++ b/indra/llaudio/llaudioengine_fmod.cpp
@@ -600,6 +600,12 @@ void LLAudioChannelFMOD::play()
 		llwarns << "Playing without a channelID, aborting" << llendl;
 		return;
 	}
+	
+	if(!FSOUND_IsPaused(mChannelID))
+	{
+		FSOUND_SetPaused(mChannelID, true);
+		FSOUND_SetCurrentPosition(mChannelID, 0);
+	}

 	if (!FSOUND_SetPaused(mChannelID, false))
 	{