sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Audio/Music: Fix infinite loop 

Former-commit-id: 027a5c19500c774e13ed51f47b16e754dfb44721
This commit is contained in:
Lynix 2016-04-02 18:55:55 +02:00
parent 621e0d123c
commit de8f8e0743
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Nazara/Audio/Music.cpp
View File

@ -262,17 +262,22 @@ namespace Nz
unsigned int sampleCount = m_impl->chunkSamples.size(); unsigned int sampleCount = m_impl->chunkSamples.size();
unsigned int sampleRead = 0; unsigned int sampleRead = 0;
// Lecture depuis le stream pour remplir le buffer // Fill the buffer by reading from the stream
for (;;) for (;;)
{ {
sampleRead += m_impl->stream->Read(&m_impl->chunkSamples[sampleRead], sampleCount - sampleRead); sampleRead += m_impl->stream->Read(&m_impl->chunkSamples[sampleRead], sampleCount - sampleRead);
if (sampleRead < sampleCount && !m_impl->loop) if (sampleRead < sampleCount && m_impl->loop)
break; // Fin du stream (On ne boucle pas) {
// In case we read less than expected, assume we reached the end of the stream and seek back to the beginning
m_impl->stream->Seek(0);
continue;
}
m_impl->stream->Seek(0); // On boucle au début du stream et on remplit à nouveau // Either we read the size we wanted, either we're not looping
break;
} }
// Mise à jour du buffer (envoi à OpenAL) et placement dans la file d'attente // Update the buffer (send it to OpenAL) and queue it if we got any data
if (sampleRead > 0) if (sampleRead > 0)
{ {
alBufferData(buffer, m_impl->audioFormat, &m_impl->chunkSamples[0], sampleRead*sizeof(Int16), m_impl->sampleRate); alBufferData(buffer, m_impl->audioFormat, &m_impl->chunkSamples[0], sampleRead*sizeof(Int16), m_impl->sampleRate);