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

Distinguish MMA 82 vs 3

Browse Source
This commit is contained in:
Matthias Neeracher 2007-05-17 06:40:54 +00:00
parent b47ecf36b8
commit 1615a3aa7b
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Sources/VLModel.cpp
View File

@ -240,12 +240,24 @@ void VLNote::MMAName(std::string & name, VLFraction at, VLFraction dur, VLFracti
bool grouped = dur==nextDur || bool grouped = dur==nextDur ||
(prevPart!=0 ? dur==prevPart : dur==prevDur); (prevPart!=0 ? dur==prevPart : dur==prevDur);
prop.PartialNote(at, dur, grouped, &part); prop.PartialNote(at, dur, grouped, &part);
const char * durName;
for (int d=0; sMMADur[d].fName; ++d) for (int d=0; sMMADur[d].fName; ++d)
if (part == sMMADur[d].fVal) { if (part == sMMADur[d].fVal) {
if (name.size()) durName = sMMADur[d].fName;
name += '+'; break;
name += sMMADur[d].fName;
} }
if (!strcmp(durName, "82")) {
//
// Distinguish 2nd pair of swing 8ths from regular triplet
//
const VLFraction kBeat(1, prop.fTime.fDenom);
VLFraction withinBeat = at % kBeat;
if (withinBeat != 2*kBeat/3)
durName = "3";
}
if (name.size())
name += '+';
name += durName;
prevPart = part; prevPart = part;
dur -= part; dur -= part;
at += part; at += part;