convert codebase to use Temporal for various time types

1 files changed, 16 insertions, 16 deletions

diff --git a/gtk2_ardour/step_editor.cc b/gtk2_ardour/step_editor.cc
index 14327cd72d..94b0894bd5 100644
--- a/gtk2_ardour/step_editor.cc
+++ b/gtk2_ardour/step_editor.cc
@@ -41,7 +41,7 @@ StepEditor::StepEditor (PublicEditor& e, boost::shared_ptr<MidiTrack> t, MidiTim
 	step_edit_insert_position = 0;
 	_step_edit_triplet_countdown = 0;
 	_step_edit_within_chord = 0;
-	_step_edit_chord_duration = Evoral::Beats();
+	_step_edit_chord_duration = Temporal::Beats();
 	step_edit_region_view = 0;
 
 	_track->PlaylistChanged.connect (*this, invalidator (*this),
@@ -60,11 +60,11 @@ StepEditor::start_step_editing ()
 {
 	_step_edit_triplet_countdown = 0;
 	_step_edit_within_chord = 0;
-	_step_edit_chord_duration = Evoral::Beats();
+	_step_edit_chord_duration = Temporal::Beats();
 	step_edit_region.reset ();
 	step_edit_region_view = 0;
 	last_added_pitch = -1;
-	last_added_end = Evoral::Beats();
+	last_added_end = Temporal::Beats();
 
 	resync_step_edit_position ();
 	prepare_step_edit_region ();
@@ -201,7 +201,7 @@ StepEditor::check_step_edit ()
 		incoming.read_contents (size, buf);
 
 		if ((buf[0] & 0xf0) == MIDI_CMD_NOTE_ON) {
-			step_add_note (buf[0] & 0xf, buf[1], buf[2], Evoral::Beats());
+			step_add_note (buf[0] & 0xf, buf[1], buf[2], Temporal::Beats());
 		}
 	}
 }
@@ -219,7 +219,7 @@ StepEditor::step_add_program_change (uint8_t /*channel*/, uint8_t /*program*/)
 }
 
 void
-StepEditor::step_edit_sustain (Evoral::Beats beats)
+StepEditor::step_edit_sustain (Temporal::Beats beats)
 {
 	if (step_edit_region_view) {
 		step_edit_region_view->step_sustain (beats);
@@ -227,7 +227,7 @@ StepEditor::step_edit_sustain (Evoral::Beats beats)
 }
 
 void
-StepEditor::move_step_edit_beat_pos (Evoral::Beats beats)
+StepEditor::move_step_edit_beat_pos (Temporal::Beats beats)
 {
 	if (!step_edit_region_view) {
 		return;
@@ -239,14 +239,14 @@ StepEditor::move_step_edit_beat_pos (Evoral::Beats beats)
 		if (-beats < step_edit_beat_pos) {
 			step_edit_beat_pos += beats; // its negative, remember
 		} else {
-			step_edit_beat_pos = Evoral::Beats();
+			step_edit_beat_pos = Temporal::Beats();
 		}
 	}
 	step_edit_region_view->move_step_edit_cursor (step_edit_beat_pos);
 }
 
 int
-StepEditor::step_add_note (uint8_t channel, uint8_t pitch, uint8_t velocity, Evoral::Beats beat_duration)
+StepEditor::step_add_note (uint8_t channel, uint8_t pitch, uint8_t velocity, Temporal::Beats beat_duration)
 {
 	/* do these things in case undo removed the step edit region
 	 */
@@ -289,8 +289,8 @@ StepEditor::step_add_note (uint8_t channel, uint8_t pitch, uint8_t velocity, Evo
 		_editor.reset_x_origin (fpos - (_editor.current_page_samples()/4));
 	}
 
-	Evoral::Beats at = step_edit_beat_pos;
-	Evoral::Beats len = beat_duration;
+	Temporal::Beats at = step_edit_beat_pos;
+	Temporal::Beats len = beat_duration;
 
 	if ((last_added_pitch >= 0) && (pitch == last_added_pitch) && (last_added_end == step_edit_beat_pos)) {
 
@@ -298,8 +298,8 @@ StepEditor::step_add_note (uint8_t channel, uint8_t pitch, uint8_t velocity, Evo
 		   up by 1 tick from where the last note ended
 		*/
 
-		at  += Evoral::Beats::ticks(1);
-		len -= Evoral::Beats::ticks(1);
+		at  += Temporal::Beats::ticks(1);
+		len -= Temporal::Beats::ticks(1);
 	}
 
 	step_edit_region_view->step_add_note (channel, pitch, velocity, at, len);
@@ -319,7 +319,7 @@ StepEditor::step_add_note (uint8_t channel, uint8_t pitch, uint8_t velocity, Evo
 		step_edit_beat_pos += beat_duration;
 		step_edit_region_view->move_step_edit_cursor (step_edit_beat_pos);
 	} else {
-		step_edit_beat_pos += Evoral::Beats::ticks(1); // tiny, but no longer overlapping
+		step_edit_beat_pos += Temporal::Beats::ticks(1); // tiny, but no longer overlapping
 		_step_edit_chord_duration = max (_step_edit_chord_duration, beat_duration);
 	}
 
@@ -329,7 +329,7 @@ StepEditor::step_add_note (uint8_t channel, uint8_t pitch, uint8_t velocity, Evo
 }
 
 void
-StepEditor::set_step_edit_cursor_width (Evoral::Beats beats)
+StepEditor::set_step_edit_cursor_width (Temporal::Beats beats)
 {
 	if (step_edit_region_view) {
 		step_edit_region_view->set_step_edit_cursor_width (beats);
@@ -375,7 +375,7 @@ StepEditor::step_edit_toggle_chord ()
 }
 
 void
-StepEditor::step_edit_rest (Evoral::Beats beats)
+StepEditor::step_edit_rest (Temporal::Beats beats)
 {
 	bool success;
 
@@ -437,7 +437,7 @@ StepEditor::region_removed (boost::weak_ptr<Region> wr)
 		step_edit_region.reset();
 		step_edit_region_view = 0;
 		// force a recompute of the insert position
-		step_edit_beat_pos = Evoral::Beats(-1);
+		step_edit_beat_pos = Temporal::Beats(-1);
 	}
 }