summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-05-08 14:38:10 +0000
committerFlorian Jung <flo@windfisch.org>2011-05-08 14:38:10 +0000
commita3670594c5a3c5a7053dd8bd8280b7c2b20cefbe (patch)
tree41cab56523ccdf659a21635334f783d918523657
parent94583a696436a3bec385223efaea730768720975 (diff)
the proper AL::raster quantisation functions are used in the scoreeditor
-rw-r--r--muse2/muse/midiedit/scoreedit.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/muse2/muse/midiedit/scoreedit.cpp b/muse2/muse/midiedit/scoreedit.cpp
index cb37c382..9534abf9 100644
--- a/muse2/muse/midiedit/scoreedit.cpp
+++ b/muse2/muse/midiedit/scoreedit.cpp
@@ -1315,15 +1315,15 @@ bool operator< (const note_pos_t& a, const note_pos_t& b)
}
-
+
int flo_quantize(int tick, int quant_ticks)
{
- return int(nearbyint((float)tick / quant_ticks))*quant_ticks;
+ return AL::sigmap.raster(tick, quant_ticks);
}
int flo_quantize_floor(int tick, int quant_ticks)
{
- return int(tick / quant_ticks) * quant_ticks;
+ return AL::sigmap.raster1(tick, quant_ticks);
}
@@ -3927,7 +3927,6 @@ set<Part*> staff_t::parts_at_tick(unsigned tick)
/* BUGS and potential bugs
- * o the proper quantize functions must be used! yes, really!
* o when the keymap is not used, this will probably lead to a bug
* same when mastertrack is disabled
* o tied notes don't work properly when there's a key-change in