Fix quantization and other time-related ops.

5 files changed, 49 insertions, 17 deletions

diff --git a/libs/ardour/ardour/midi_operator.h b/libs/ardour/ardour/midi_operator.h
index 00678a2831..36e87b714b 100644
--- a/libs/ardour/ardour/midi_operator.h
+++ b/libs/ardour/ardour/midi_operator.h
@@ -38,7 +38,7 @@ class LIBARDOUR_API MidiOperator {
 	virtual ~MidiOperator() {}
 
 	virtual Command* operator() (boost::shared_ptr<ARDOUR::MidiModel>,
-	                             double,
+	                             Evoral::MusicalTime,
 	                             std::vector<Evoral::Sequence<Evoral::MusicalTime>::Notes>&) = 0;
 	virtual std::string name() const = 0;
 };
diff --git a/libs/ardour/ardour/quantize.h b/libs/ardour/ardour/quantize.h
index c41d172177..1434a85f8e 100644
--- a/libs/ardour/ardour/quantize.h
+++ b/libs/ardour/ardour/quantize.h
@@ -37,7 +37,7 @@ public:
 	~Quantize ();
 
 	Command* operator() (boost::shared_ptr<ARDOUR::MidiModel>,
-	                     double position,
+	                     Evoral::MusicalTime position,
 	                     std::vector<Evoral::Sequence<Evoral::MusicalTime>::Notes>&);
 	std::string name() const { return std::string ("quantize"); }
 
diff --git a/libs/ardour/quantize.cc b/libs/ardour/quantize.cc
index 13b1cf3b36..b543c5e67b 100644
--- a/libs/ardour/quantize.cc
+++ b/libs/ardour/quantize.cc
@@ -55,7 +55,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 +64,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 +112,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 +120,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);
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index 1767c8100d..486cbb0643 100644
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -1885,7 +1885,7 @@ TempoMap::framepos_plus_beats (framepos_t pos, Evoral::MusicalTime beats) const
 	             string_compose ("frame %1 plus %2 beats, start with tempo = %3 @ %4\n",
 	                             pos, beats, *((const Tempo*)tempo), tempo->frame()));
 
-	while (beats) {
+	while (!!beats) {
 
 		/* Distance to the end of this section in frames */
 		framecnt_t distance_frames = (next_tempo == metrics.end() ? max_framepos : ((*next_tempo)->frame() - pos));
@@ -1994,7 +1994,7 @@ TempoMap::framepos_minus_beats (framepos_t pos, Evoral::MusicalTime beats) const
 	   prev_tempo  -> the first metric before "pos", possibly metrics.rend()
 	*/
 
-	while (beats) {
+	while (!!beats) {
 		
 		/* Distance to the start of this section in frames */
 		framecnt_t distance_frames = (pos - tempo->frame());
@@ -2011,7 +2011,7 @@ TempoMap::framepos_minus_beats (framepos_t pos, Evoral::MusicalTime beats) const
 		/* Update */
 
 		beats -= sub;
-		pos -= sub * tempo->frames_per_beat (_frame_rate);
+		pos -= sub.to_double() * tempo->frames_per_beat (_frame_rate);
 
 		DEBUG_TRACE (DEBUG::TempoMath, string_compose ("\tnow at %1, %2 beats left, prev at end ? %3\n", pos, beats,
 							       (prev_tempo == metrics.rend())));
@@ -2036,7 +2036,7 @@ TempoMap::framepos_minus_beats (framepos_t pos, Evoral::MusicalTime beats) const
 				}
 			}
 		} else {
-			pos -= llrint (beats * tempo->frames_per_beat (_frame_rate));
+			pos -= llrint (beats.to_double() * tempo->frames_per_beat (_frame_rate));
 			beats = Evoral::MusicalTime();
 		}
 	}
diff --git a/libs/evoral/evoral/types.hpp b/libs/evoral/evoral/types.hpp
index ee93bc3998..719007abe5 100644
--- a/libs/evoral/evoral/types.hpp
+++ b/libs/evoral/evoral/types.hpp
@@ -126,14 +126,35 @@ public:
 	}
 
 	inline bool operator>=(const MusicalTime& b) const {
+		return operator==(b) || operator>(b);
+	}
+
+	inline bool operator<(double b) const {
 		/* Acceptable tolerance is 1 tick. */
-		if (fabs(_time - b._time) <= (1.0 / PPQN)) {
-			return true;  /* Effectively identical. */
+		if (fabs(_time - b) <= (1.0 / PPQN)) {
+			return false;  /* Effectively identical. */
+		} else {
+			return _time < b;
+		}
+	}
+
+	inline bool operator<=(double b) const {
+		return operator==(b) || operator<(b);
+	}
+
+	inline bool operator>(double b) const {
+		/* Acceptable tolerance is 1 tick. */
+		if (fabs(_time - b) <= (1.0 / PPQN)) {
+			return false;  /* Effectively identical. */
 		} else {
-			return _time >= b._time;
+			return _time > b;
 		}
 	}
 
+	inline bool operator>=(double b) const {
+		return operator==(b) || operator>(b);
+	}
+
 	MusicalTime operator+(const MusicalTime& b) const {
 		return MusicalTime(_time + b._time);
 	}
@@ -142,6 +163,14 @@ public:
 		return MusicalTime(_time - b._time);
 	}
 
+	MusicalTime operator+(double d) const {
+		return MusicalTime(_time + d);
+	}
+
+	MusicalTime operator-(double d) const {
+		return MusicalTime(_time - d);
+	}
+
 	MusicalTime operator-() const {
 		return MusicalTime(-_time);
 	}
@@ -165,7 +194,10 @@ public:
 	uint64_t to_ticks()               const { return lrint(_time * PPQN); }
 	uint64_t to_ticks(uint32_t ppqn)  const { return lrint(_time * ppqn); }
 
-	operator bool() const { return _time != 0; }
+	uint32_t get_beats() const { return floor(_time); }
+	uint32_t get_ticks() const { return (uint32_t)lrint(fmod(_time, 1.0) * PPQN); }
+
+	bool operator!() const { return _time == 0; }
 
 	static MusicalTime min()  { return MusicalTime(DBL_MIN); }
 	static MusicalTime max()  { return MusicalTime(DBL_MAX); }