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

FS#104 - Fix crash when destroying a SoundBuffer used by a Sound

Browse source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1370 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
LaurentGom 2010-01-26 09:49:03 +00:00
parent 6341b569db
commit 362f374732
4 changed files with 79 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

25
include/SFML/Audio/SoundBuffer.hpp
View file

@ -32,10 +32,13 @@
#include <SFML/Audio/AudioResource.hpp>
#include <string>
#include <vector>
#include <set>
namespace sf
{
class Sound;
////////////////////////////////////////////////////////////
/// SoundBuffer is the low-level for loading and manipulating
/// sound buffers
@ -174,12 +177,34 @@ private :
////////////////////////////////////////////////////////////
bool Update(unsigned int ChannelsCount, unsigned int SampleRate);
////////////////////////////////////////////////////////////
/// Add a sound to the list of sounds that use this buffer
///
/// \param Instance : Sound object to attach
///
////////////////////////////////////////////////////////////
void AttachSound(Sound* Instance) const;
////////////////////////////////////////////////////////////
/// Remove a sound from the list of sounds that use this buffer
///
/// \param Instance : Sound object to detach
///
////////////////////////////////////////////////////////////
void DetachSound(Sound* Instance) const;
////////////////////////////////////////////////////////////
// Types
////////////////////////////////////////////////////////////
typedef std::set<Sound*> SoundList; ///< Set of unique sound instances
////////////////////////////////////////////////////////////
// Member data
////////////////////////////////////////////////////////////
unsigned int myBuffer; ///< OpenAL buffer identifier
std::vector<Int16> mySamples; ///< Samples buffer
float myDuration; ///< Sound duration, in seconds
mutable SoundList mySounds; ///< List of sounds that are using this buffer
};
} // namespace sf