X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fquantize.cc;h=66044690077d3ad3fbc517188881a573768adeca;hb=ced4378d0914bcfb926267772c45d1d23f3bed38;hp=ccbda9711a5f5f02b73bf854fd065c1936e6857f;hpb=9f63ab9931e6478472853bdda58da47ea29ac125;p=ardour.git

diff --git a/libs/ardour/quantize.cc b/libs/ardour/quantize.cc
index ccbda9711a..6604469007 100644
--- 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
@@ -16,30 +16,35 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
+#include <cmath>
 
-#include <pbd/basename.h>
+#include "pbd/basename.h"
 
-#include <ardour/types.h>
-#include <ardour/quantize.h>
-#include <ardour/session.h>
-#include <ardour/smf_source.h>
-#include <ardour/midi_region.h>
-#include <ardour/tempo.h>
+#include "ardour/quantize.h"
+#include "ardour/midi_model.h"
 
 #include "i18n.h"
 
 using namespace std;
+using namespace PBD;
 using namespace ARDOUR;
 
-
-/** Quantize notes, valid for MIDI regions only.
+/** Quantize notes
  *
- * Q is the quantize value in beats, ie 1.0 = quantize to beats,
+ * grid parameters are the quantize value in beats, ie 1.0 = quantize to beats,
  * 0.25 = quantize to beats/4, etc.
  */
-Quantize::Quantize (Session& s, double q)
-	: Filter (s)
-	, _q(q)
+
+Quantize::Quantize (bool snap_start, bool snap_end,
+		    double start_grid, double end_grid,
+		    float strength, float swing, float threshold)
+	: _snap_start (snap_start)
+	, _snap_end (snap_end)
+	, _start_grid(start_grid)
+	, _end_grid(end_grid)
+	, _strength (strength/100.0)
+	, _swing (swing/100.0)
+	, _threshold (threshold)
 {
 }
 
@@ -47,39 +52,86 @@ Quantize::~Quantize ()
 {
 }
 
-int
-Quantize::run (boost::shared_ptr<Region> r)
+Command*
+Quantize::operator () (boost::shared_ptr<MidiModel> model,
+                       Evoral::Beats position,
+                       std::vector<Evoral::Sequence<Evoral::Beats>::Notes>& seqs)
 {
-	boost::shared_ptr<MidiRegion> region = boost::dynamic_pointer_cast<MidiRegion>(r);
-	if (!region)
-		return -1;
-
-	// FIXME: how to make a whole file region if it isn't?
-	//assert(region->whole_file());
-
-	boost::shared_ptr<MidiSource> src = region->midi_source(0);
-	src->load_model();
-
-	boost::shared_ptr<MidiModel> model = src->model();
-	
-	// FIXME: Model really needs to be switched to beat time (double) ASAP
-	
-	const Tempo& t = session.tempo_map().tempo_at(r->start());
-	const Meter& m = session.tempo_map().meter_at(r->start());
-
-	double q_frames = _q * (m.frames_per_bar(t, session.frame_rate()) / (double)m.beats_per_bar());
-
-	for (MidiModel::Notes::iterator i = model->notes().begin(); i != model->notes().end(); ++i) {
-		const double new_time = lrint((*i)->time() / q_frames) * q_frames;
-		double new_dur = lrint((*i)->duration() / q_frames) * q_frames;
-		if (new_dur == 0.0)
-			new_dur = q_frames;
-		
-		(*i)->set_time(new_time);
-		(*i)->set_duration(new_dur);
-	}
+	/* 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::NoteDiffCommand* cmd = new MidiModel::NoteDiffCommand (model, "quantize");
+
+	for (std::vector<Evoral::Sequence<Evoral::Beats>::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().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));
 
-	model->set_edited(true);
+			} 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));
+
+			}
+
+			double delta = new_start - (*i)->time().to_double();
+
+			if (fabs (delta) >= _threshold) {
+				if (_snap_start) {
+					delta *= _strength;
+					cmd->change ((*i), MidiModel::NoteDiffCommand::StartTime,
+					             (*i)->time() + delta);
+				}
+			}
+
+			if (_snap_end) {
+				delta = new_end - (*i)->end_time().to_double();
+
+				if (fabs (delta) >= _threshold) {
+					Evoral::Beats new_dur(new_end - new_start);
+
+					if (!new_dur) {
+						new_dur = Evoral::Beats(_end_grid);
+					}
+
+					cmd->change ((*i), MidiModel::NoteDiffCommand::Length, new_dur);
+				}
+			}
+
+			even = !even;
+		}
+	}
 
-	return 0;
+	return cmd;
 }