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

Envelope command fixes, 20ms default envelope

Browse Source
This commit is contained in:
Jack Andersen
2016-05-31 00:16:52 -10:00
parent d5b50e3633
commit 0c8d8f571c
6 changed files with 182 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Engine.cpp
View File

@@ -13,8 +13,8 @@ namespace amuse
Engine::~Engine()
{
for (std::shared_ptr<Sequencer>& seq : m_activeSequencers)
seq->_destroy();
while (m_activeSequencers.size())
m_activeSequencers.front()->_destroy();
while (m_activeSubmixes.size())
removeSubmix(&m_activeSubmixes.front());
for (std::shared_ptr<Emitter>& emitter : m_activeEmitters)
@@ -308,7 +308,8 @@ std::list<Submix>::iterator Engine::_removeSubmix(Submix* smx)
Submix* ssmx = seq->getSubmix();
if (ssmx == smx)
{
seq->_destroy();
if (!seq->m_destroyed)
seq->_destroy();
it = m_activeSequencers.erase(it);
continue;
}