Fix quantization and other time-related ops.

7 files changed, 32 insertions, 38 deletions

diff --git a/gtk2_ardour/edit_note_dialog.cc b/gtk2_ardour/edit_note_dialog.cc
index 149b212926..5f8add9ffd 100644
--- a/gtk2_ardour/edit_note_dialog.cc
+++ b/gtk2_ardour/edit_note_dialog.cc
@@ -116,8 +116,8 @@ EditNoteDialog::EditNoteDialog (MidiRegionView* rv, set<NoteBase*> n)
 	int test_channel = (*_events.begin())->note()->channel ();
 	int test_pitch = (*_events.begin())->note()->note ();
 	int test_velocity = (*_events.begin())->note()->velocity ();
-	double test_time = (*_events.begin())->note()->time ();
-	double test_length = (*_events.begin())->note()->length ();
+	Evoral::MusicalTime test_time = (*_events.begin())->note()->time ();
+	Evoral::MusicalTime test_length = (*_events.begin())->note()->length ();
 	
 	for (set<NoteBase*>::iterator i = _events.begin(); i != _events.end(); ++i) {
 		if ((*i)->note()->channel() != test_channel) {
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index fa66c952dc..30cad7771d 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -5279,10 +5279,11 @@ NoteCreateDrag::finished (GdkEvent*, bool had_movement)
 	Evoral::MusicalTime const one_tick = Evoral::MusicalTime::ticks(1);
 	
 	if (_editor->snap_mode() == SnapNormal && length < g) {
-		length = g - one_tick;
+		length = g;
 	}
 
-	Evoral::MusicalTime const length_beats = max (one_tick, _region_view->region_frames_to_region_beats (length));
+	Evoral::MusicalTime length_beats = max (
+		one_tick, _region_view->region_frames_to_region_beats (length) - one_tick);
 
 	_region_view->create_note_at (start, _drag_rect->y0(), length_beats, false);
 }
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 856b311ebd..e5fc42af17 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -4849,8 +4849,8 @@ Editor::apply_midi_note_edit_op_to_region (MidiOperator& op, MidiRegionView& mrv
 	vector<Evoral::Sequence<Evoral::MusicalTime>::Notes> v;
 	v.push_back (selected);
 
-	framepos_t pos_frames = mrv.midi_region()->position() - mrv.midi_region()->start();
-	double     pos_beats  = _session->tempo_map().framewalk_to_beats(0, pos_frames);
+	framepos_t          pos_frames = mrv.midi_region()->position() - mrv.midi_region()->start();
+	Evoral::MusicalTime pos_beats  = _session->tempo_map().framewalk_to_beats(0, pos_frames);
 
 	return op (mrv.midi_region()->model(), pos_beats, v);
 }
diff --git a/gtk2_ardour/midi_list_editor.cc b/gtk2_ardour/midi_list_editor.cc
index 32c87bae86..0a87823f8e 100644
--- a/gtk2_ardour/midi_list_editor.cc
+++ b/gtk2_ardour/midi_list_editor.cc
@@ -291,17 +291,18 @@ MidiListEditor::scroll_event (GdkEventScroll* ev)
 						if (note->time() + fdelta >= 0) {
 							cmd->change (note, prop, note->time() + fdelta);
 						} else {
-							cmd->change (note, prop, 0.0);
+							cmd->change (note, prop, Evoral::MusicalTime());
 						}
 						break;
 					case MidiModel::NoteDiffCommand::Velocity:
 						cmd->change (note, prop, (uint8_t) (note->velocity() + idelta));
 						break;
 					case MidiModel::NoteDiffCommand::Length:
-						if (note->length() + fdelta >= 1.0/BBT_Time::ticks_per_beat) {
+						if (note->length().to_double() + fdelta >=
+						    Evoral::MusicalTime::tick().to_double()) {
 							cmd->change (note, prop, note->length() + fdelta);
 						} else {
-							cmd->change (note, prop, 1.0/BBT_Time::ticks_per_beat);
+							cmd->change (note, prop, Evoral::MusicalTime::tick());
 						}
 						break;
 					case MidiModel::NoteDiffCommand::Channel:
@@ -333,17 +334,18 @@ MidiListEditor::scroll_event (GdkEventScroll* ev)
 					if (note->time() + fdelta >= 0) {
 						cmd->change (note, prop, note->time() + fdelta);
 					} else {
-						cmd->change (note, prop, 0.0);
+						cmd->change (note, prop, Evoral::MusicalTime());
 					}
 					break;
 				case MidiModel::NoteDiffCommand::Velocity:
 					cmd->change (note, prop, (uint8_t) (note->velocity() + idelta));
 					break;
 				case MidiModel::NoteDiffCommand::Length:
-					if (note->length() + fdelta >= 1.0/BBT_Time::ticks_per_beat) {
+					if (note->length() + fdelta >=
+					    Evoral::MusicalTime::tick().to_double()) {
 						cmd->change (note, prop, note->length() + fdelta);
 					} else {
-						cmd->change (note, prop, 1.0/BBT_Time::ticks_per_beat);
+						cmd->change (note, prop, Evoral::MusicalTime::tick());
 					}
 					break;
 				case MidiModel::NoteDiffCommand::Channel:
@@ -637,7 +639,7 @@ MidiListEditor::edited (const std::string& path, const std::string& text)
 			 * entry for the actual note ticks
 			 */
 
-			int len_ticks = lrint (note->length() * Timecode::BBT_Time::ticks_per_beat);
+			uint64_t len_ticks = note->length().to_ticks();
 			std::map<int,string>::iterator x = note_length_map.find (len_ticks);
 
 			if (x == note_length_map.end()) {
@@ -682,7 +684,7 @@ MidiListEditor::edited (const std::string& path, const std::string& text)
 		}
 
 		if (fval > 0.0) {
-			fdelta = fval - note->length();
+			fdelta = fval - note->length().to_double();
 			prop = MidiModel::NoteDiffCommand::Length;
 			opname = _("change note length");
 			apply = true;
@@ -762,7 +764,6 @@ MidiListEditor::redisplay_model ()
 			row[columns.velocity] = (*i)->velocity();
 
 			Timecode::BBT_Time bbt;
-			double dur;
 
 			_session->tempo_map().bbt_time (conv.to ((*i)->time()), bbt);
 
@@ -771,11 +772,11 @@ MidiListEditor::redisplay_model ()
 			row[columns.start] = ss.str();
 
 			bbt.bars = 0;
-			dur = (*i)->end_time() - (*i)->time();
-			bbt.beats = floor (dur);
-			bbt.ticks = (uint32_t) lrint (fmod (dur, 1.0) * Timecode::BBT_Time::ticks_per_beat);
+			const Evoral::MusicalTime dur = (*i)->end_time() - (*i)->time();
+			bbt.beats = dur.get_beats ();
+			bbt.ticks = dur.get_ticks ();
 			
-			int len_ticks = lrint ((*i)->length() * Timecode::BBT_Time::ticks_per_beat);
+			int len_ticks = (*i)->length().to_ticks();
 			std::map<int,string>::iterator x = note_length_map.find (len_ticks);
 
 			if (x != note_length_map.end()) {
diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index d134e3d2f5..b82115da9e 100644
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -1856,7 +1856,7 @@ MidiRegionView::patch_change_to_patch_key (MidiModel::PatchChangePtr p)
 
 /// Return true iff @p pc applies to the given time on the given channel.
 static bool
-patch_applies (const ARDOUR::MidiModel::constPatchChangePtr pc, double time, uint8_t channel)
+patch_applies (const ARDOUR::MidiModel::constPatchChangePtr pc, Evoral::MusicalTime time, uint8_t channel)
 {
 	return pc->time() <= time && pc->channel() == channel;
 }
@@ -2672,30 +2672,23 @@ MidiRegionView::update_resizing (NoteBase* primary, bool at_front, double delta_
 		}
 
 		if (!cursor_set) {
-			double beats;
-
-			beats = snap_pixel_to_sample (current_x);
-			beats = region_frames_to_region_beats (beats);
-
-			double len;
+			const double        snapped_x = snap_pixel_to_sample (current_x);
+			Evoral::MusicalTime beats     = region_frames_to_region_beats (snapped_x);
+			Evoral::MusicalTime len       = Evoral::MusicalTime();
 
 			if (at_front) {
 				if (beats < canvas_note->note()->end_time()) {
 					len = canvas_note->note()->time() - beats;
 					len += canvas_note->note()->length();
-				} else {
-					len = 0;
 				}
 			} else {
 				if (beats >= canvas_note->note()->time()) {
 					len = beats - canvas_note->note()->time();
-				} else {
-					len = 0;
 				}
 			}
 
 			char buf[16];
-			snprintf (buf, sizeof (buf), "%.3g beats", len);
+			snprintf (buf, sizeof (buf), "%.3g beats", len.to_double());
 			show_verbose_cursor (buf, 0, 0);
 
 			cursor_set = true;
@@ -2756,8 +2749,7 @@ MidiRegionView::commit_resizing (NoteBase* primary, bool at_front, double delta_
 			Evoral::MusicalTime len = canvas_note->note()->time() - x_beats;
 			len += canvas_note->note()->length();
 
-			if (len) {
-				/* XXX convert to beats */
+			if (!!len) {
 				note_diff_add_change (canvas_note, MidiModel::NoteDiffCommand::Length, len);
 			}
 		}
@@ -2765,7 +2757,7 @@ MidiRegionView::commit_resizing (NoteBase* primary, bool at_front, double delta_
 		if (!at_front) {
 			const Evoral::MusicalTime len = x_beats - canvas_note->note()->time();
 
-			if (len) {
+			if (!!len) {
 				/* XXX convert to beats */
 				note_diff_add_change (canvas_note, MidiModel::NoteDiffCommand::Length, len);
 			}
@@ -2839,7 +2831,7 @@ MidiRegionView::trim_note (NoteBase* event, Evoral::MusicalTime front_delta, Evo
 	   if negative - move the end of the note earlier in time (shortening it)
 	*/
 
-	if (front_delta) {
+	if (!!front_delta) {
 		if (front_delta < 0) {
 
 			if (event->note()->time() < -front_delta) {
@@ -2871,7 +2863,7 @@ MidiRegionView::trim_note (NoteBase* event, Evoral::MusicalTime front_delta, Evo
 
 	}
 
-	if (end_delta) {
+	if (!!end_delta) {
 		bool can_change = true;
 		if (end_delta < 0) {
 			if (event->note()->length() < -end_delta) {
diff --git a/gtk2_ardour/quantize_dialog.cc b/gtk2_ardour/quantize_dialog.cc
index 98514326d5..45a96e1fc3 100644
--- a/gtk2_ardour/quantize_dialog.cc
+++ b/gtk2_ardour/quantize_dialog.cc
@@ -135,7 +135,7 @@ QuantizeDialog::grid_size_to_musical_time (const string& txt) const
 		if (!success) {
 			return 1.0;
 		}
-		return (double) b;
+		return b.to_double();
 	}
 
 	if (txt == _("Beats/128")) {
diff --git a/gtk2_ardour/step_entry.cc b/gtk2_ardour/step_entry.cc
index 607f4abd62..d7b177949f 100644
--- a/gtk2_ardour/step_entry.cc
+++ b/gtk2_ardour/step_entry.cc
@@ -555,7 +555,7 @@ StepEntry::note_length ()
 uint8_t
 StepEntry::note_velocity () const
 {
-        return (Evoral::MusicalTime) velocity_adjustment.get_value();
+	return velocity_adjustment.get_value();
 }
 
 uint8_t