Audio: Add some fixes and tests

src/Nazara/Audio/DummyAudioSource.cpp

@@ -46,6 +46,9 @@ namespace Nz
 
 	UInt32 DummyAudioSource::GetSampleOffset() const
 	{
+		if (m_status == SoundStatus::Stopped)
+			return 0; //< Always return 0 when stopped, to mimic OpenAL behavior
+
 		UInt64 bufferTime = UpdateTime();
 
 		UInt64 sampleOffset = 0;
@@ -114,7 +117,12 @@ namespace Nz
 		{
 			// playing or stopped, restart
 			RequeueBuffers();
-			m_playClock.Restart();
+
+			// special case, we are stopped but SetSampleOffset has been called
+			if (m_status == SoundStatus::Stopped && m_playClock.GetMilliseconds() != 0)
+				m_playClock.Unpause();
+			else
+				m_playClock.Restart(); //< already playing or stopped, restart from beginning
 		}
 
 		m_status = SoundStatus::Playing;
@@ -168,10 +176,13 @@ namespace Nz
 		}
 		m_queuedBuffers.erase(m_queuedBuffers.begin(), m_queuedBuffers.begin() + processedBufferIndex);
 
-		assert(!m_queuedBuffers.empty());
-
-		UInt64 timeOffset = 1'000'000ULL * offset / m_queuedBuffers.front()->GetSampleRate();
-		m_playClock.Restart(timeOffset, m_playClock.IsPaused());
+		if (!m_queuedBuffers.empty())
+		{
+			UInt64 timeOffset = 1'000'000ULL * offset / m_queuedBuffers.front()->GetSampleRate();
+			m_playClock.Restart(timeOffset, m_playClock.IsPaused());
+		}
+		else
+			Stop();
 	}
 
 	void DummyAudioSource::SetVelocity(const Vector3f& velocity)
@@ -216,7 +227,11 @@ namespace Nz
 		if (!m_processedBuffers.empty())
 		{
 			m_queuedBuffers.resize(m_processedBuffers.size() + m_queuedBuffers.size());
-			std::move(m_queuedBuffers.begin(), m_queuedBuffers.begin() + m_processedBuffers.size(), m_queuedBuffers.begin() + m_processedBuffers.size());
+
+			// Move currently queued buffers to the end of the queue
+			if (m_queuedBuffers.size() > m_processedBuffers.size())
+				std::move(m_queuedBuffers.begin(), m_queuedBuffers.begin() + m_processedBuffers.size(), m_queuedBuffers.begin() + m_processedBuffers.size());
+
 			std::move(m_processedBuffers.begin(), m_processedBuffers.end(), m_queuedBuffers.begin());
 			m_processedBuffers.clear();
 		}

src/Nazara/Audio/Music.cpp

@@ -90,6 +90,8 @@ namespace Nz
 	*/
 	void Music::EnableLooping(bool loop)
 	{
+		std::lock_guard<std::mutex> lock(m_bufferLock);
+
 		m_looping = loop;
 	}
 
@@ -129,11 +131,24 @@ namespace Nz
 	{
 		NazaraAssert(m_stream, "Music not created");
 
+		if (!m_streaming)
+			return 0;
+
 		// Prevent music thread from enqueuing new buffers while we're getting the count
 		std::lock_guard<std::mutex> lock(m_bufferLock);
 
 		UInt32 sampleOffset = m_source->GetSampleOffset();
-		return static_cast<UInt32>((1000ULL * (sampleOffset + (m_processedSamples / GetChannelCount(m_stream->GetFormat())))) / m_sampleRate);
+		UInt32 playingOffset = SafeCast<UInt32>((1000ULL * (sampleOffset + (m_processedSamples / GetChannelCount(m_stream->GetFormat())))) / m_sampleRate);
+		UInt32 duration = m_stream->GetDuration();
+		if (playingOffset > duration)
+		{
+			if (m_looping)
+				playingOffset %= duration;
+			else
+				playingOffset = 0; //< stopped
+		}
+
+		return playingOffset;
 	}
 
 	/*!
@@ -191,6 +206,8 @@ namespace Nz
 	*/
 	bool Music::IsLooping() const
 	{
+		std::lock_guard<std::mutex> lock(m_bufferLock);
+
 		return m_looping;
 	}
 
@@ -290,7 +307,12 @@ namespace Nz
 		else
 		{
 			// Ensure we're restarting
-			Stop();
+			StopThread();
+
+			// Special case of SetPlayingOffset(end) before Play(), restart from beginning
+			if (m_streamOffset >= m_stream->GetSampleCount())
+				m_streamOffset = 0;
+
 			StartThread(false);
 		}
 	}