try not thinning when loading old-school automation lists

[ardour.git] / libs / ardour / quantize.cc

diff --git a/libs/ardour/quantize.cc b/libs/ardour/quantize.cc
index 97be158badd853bdc5dfde5d07952b025988897a..a4543d773c75dd035fb3059171673561e837cb75 100644 (file)
--- a/libs/ardour/quantize.cc
+++ b/libs/ardour/quantize.cc
@@ -20,13 +20,8 @@
 
 #include "pbd/basename.h"
 
-#include "ardour/types.h"
 #include "ardour/quantize.h"
-#include "ardour/session.h"
-#include "ardour/smf_source.h"
 #include "ardour/midi_model.h"
-#include "ardour/midi_region.h"
-#include "ardour/tempo.h"
 
 #include "i18n.h"
 
@@ -40,8 +35,7 @@ using namespace ARDOUR;
  * 0.25 = quantize to beats/4, etc.
  */
 
-Quantize::Quantize (Session& s, QuantizeType /* type */,
-                   bool snap_start, bool snap_end,
+Quantize::Quantize (Session& s, bool snap_start, bool snap_end,
                    double start_grid, double end_grid,
                    float strength, float swing, float threshold)
        : session (s)
@@ -60,10 +54,19 @@ Quantize::~Quantize ()
 }
 
 Command*
-Quantize::operator () (boost::shared_ptr<MidiModel> model, std::vector<Evoral::Sequence<Evoral::MusicalTime>::Notes>& seqs)
+Quantize::operator () (boost::shared_ptr<MidiModel> model,
+                       double position,
+                       std::vector<Evoral::Sequence<Evoral::MusicalTime>::Notes>& seqs)
 {
+       /* Calculate offset from start of model to next closest quantize step,
+          to quantize relative to actual session beats (etc.) rather than from the
+          start of the model.
+       */
+       const double round_pos = ceil(position / _start_grid) * _start_grid;
+       const double offset    = round_pos - position;
+
        bool even;
-       MidiModel::DiffCommand* cmd = new MidiModel::DiffCommand (model, "quantize");
+       MidiModel::NoteDiffCommand* cmd = new MidiModel::NoteDiffCommand (model, "quantize");
 
        for (std::vector<Evoral::Sequence<Evoral::MusicalTime>::Notes>::iterator s = seqs.begin(); s != seqs.end(); ++s) {
 
@@ -71,9 +74,8 @@ Quantize::operator () (boost::shared_ptr<MidiModel> model, std::vector<Evoral::S
 
                for (Evoral::Sequence<MidiModel::TimeType>::Notes::iterator i = (*s).begin(); i != (*s).end(); ++i) {
 
-                       double new_start = round ((*i)->time() / _start_grid) * _start_grid;
-                       double new_end = round ((*i)->end_time() / _end_grid) * _end_grid;
-                       double delta;
+                       double new_start = round ((*i)->time() / _start_grid) * _start_grid + offset;
+                       double new_end = round ((*i)->end_time() / _end_grid) * _end_grid + offset;
 
                        if (_swing > 0.0 && !even) {
 
@@ -97,12 +99,12 @@ Quantize::operator () (boost::shared_ptr<MidiModel> model, std::vector<Evoral::S
 
                        }
 
-                       delta = new_start - (*i)->time();
+                       double delta = new_start - (*i)->time();
 
                        if (fabs (delta) >= _threshold) {
                                if (_snap_start) {
                                        delta *= _strength;
-                                       cmd->change ((*i), MidiModel::DiffCommand::StartTime,
+                                       cmd->change ((*i), MidiModel::NoteDiffCommand::StartTime,
                                                     (*i)->time() + delta);
                                }
                        }
@@ -117,7 +119,7 @@ Quantize::operator () (boost::shared_ptr<MidiModel> model, std::vector<Evoral::S
                                                new_dur = _end_grid;
                                        }
 
-                                       cmd->change ((*i), MidiModel::DiffCommand::Length, new_dur);
+                                       cmd->change ((*i), MidiModel::NoteDiffCommand::Length, new_dur);
                                }
                        }