bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Preparation to use boost::shared_ptr.

Browse Source
This commit is contained in:
Joerg Mueller 2012-11-03 09:49:49 +00:00
parent 7353f8d58e
commit b59290a835
2 changed files with 49 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
View File

@ -174,21 +174,34 @@ bool AUD_OpenALDevice::AUD_OpenALHandle::stop()
if(!m_status)
return false;
// AUD_XXX Create a reference of our own object so that it doesn't get
// deleted before the end of this function
AUD_Reference<AUD_OpenALHandle> This = this;
if(m_status == AUD_STATUS_PLAYING)
m_device->m_playingSounds.remove(This);
else
m_device->m_pausedSounds.remove(This);
m_status = AUD_STATUS_INVALID;
alDeleteSources(1, &m_source);
if(!m_isBuffered)
alDeleteBuffers(CYCLE_BUFFERS, m_buffers);
m_status = AUD_STATUS_INVALID;
return true;
for(AUD_HandleIterator it = m_device->m_playingSounds.begin(); it != m_device->m_playingSounds.end(); it++)
{
if(it->get() == this)
{
AUD_Reference<AUD_OpenALHandle> This = *it;
m_device->m_playingSounds.erase(it);
return true;
}
}
for(AUD_HandleIterator it = m_device->m_pausedSounds.begin(); it != m_device->m_pausedSounds.end(); it++)
{
if(it->get() == this)
{
m_device->m_pausedSounds.erase(it);
return true;
}
}
return false;
}
bool AUD_OpenALDevice::AUD_OpenALHandle::getKeep()

41
intern/audaspace/intern/AUD_SoftwareDevice.cpp
View File

@ -277,22 +277,33 @@ bool AUD_SoftwareDevice::AUD_SoftwareHandle::stop()
if(!m_status)
return false;
// AUD_XXX Create a reference of our own object so that it doesn't get
// deleted before the end of this function
AUD_Reference<AUD_SoftwareHandle> This = this;
if(m_status == AUD_STATUS_PLAYING)
{
m_device->m_playingSounds.remove(This);
if(m_device->m_playingSounds.empty())
m_device->playing(m_device->m_playback = false);
}
else
m_device->m_pausedSounds.remove(This);
m_status = AUD_STATUS_INVALID;
return true;
for(AUD_HandleIterator it = m_device->m_playingSounds.begin(); it != m_device->m_playingSounds.end(); it++)
{
if(it->get() == this)
{
AUD_Reference<AUD_SoftwareHandle> This = *it;
m_device->m_playingSounds.erase(it);
if(m_device->m_playingSounds.empty())
m_device->playing(m_device->m_playback = false);
return true;
}
}
for(AUD_HandleIterator it = m_device->m_pausedSounds.begin(); it != m_device->m_pausedSounds.end(); it++)
{
if(it->get() == this)
{
m_device->m_pausedSounds.erase(it);
return true;
}
}
return false;
}
bool AUD_SoftwareDevice::AUD_SoftwareHandle::getKeep()