AxioDL
/
amuse
mirror of https://github.com/AxioDL/amuse.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle additional corner cases for getChanProgram

This commit is contained in:
Jack Andersen 2016-07-14 09:42:54 -10:00
parent d06a5ebcfa
commit 5bae40d3c3
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Sequencer.cpp
View File

@ -93,13 +93,19 @@ Sequencer::ChannelState::ChannelState(Sequencer& parent, uint8_t chanId) : m_par
{ {
auto it = m_parent.m_songGroup->m_drumPages.find(m_setup->programNo); auto it = m_parent.m_songGroup->m_drumPages.find(m_setup->programNo);
if (it != m_parent.m_songGroup->m_drumPages.cend()) if (it != m_parent.m_songGroup->m_drumPages.cend())
{
m_page = it->second; m_page = it->second;
m_curProgram = m_setup->programNo;
}
} }
else else
{ {
auto it = m_parent.m_songGroup->m_normPages.find(m_setup->programNo); auto it = m_parent.m_songGroup->m_normPages.find(m_setup->programNo);
if (it != m_parent.m_songGroup->m_normPages.cend()) if (it != m_parent.m_songGroup->m_normPages.cend())
{
m_page = it->second; m_page = it->second;
m_curProgram = m_setup->programNo;
}
} }
m_curVol = m_setup->volume / 127.f; m_curVol = m_setup->volume / 127.f;
@ -578,9 +584,16 @@ void Sequencer::setVolume(float vol)
int8_t Sequencer::getChanProgram(int8_t chanId) const int8_t Sequencer::getChanProgram(int8_t chanId) const
{ {
if (chanId > 15 || !m_chanStates[chanId]) if (chanId > 15)
return 0; return 0;
if (!m_chanStates[chanId])
{
if (!m_midiSetup)
return 0;
return m_midiSetup[chanId].programNo;
}
return m_chanStates[chanId]->m_curProgram; return m_chanStates[chanId]->m_curProgram;
} }