hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Simpler nextFullTact() algorithm

Browse Source
This commit is contained in:
Colin Wallace
2015-06-21 22:55:14 +00:00
parent a6f74c2423
commit 546cb17e5f
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/MidiTime.h
View File

@@ -30,6 +30,7 @@
#include "lmms_basics.h"
#include "export.h"
// note: 1 "Tact" = 1 Measure
const int DefaultTicksPerTact = 192;
const int DefaultStepsPerTact = 16;
const int DefaultBeatsPerTact = DefaultTicksPerTact / DefaultStepsPerTact;
@@ -85,6 +86,7 @@ public:
return *this;
}
// return the tact, rounded down and 0-based
tact_t getTact() const
{
return m_ticks / s_ticksPerTact;
@@ -92,11 +94,7 @@ public:
tact_t nextFullTact() const
{
if( m_ticks % s_ticksPerTact == 0 )
{
return m_ticks / s_ticksPerTact;
}
return m_ticks / s_ticksPerTact + 1;
return (m_ticks + (s_ticksPerTact-1)) / s_ticksPerTact;
}
void setTicks( tick_t ticks )