Remove dead code.

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

diff --git a/libs/ardour/quantize.cc b/libs/ardour/quantize.cc
index 13b1cf3b362fa184c30385ac7f0d2bc2e00454d3..dc1976e9ffd49ef812cc185a393c2fb07802f732 100644 (file)
--- a/libs/ardour/quantize.cc
+++ b/libs/ardour/quantize.cc
@@ -35,11 +35,10 @@ using namespace ARDOUR;
  * 0.25 = quantize to beats/4, etc.
  */
 
-Quantize::Quantize (Session& s, bool snap_start, bool snap_end,
+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)
@@ -55,7 +54,7 @@ Quantize::~Quantize ()
 
 Command*
 Quantize::operator () (boost::shared_ptr<MidiModel> model,
-                       double position,
+                       Evoral::MusicalTime position,
                        std::vector<Evoral::Sequence<Evoral::MusicalTime>::Notes>& seqs)
 {
        /* TODO: Rewrite this to be precise with fixed point? */
@@ -64,8 +63,8 @@ Quantize::operator () (boost::shared_ptr<MidiModel> model,
           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;
+       const double round_pos = round(position.to_double() / _start_grid) * _start_grid;
+       const double offset    = round_pos - position.to_double();
 
        bool even;
        MidiModel::NoteDiffCommand* cmd = new MidiModel::NoteDiffCommand (model, "quantize");
@@ -112,7 +111,7 @@ Quantize::operator () (boost::shared_ptr<MidiModel> model,
                                if (_snap_start) {
                                        delta *= _strength;
                                        cmd->change ((*i), MidiModel::NoteDiffCommand::StartTime,
-                                                    (*i)->time().to_double() + delta);
+                                                    (*i)->time() + delta);
                                }
                        }
 
@@ -120,10 +119,10 @@ Quantize::operator () (boost::shared_ptr<MidiModel> model,
                                delta = new_end - (*i)->end_time().to_double();
 
                                if (fabs (delta) >= _threshold) {
-                                       double new_dur = new_end - new_start;
+                                       Evoral::MusicalTime new_dur(new_end - new_start);
 
-                                       if (new_dur == 0.0) {
-                                               new_dur = _end_grid;
+                                       if (!new_dur) {
+                                               new_dur = Evoral::MusicalTime(_end_grid);
                                        }
 
                                        cmd->change ((*i), MidiModel::NoteDiffCommand::Length, new_dur);