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

Added SoundSource::operator= and called it from Sound::operator=

Browse Source 
Signed-off-by: Jan Haller <bromeon@gmail.com>
This commit is contained in:
Marco Antognini 2015-04-13 10:03:24 +02:00 committed by Lukas Dürrenberger
parent 0c9ce3bef3
commit 2d1fab374f
3 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/SFML/Audio/SoundSource.hpp
View File

@ -240,6 +240,16 @@ public:
////////////////////////////////////////////////////////////
float getAttenuation() const;
////////////////////////////////////////////////////////////
/// \brief Overload of assignment operator
///
/// \param right Instance to assign
///
/// \return Reference to self
///
////////////////////////////////////////////////////////////
SoundSource& operator =(const SoundSource& right);
protected:
////////////////////////////////////////////////////////////

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

@ -157,7 +157,11 @@ Sound::Status Sound::getStatus() const
Sound& Sound::operator =(const Sound& right)
{
// Here we don't use the copy-and-swap idiom, because it would mess up
// the list of sound instances contained in the buffers
// the list of sound instances contained in the buffers and unnecessarily
// destroy/create OpenAL sound sources
// Delegate to base class, which copies all the sound attributes
SoundSource::operator=(right);
// Detach the sound instance from the previous buffer (if any)
if (m_buffer)
@ -167,16 +171,10 @@ Sound& Sound::operator =(const Sound& right)
m_buffer = NULL;
}
// Copy the sound attributes
// Copy the remaining sound attributes
if (right.m_buffer)
setBuffer(*right.m_buffer);
setLoop(right.getLoop());
setPitch(right.getPitch());
setVolume(right.getVolume());
setPosition(right.getPosition());
setRelativeToListener(right.isRelativeToListener());
setMinDistance(right.getMinDistance());
setAttenuation(right.getAttenuation());
return *this;
}

19
src/SFML/Audio/SoundSource.cpp
View File

@ -75,6 +75,7 @@ void SoundSource::setVolume(float volume)
alCheck(alSourcef(m_source, AL_GAIN, volume * 0.01f));
}
////////////////////////////////////////////////////////////
void SoundSource::setPosition(float x, float y, float z)
{
@ -170,6 +171,24 @@ float SoundSource::getAttenuation() const
}
////////////////////////////////////////////////////////////
SoundSource& SoundSource::operator =(const SoundSource& right)
{
// Leave m_source untouched -- it's not necessary to destroy and
// recreate the OpenAL sound source, hence no copy-and-swap idiom
// Assign the sound attributes
setPitch(right.getPitch());
setVolume(right.getVolume());
setPosition(right.getPosition());
setRelativeToListener(right.isRelativeToListener());
setMinDistance(right.getMinDistance());
setAttenuation(right.getAttenuation());
return *this;
}
////////////////////////////////////////////////////////////
SoundSource::Status SoundSource::getStatus() const
{