Remove dead code.

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

diff --git a/libs/ardour/quantize.cc b/libs/ardour/quantize.cc
index 7aedb98a4dd7cce5eac3a3c15c58212d9b8b67be..dc1976e9ffd49ef812cc185a393c2fb07802f732 100644 (file)
--- a/libs/ardour/quantize.cc
+++ b/libs/ardour/quantize.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2004 Paul Davis 
+    Copyright (C) 2004 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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,12 +35,10 @@ using namespace ARDOUR;
  * 0.25 = quantize to beats/4, etc.
  */
 
-Quantize::Quantize (Session& s, QuantizeType /* type */, 
-                   bool snap_start, bool snap_end,
-                   double start_grid, double end_grid, 
+Quantize::Quantize (bool snap_start, bool snap_end,
+                   double start_grid, double end_grid,
                    float strength, float swing, float threshold)
-       : session (s)
-       , _snap_start (snap_start)
+       : _snap_start (snap_start)
        , _snap_end (snap_end)
        , _start_grid(start_grid)
        , _end_grid(end_grid)
@@ -60,67 +53,82 @@ 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,
+                       Evoral::MusicalTime position,
+                       std::vector<Evoral::Sequence<Evoral::MusicalTime>::Notes>& seqs)
 {
+       /* TODO: Rewrite this to be precise with fixed point? */
+
+       /* 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.to_double() / _start_grid) * _start_grid;
+       const double offset    = round_pos - position.to_double();
+
        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) {
 
                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().to_double() - offset) / _start_grid) * _start_grid + offset;
+                       double new_end = round (((*i)->end_time().to_double() - offset) / _end_grid) * _end_grid + offset;
+
                        if (_swing > 0.0 && !even) {
-                               
+
                                double next_grid = new_start + _start_grid;
-                               
+
                                /* find a spot 2/3 (* swing factor) of the way between the grid point
                                   we would put this note at, and the nominal position of the next note.
                                */
-                               
+
                                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) {
-                               
+
                                double prev_grid = new_start - _start_grid;
-                               
+
                                /* find a spot 2/3 (* swing factor) of the way between the grid point
                                   we would put this note at, and the nominal position of the previous note.
                                */
-                               
+
                                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().to_double();
+
                        if (fabs (delta) >= _threshold) {
                                if (_snap_start) {
                                        delta *= _strength;
-                                       cmd->change ((*i), MidiModel::DiffCommand::StartTime,
-                                                    (*i)->time() + delta);
+                                       cmd->change ((*i), MidiModel::NoteDiffCommand::StartTime,
+                                                    (*i)->time() + delta);
                                }
                        }
-                       
+
                        if (_snap_end) {
-                               delta = new_end - (*i)->end_time();
-                               
+                               delta = new_end - (*i)->end_time().to_double();
+
                                if (fabs (delta) >= _threshold) {
-                                       double new_dur = new_end - new_start;
-                                       
-                                       if (new_dur == 0.0) {
-                                               new_dur = _end_grid;
+                                       Evoral::MusicalTime new_dur(new_end - new_start);
+
+                                       if (!new_dur) {
+                                               new_dur = Evoral::MusicalTime(_end_grid);
                                        }
-                                       
-                                       cmd->change ((*i), MidiModel::DiffCommand::Length, new_dur);
+
+                                       cmd->change ((*i), MidiModel::NoteDiffCommand::Length, new_dur);
                                }
                        }
-                       
+
                        even = !even;
                }
        }