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

Timing fixes for SON playback

Browse Source
This commit is contained in:
Jack Andersen
2016-05-18 19:27:39 -10:00
parent 3433a70462
commit 2115a958b1
7 changed files with 41 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/SongState.cpp
View File

@@ -124,6 +124,9 @@ SongState::Channel::Channel(SongState& parent, uint8_t midiChan, uint32_t startT
m_modWheelData = song + header.m_modOff;
m_waitCountdown = startTick;
m_lastPitchTick = startTick;
m_lastModTick = startTick;
m_waitCountdown += int32_t(DecodeTimeRLE(m_data));
}
void SongState::initialize(const unsigned char* ptr)
@@ -246,10 +249,6 @@ bool SongState::Channel::advance(Sequencer& seq, int32_t ticks)
}
}
/* Bootstrap first delta-time */
if (m_data == m_dataBase)
m_waitCountdown = DecodeTimeRLE(m_data);
/* Loop through as many commands as we can for this time period */
while (true)
{
@@ -257,9 +256,8 @@ bool SongState::Channel::advance(Sequencer& seq, int32_t ticks)
if (m_waitCountdown)
{
m_waitCountdown -= ticks;
if (m_waitCountdown <= 0)
m_waitCountdown = 0;
else
ticks = 0;
if (m_waitCountdown > 0)
return false;
}
@@ -290,7 +288,7 @@ bool SongState::Channel::advance(Sequencer& seq, int32_t ticks)
}
/* Set next delta-time */
m_waitCountdown = DecodeTimeRLE(m_data);
m_waitCountdown += int32_t(DecodeTimeRLE(m_data));
}
return false;
@@ -302,12 +300,17 @@ bool SongState::advance(Sequencer& seq, double dt)
if (m_songState == SongPlayState::Stopped)
return true;
bool done = true;
while (dt > 0.0)
bool done = false;
m_curDt += dt;
while (m_curDt > 0.0)
{
done = true;
/* Compute ticks to compute based on current tempo */
int32_t remTicks = dt * m_tempo * 384 / 60;
if (!remTicks) remTicks = 1;
double ticksPerSecond = m_tempo * 384 / 60;
int32_t remTicks = std::ceil(m_curDt * ticksPerSecond);
if (!remTicks)
break;
/* See if there's an upcoming tempo change in this interval */
if (m_tempoPtr && m_tempoPtr->m_tick != 0xffffffff)
@@ -335,9 +338,9 @@ bool SongState::advance(Sequencer& seq, double dt)
m_curTick += remTicks;
if (m_tempo == 0)
dt = 0.0;
m_curDt = 0.0;
else
dt -= remTicks / double(m_tempo * 384 / 60);
m_curDt -= remTicks / ticksPerSecond;
}
if (done)