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

Refactor IsPowerOfTwo determination

Browse Source
This commit is contained in:
Matthias Neeracher 2011-09-12 16:17:21 +02:00
parent e32c253870
commit 23ced3e860
6 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/VLLilypondWriter.cpp
View File

@ -294,7 +294,7 @@ void VLLilypondWriter::VisitChord(VLChord & c)
if (name == "r")
name = "s";
char duration[16];
if (c.fDuration.fNum == 1 && !(c.fDuration.fDenom & (c.fDuration.fDenom-1))) // Power of two
if (c.fDuration.IsPowerOfTwo())
sprintf(duration, "%d", c.fDuration.fDenom);
else
sprintf(duration, "1*%d/%d", c.fDuration.fNum, c.fDuration.fDenom);

2
Sources/VLMMAWriter.cpp
View File

@ -117,7 +117,7 @@ void VLMMAWriter::VisitNote(VLLyricsNote & n)
char buf[4];
std::string dur;
if (n.fDuration.fNum == 1)
if (!(n.fDuration.fDenom & (n.fDuration.fDenom-1))) {
if (n.fDuration.IsPowerOfTwo()) {
sprintf(buf, "%d", n.fDuration.fDenom);
dur = buf;
} else if (n.fDuration.fDenom == 3) {

14
Sources/VLModel.cpp
View File

@ -78,6 +78,15 @@ VLFraction & VLFraction::operator%=(VLFraction other)
return *this *= other;
}
bool VLFraction::IsPowerOfTwo() const
{
//
// !(x & (x-1)) is true if x had only a single bit set and thus
// is a power of two. We're not really interested in the case >1
//
return fNum == 1 && !(fDenom & (fDenom-1));
}
#pragma mark -
#pragma mark class VLNote
@ -114,10 +123,7 @@ void VLNote::MakeRepresentable()
fVisual = kWhole | (fVisual & kAccidentalsMask);
VLFraction part(1,1);
VLFraction triplet(2,3);
//
// Power of 2 denominators are not triplets
//
bool nonTriplet(!(fDuration.fDenom & (fDuration.fDenom-1)));
bool nonTriplet = fDuration.IsPowerOfTwo();
while (part.fDenom < 64) {
if (fDuration >= part) {
fDuration = part;

2
Sources/VLModel.h
View File

@ -36,6 +36,8 @@ struct VLFraction : VLFract {
VLFraction & operator%=(VLFraction other);
VLFraction & Normalize();
bool IsPowerOfTwo() const;
};
inline float operator*(VLFraction f, float sc)

2
Sources/VLPListDocument.mm
View File

@ -202,7 +202,7 @@ void VLPlistVisitor::VisitNote(VLLyricsNote & n)
// 4th 4th 8th
//
[nd setObject:[NSNumber numberWithInt:fTupletNote] forKey:@"normalType"];
if (fTupletDur.fNum == 1 && !(fTupletDur.fDenom&(fTupletDur.fDenom-1)))
if (fTupletDur.IsPowerOfTwo())
fInTuplet = 0;
}
} else if (fInTuplet == tupletNum)

4
Sources/VLSheetViewNotes.mm
View File

@ -388,8 +388,8 @@
}
++inTuplet;
tupletDur += note->fDuration / VLNote::TupletDenom(tuplet);
if (tuplet == VLNote::kTriplet ? (tupletDur.fNum == 1 && !(tupletDur.fDenom & (tupletDur.fDenom-1)))
: inTuplet == VLNote::TupletNum(tuplet)
if (tuplet == VLNote::kTriplet
? tupletDur.IsPowerOfTwo() : inTuplet == VLNote::TupletNum(tuplet)
) {
//
// Tuplet adds up to power of two fraction