Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made the assignment operator in sf::Sound work with the last modification

Browse Source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1371 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
LaurentGom 2010-01-26 10:31:09 +00:00
parent 362f374732
commit 3247f441f8
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/SFML/Audio/Sound.cpp
View File

@ -129,6 +129,14 @@ void Sound::Stop()
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void Sound::SetBuffer(const SoundBuffer& Buffer) void Sound::SetBuffer(const SoundBuffer& Buffer)
{ {
// First detach from the previous buffer
if (myBuffer)
{
Stop();
myBuffer->DetachSound(this);
}
// Assign and use the new buffer
myBuffer = &Buffer; myBuffer = &Buffer;
myBuffer->AttachSound(this); myBuffer->AttachSound(this);
ALCheck(alSourcei(mySource, AL_BUFFER, myBuffer->myBuffer)); ALCheck(alSourcei(mySource, AL_BUFFER, myBuffer->myBuffer));
@ -354,10 +362,27 @@ Sound::Status Sound::GetStatus() const
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
Sound& Sound::operator =(const Sound& Other) Sound& Sound::operator =(const Sound& Other)
{ {
Sound Temp(Other); // Here we don't use the copy-and-swap idiom, because it would mess up
// the list of sound instances contained in the buffers
std::swap(mySource, Temp.mySource); // Detach the sound instance from the previous buffer (if any)
std::swap(myBuffer, Temp.myBuffer); if (myBuffer)
{
Stop();
myBuffer->DetachSound(this);
myBuffer = NULL;
}
// Copy the sound attributes
if (Other.myBuffer)
SetBuffer(*Other.myBuffer);
SetLoop(Other.GetLoop());
SetPitch(Other.GetPitch());
SetVolume(Other.GetVolume());
SetPosition(Other.GetPosition());
SetRelativeToListener(Other.IsRelativeToListener());
SetMinDistance(Other.GetMinDistance());
SetAttenuation(Other.GetAttenuation());
return *this; return *this;
} }
@ -373,7 +398,7 @@ void Sound::ResetBuffer()
// Detach the buffer // Detach the buffer
ALCheck(alSourcei(mySource, AL_BUFFER, 0)); ALCheck(alSourcei(mySource, AL_BUFFER, 0));
myBuffer = 0; myBuffer = NULL;
} }
} // namespace sf } // namespace sf