X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fquantize.cc;h=97be158badd853bdc5dfde5d07952b025988897a;hb=54cbc45a5a40f4eefd64fa41ad9029f5f8f6a84f;hp=e4a28092771ca39e6370ed81004881e5995b3c30;hpb=166ef64e3db4ab72b7b1e7455234e2b9ceddf6d8;p=ardour.git

diff --git a/libs/ardour/quantize.cc b/libs/ardour/quantize.cc
index e4a2809277..97be158bad 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,42 @@
     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/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"
 
 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 (Session& s, QuantizeType /* type */,
+		    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_end (snap_end)
+	, _start_grid(start_grid)
+	, _end_grid(end_grid)
+	, _strength (strength/100.0)
+	, _swing (swing/100.0)
+	, _threshold (threshold)
 {
 }
 
@@ -47,40 +59,71 @@ Quantize::~Quantize ()
 {
 }
 
-int
-Quantize::run (boost::shared_ptr<Region> r)
+Command*
+Quantize::operator () (boost::shared_ptr<MidiModel> model, std::vector<Evoral::Sequence<Evoral::MusicalTime>::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 (Evoral::Sequence<MidiModel::TimeType>::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)->length() / q_frames) * q_frames;
-		if (new_dur == 0.0)
-			new_dur = q_frames;
-		
-		(*i)->set_time(new_time);
-		(*i)->set_length(new_dur);
-	}
+	bool even;
+	MidiModel::DiffCommand* cmd = new MidiModel::DiffCommand (model, "quantize");
+
+	for (std::vector<Evoral::Sequence<Evoral::MusicalTime>::Notes>::iterator s = seqs.begin(); s != seqs.end(); ++s) {
+
+		even = false;
+
+		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;
+
+			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));
+
+			} else if (_swing < 0.0 && !even) {
 
-	model->set_edited(true);
+				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));
+
+			}
+
+			delta = new_start - (*i)->time();
+
+			if (fabs (delta) >= _threshold) {
+				if (_snap_start) {
+					delta *= _strength;
+					cmd->change ((*i), MidiModel::DiffCommand::StartTime,
+						     (*i)->time() + delta);
+				}
+			}
+
+			if (_snap_end) {
+				delta = new_end - (*i)->end_time();
+
+				if (fabs (delta) >= _threshold) {
+					double new_dur = new_end - new_start;
+
+					if (new_dur == 0.0) {
+						new_dur = _end_grid;
+					}
+
+					cmd->change ((*i), MidiModel::DiffCommand::Length, new_dur);
+				}
+			}
+
+			even = !even;
+		}
+	}
 
-	return 0;
+	return cmd;
 }