lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed SoundStream::Chunk::NbSamples to SampleCount, and renamed other nbSamples variables to sampleCount

Browse source
This commit is contained in:
Laurent Gomila 2012-01-13 15:09:30 +01:00
parent c2039e866c
commit e775bd0169
7 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

10
examples/voip/Server.cpp
View file

@ -88,8 +88,8 @@ private :
}
// Fill audio data to pass to the stream
data.Samples = &myTempBuffer[0];
data.NbSamples = myTempBuffer.size();
data.Samples = &myTempBuffer[0];
data.SampleCount = myTempBuffer.size();
// Update the playing offset
myOffset += myTempBuffer.size();
@ -126,14 +126,14 @@ private :
if (id == audioData)
{
// Extract audio samples from the packet, and append it to our samples buffer
const sf::Int16* samples = reinterpret_cast<const sf::Int16*>(packet.GetData() + 1);
std::size_t nbSamples = (packet.GetDataSize() - 1) / sizeof(sf::Int16);
const sf::Int16* samples = reinterpret_cast<const sf::Int16*>(packet.GetData() + 1);
std::size_t sampleCount = (packet.GetDataSize() - 1) / sizeof(sf::Int16);
// Don't forget that the other thread can access the sample array at any time
// (so we protect any operation on it with the mutex)
{
sf::Lock lock(myMutex);
std::copy(samples, samples + nbSamples, std::back_inserter(mySamples));
std::copy(samples, samples + sampleCount, std::back_inserter(mySamples));
}
}
else if (id == endOfStream)