X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstep_editor.h;h=3854f3811d0f3d70244372e64a5152ceecaf5f81;hb=e5a181c323243a03338f5a9934a5df254986370d;hp=cecd39f2a32ae73dc11bac7869b0dd41bd10a775;hpb=30b087ab3d28f1585987fa3f6ae006562ae192e3;p=ardour.git

diff --git a/gtk2_ardour/step_editor.h b/gtk2_ardour/step_editor.h
index cecd39f2a3..3854f3811d 100644
--- a/gtk2_ardour/step_editor.h
+++ b/gtk2_ardour/step_editor.h
@@ -25,7 +25,8 @@
 #include <sigc++/trackable.h>
 
 #include "pbd/signals.h"
-#include "evoral/Beats.hpp"
+
+#include "temporal/beats.h"
 
 namespace ARDOUR {
 class MidiTrack;
@@ -44,22 +45,22 @@ public:
 	virtual ~StepEditor ();
 
 	void check_step_edit ();
-	void step_edit_rest (Evoral::Beats beats);
+	void step_edit_rest (Temporal::Beats beats);
 	void step_edit_beat_sync ();
 	void step_edit_bar_sync ();
 	int  step_add_bank_change (uint8_t channel, uint8_t bank);
 	int  step_add_program_change (uint8_t channel, uint8_t program);
 	int  step_add_note (uint8_t channel, uint8_t pitch, uint8_t velocity,
-	                    Evoral::Beats beat_duration);
-	void step_edit_sustain (Evoral::Beats beats);
+	                    Temporal::Beats beat_duration);
+	void step_edit_sustain (Temporal::Beats beats);
 	bool step_edit_within_triplet () const;
 	void step_edit_toggle_triplet ();
 	bool step_edit_within_chord () const;
 	void step_edit_toggle_chord ();
 	void reset_step_edit_beat_pos ();
 	void resync_step_edit_to_edit_point ();
-	void move_step_edit_beat_pos (Evoral::Beats beats);
-	void set_step_edit_cursor_width (Evoral::Beats beats);
+	void move_step_edit_beat_pos (Temporal::Beats beats);
+	void set_step_edit_cursor_width (Temporal::Beats beats);
 
 	std::string name() const;
 
@@ -68,19 +69,19 @@ public:
 
 private:
 	ARDOUR::samplepos_t                    step_edit_insert_position;
-	Evoral::Beats                         step_edit_beat_pos;
+	Temporal::Beats                       step_edit_beat_pos;
 	boost::shared_ptr<ARDOUR::MidiRegion> step_edit_region;
 	MidiRegionView*                       step_edit_region_view;
 	uint8_t                               _step_edit_triplet_countdown;
 	bool                                  _step_edit_within_chord;
-	Evoral::Beats                         _step_edit_chord_duration;
+	Temporal::Beats                       _step_edit_chord_duration;
 	PBD::ScopedConnection                 step_edit_region_connection;
 	PublicEditor&                         _editor;
 	boost::shared_ptr<ARDOUR::MidiTrack>  _track;
 	StepEntry*                            step_editor;
 	MidiTimeAxisView&                     _mtv;
 	int8_t                                last_added_pitch;
-	Evoral::Beats                         last_added_end;
+	Temporal::Beats                       last_added_end;
 
 	void region_removed (boost::weak_ptr<ARDOUR::Region>);
 	void playlist_changed ();