mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-25 04:41:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed multi-threading issues with sf::Music

Browse Source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1033 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
laurentgom 2009-03-01 11:03:56 +00:00
parent 3664d275cb
commit f842ee3518
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/SFML/Audio/Music.cpp
View File

@ -51,6 +51,9 @@ mySamples (BufferSize)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
Music::~Music() Music::~Music()
{ {
// We must stop before destroying the file :)
Stop();
delete myFile; delete myFile;
} }
@ -60,6 +63,9 @@ Music::~Music()
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
bool Music::OpenFromFile(const std::string& Filename) bool Music::OpenFromFile(const std::string& Filename)
{ {
// First stop the music if it was already running
Stop();
// Create the sound file implementation, and open it in read mode // Create the sound file implementation, and open it in read mode
delete myFile; delete myFile;
myFile = priv::SoundFile::CreateRead(Filename); myFile = priv::SoundFile::CreateRead(Filename);
@ -84,6 +90,9 @@ bool Music::OpenFromFile(const std::string& Filename)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
bool Music::OpenFromMemory(const char* Data, std::size_t SizeInBytes) bool Music::OpenFromMemory(const char* Data, std::size_t SizeInBytes)
{ {
// First stop the music if it was already running
Stop();
// Create the sound file implementation, and open it in read mode // Create the sound file implementation, and open it in read mode
delete myFile; delete myFile;
myFile = priv::SoundFile::CreateRead(Data, SizeInBytes); myFile = priv::SoundFile::CreateRead(Data, SizeInBytes);
@ -108,7 +117,7 @@ bool Music::OpenFromMemory(const char* Data, std::size_t SizeInBytes)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
bool Music::OnStart() bool Music::OnStart()
{ {
return myFile->Restart(); return myFile && myFile->Restart();
} }
@ -116,6 +125,8 @@ bool Music::OnStart()
/// /see SoundStream::OnGetData /// /see SoundStream::OnGetData
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
bool Music::OnGetData(SoundStream::Chunk& Data) bool Music::OnGetData(SoundStream::Chunk& Data)
{
if (myFile)
{ {
// Fill the chunk parameters // Fill the chunk parameters
Data.Samples = &mySamples[0]; Data.Samples = &mySamples[0];
@ -124,6 +135,11 @@ bool Music::OnGetData(SoundStream::Chunk& Data)
// Check if we have reached the end of the audio file // Check if we have reached the end of the audio file
return Data.NbSamples == mySamples.size(); return Data.NbSamples == mySamples.size();
} }
else
{
return false;
}
}
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////