projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prepare export-format codec-quality setting
[ardour.git]
/
libs
/
ardour
/
quantize.cc
diff --git
a/libs/ardour/quantize.cc
b/libs/ardour/quantize.cc
index b60b63dcf40176e1117055950251274ea3da40d5..27e40ae8f70066585f52d0240e7759af160a0cef 100644
(file)
--- a/
libs/ardour/quantize.cc
+++ b/
libs/ardour/quantize.cc
@@
-111,8
+111,8
@@
swing_position (double pos, double grid, double swing, double offset)
Command*
Quantize::operator () (boost::shared_ptr<MidiModel> model,
Command*
Quantize::operator () (boost::shared_ptr<MidiModel> model,
-
Ev
oral::Beats position,
- std::vector<Evoral::Sequence<
Ev
oral::Beats>::Notes>& seqs)
+
Temp
oral::Beats position,
+ std::vector<Evoral::Sequence<
Temp
oral::Beats>::Notes>& seqs)
{
/* TODO: Rewrite this to be precise with fixed point? */
{
/* TODO: Rewrite this to be precise with fixed point? */
@@
-125,7
+125,7
@@
Quantize::operator () (boost::shared_ptr<MidiModel> model,
MidiModel::NoteDiffCommand* cmd = new MidiModel::NoteDiffCommand (model, "quantize");
MidiModel::NoteDiffCommand* cmd = new MidiModel::NoteDiffCommand (model, "quantize");
- for (std::vector<Evoral::Sequence<
Ev
oral::Beats>::Notes>::iterator s = seqs.begin(); s != seqs.end(); ++s) {
+ for (std::vector<Evoral::Sequence<
Temp
oral::Beats>::Notes>::iterator s = seqs.begin(); s != seqs.end(); ++s) {
for (Evoral::Sequence<MidiModel::TimeType>::Notes::iterator i = (*s).begin(); i != (*s).end(); ++i) {
for (Evoral::Sequence<MidiModel::TimeType>::Notes::iterator i = (*s).begin(); i != (*s).end(); ++i) {
@@
-167,10
+167,10
@@
Quantize::operator () (boost::shared_ptr<MidiModel> model,
delta = new_end - (*i)->end_time().to_double();
if (fabs (delta) >= _threshold) {
delta = new_end - (*i)->end_time().to_double();
if (fabs (delta) >= _threshold) {
-
Ev
oral::Beats new_dur(new_end - new_start);
+
Temp
oral::Beats new_dur(new_end - new_start);
if (!new_dur) {
if (!new_dur) {
- new_dur =
Ev
oral::Beats(_end_grid);
+ new_dur =
Temp
oral::Beats(_end_grid);
}
cmd->change ((*i), MidiModel::NoteDiffCommand::Length, new_dur);
}
cmd->change ((*i), MidiModel::NoteDiffCommand::Length, new_dur);