AxioDL/amuse
2
0
Fork 0
mirror of https://github.com/AxioDL/amuse.git synced 2025-12-08 21:17:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

More fixes, better lifetime management

Browse Source
This commit is contained in:
Jack Andersen
2016-05-13 20:33:21 -10:00
parent ccefe60a9d
commit 2341b6b7d0
7 changed files with 86 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/Voice.cpp
View File

@@ -17,6 +17,9 @@ void Voice::_destroy()
Entity::_destroy();
if (m_submix)
m_submix->m_activeVoices.erase(this);
for (std::shared_ptr<Voice>& vox : m_childVoices)
vox->_destroy();
}
Voice::Voice(Engine& engine, const AudioGroup& group, int vid, bool emitter, Submix* smx)
@@ -96,7 +99,7 @@ void Voice::_bringOutYourDead()
{
Voice* vox = it->get();
vox->_bringOutYourDead();
if (vox->m_dead)
if (vox->m_voxState == VoiceState::Finished)
{
it = _destroyVoice(vox);
continue;
@@ -105,6 +108,21 @@ void Voice::_bringOutYourDead()
}
}
std::shared_ptr<Voice> Voice::_findVoice(int vid, std::weak_ptr<Voice> thisPtr)
{
if (m_vid == vid)
return thisPtr.lock();
for (std::shared_ptr<Voice>& vox : m_childVoices)
{
std::shared_ptr<Voice> ret = vox->_findVoice(vid, vox);
if (ret)
return ret;
}
return {};
}
std::shared_ptr<Voice> Voice::_allocateVoice(double sampleRate, bool dynamicPitch)
{
auto it = m_childVoices.emplace(m_childVoices.end(), new Voice(m_engine, m_audioGroup,
@@ -244,9 +262,10 @@ size_t Voice::supplyAudio(size_t samples, int16_t* data)
{
uint32_t samplesRem = samples;
size_t samplesProc = 0;
bool dead = false;
if (m_curSample)
{
m_dead = m_state.advance(*this, samples / m_sampleRate);
dead = m_state.advance(*this, samples / m_sampleRate);
uint32_t block = m_curSamplePos / 14;
uint32_t rem = m_curSamplePos % 14;
@@ -344,11 +363,11 @@ size_t Voice::supplyAudio(size_t samples, int16_t* data)
}
else
{
m_dead = m_state.advance(*this, 0.0);
dead = m_state.advance(*this, 0.0);
memset(data, 0, sizeof(int16_t) * samples);
}
if (m_dead)
if (dead)
m_voxState = VoiceState::Finished;
return samples;
}
@@ -364,8 +383,12 @@ int Voice::maxVid() const
std::shared_ptr<Voice> Voice::startChildMacro(int8_t addNote, ObjectId macroId, int macroStep)
{
std::shared_ptr<Voice> vox = _allocateVoice(32000.0, true);
vox->loadSoundMacro(macroId, macroStep, 1000.0, m_state.m_initKey + addNote,
m_state.m_initVel, m_state.m_initMod);
if (!vox->loadSoundMacro(macroId, macroStep, 1000.0, m_state.m_initKey + addNote,
m_state.m_initVel, m_state.m_initMod))
{
_destroyVoice(vox.get());
return {};
}
return vox;
}