refactor MIDISceneChange color property addition by moving it into SceneChange to...

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

diff --git a/libs/ardour/quantize.cc b/libs/ardour/quantize.cc
index db2cbb1d21f722ab0c50e6b61791c0fb5f239ef9..7da1edaaa18732695a64ab7d678f9e3f5ce917ac 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,8 +54,17 @@ 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 = round(position / _start_grid) * _start_grid;
+       const double offset    = round_pos - position;
+
        bool even;
        MidiModel::NoteDiffCommand* cmd = new MidiModel::NoteDiffCommand (model, "quantize");
 
@@ -69,11 +72,13 @@ Quantize::operator () (boost::shared_ptr<MidiModel> model, std::vector<Evoral::S
 
                even = false;
 
+               /* TODO 'swing' probably requires a 2nd iteration:
+                * first quantize notes to the grid, then apply beat shift
+                */
                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() - offset) / _start_grid) * _start_grid + offset;
+                       double new_end = round (((*i)->end_time() - offset) / _end_grid) * _end_grid + offset;
 
                        if (_swing > 0.0 && !even) {
 
@@ -84,6 +89,7 @@ Quantize::operator () (boost::shared_ptr<MidiModel> model, std::vector<Evoral::S
                                */
 
                                new_start = new_start + (2.0/3.0 * _swing * (next_grid - new_start));
+                               new_end = new_end + (2.0/3.0 * _swing * (next_grid - new_start));
 
                        } else if (_swing < 0.0 && !even) {
 
@@ -94,10 +100,11 @@ Quantize::operator () (boost::shared_ptr<MidiModel> model, std::vector<Evoral::S
                                */
 
                                new_start = new_start - (2.0/3.0 * _swing * (new_start - prev_grid));
+                               new_end = new_end - (2.0/3.0 * _swing * (new_start - prev_grid));
 
                        }
 
-                       delta = new_start - (*i)->time();
+                       double delta = new_start - (*i)->time();
 
                        if (fabs (delta) >= _threshold) {
                                if (_snap_start) {