diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-24 12:03:54 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-24 12:03:54 -0400 |
| commit | 7db12f6b128eef0d63dd6a8eda3d04f4dab1fc79 (patch) | |
| tree | 388aecd96220df899626709aeb8c7dbc37fd9088 /gtk2_ardour/step_editor.h | |
| parent | 9283bee867ce788465f3e48ed889cd324e098e64 (diff) | |
convert codebase to use Temporal for various time types
Diffstat (limited to 'gtk2_ardour/step_editor.h')
| -rw-r--r-- | gtk2_ardour/step_editor.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gtk2_ardour/step_editor.h b/gtk2_ardour/step_editor.h index cecd39f2a3..99a6112b5a 100644 --- a/gtk2_ardour/step_editor.h +++ b/gtk2_ardour/step_editor.h @@ -25,7 +25,7 @@ #include <sigc++/trackable.h> #include "pbd/signals.h" -#include "evoral/Beats.hpp" +#include "temporal/beats.h" namespace ARDOUR { class MidiTrack; @@ -44,22 +44,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 +68,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 (); |