microtherion/VocalEasel
1
0
Fork 0
mirror of https://github.com/microtherion/VocalEasel.git synced 2024-12-22 19:23:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow swung 8ths in high granularity songs

Browse Source
This commit is contained in:
Matthias Neeracher 2007-10-09 05:15:31 +00:00
parent 04d02aafe4
commit 2d90e4ac2d
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Sources/VLModel.cpp
View File

@ -473,9 +473,15 @@ void VLMeasure::DecomposeNotes(const VLProperties & prop, VLNoteList & decompose
// //
// Distinguish swing 8ths/16ths from triplets // Distinguish swing 8ths/16ths from triplets
// //
VLFraction swung(1, prop.fDivisions < 6 ? 8 : 16); bool swing16 = prop.fDivisions >= 6;
VLFraction grid(2*swung); VLFraction sw6(1,6);
if (p.fDuration == 4*swung/3 && (at % grid == 0)) { VLFraction sw12(1,12);
VLFraction sw24(1,24);
VLFraction grid4(1, 4);
VLFraction grid8(1, 8);
if ((p.fDuration == sw6 && (at % grid4 == 0))
|| (swing16 && p.fDuration == sw12 && (at % grid8 == 0))
) {
if (p.fDuration == c.fDuration && n!=e if (p.fDuration == c.fDuration && n!=e
&& n->fDuration == p.fDuration && n->fDuration == p.fDuration
) { ) {
@ -486,8 +492,8 @@ void VLMeasure::DecomposeNotes(const VLProperties & prop, VLNoteList & decompose
// //
p.fVisual = (p.fVisual+1) & VLNote::kNoteHead; p.fVisual = (p.fVisual+1) & VLNote::kNoteHead;
} }
} else if (p.fDuration == 2*swung/3 } else if ((p.fDuration == sw12 && ((at+p.fDuration) % grid4 == 0))
&& ((at+p.fDuration) % grid == 0) || (swing16 && p.fDuration == sw24 && ((at+p.fDuration) % grid8 == 0))
) { ) {
// //
// Second swing note (8th triplet -> 8th) // Second swing note (8th triplet -> 8th)