summaryrefslogtreecommitdiff
path: root/gtk2_ardour/midi_time_axis.h
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2010-08-03 04:13:05 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2010-08-03 04:13:05 +0000
commit64f9fac9a8ad94182fca885f09fd53a228561c01 (patch)
tree29595a1be0819726ad7366a3dc184332f3f509f0 /gtk2_ardour/midi_time_axis.h
parente0edca5a2abd65d869348e4bddb9d07ecc156450 (diff)
make step entry chord & triplet buttons do their thing, or something close to it
git-svn-id: svn://localhost/ardour2/branches/3.0@7530 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/midi_time_axis.h')
-rw-r--r--gtk2_ardour/midi_time_axis.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h
index 2c0c8b2d44..fe1835266f 100644
--- a/gtk2_ardour/midi_time_axis.h
+++ b/gtk2_ardour/midi_time_axis.h
@@ -91,8 +91,12 @@ class MidiTimeAxisView : public RouteTimeAxisView
void stop_step_editing ();
void check_step_edit ();
void step_edit_rest ();
- int step_add_note (uint8_t channel, uint8_t pitch, uint8_t velocity,
- Evoral::MusicalTime beat_duration);
+ int step_add_note (uint8_t channel, uint8_t pitch, uint8_t velocity,
+ Evoral::MusicalTime beat_duration);
+ bool step_edit_within_triplet () const;
+ void step_edit_toggle_triplet ();
+ bool step_edit_within_chord () const;
+ void step_edit_toggle_chord ();
const MidiMultipleChannelSelector& channel_selector() { return _channel_selector; }
@@ -138,6 +142,9 @@ class MidiTimeAxisView : public RouteTimeAxisView
Evoral::MusicalTime step_edit_beat_pos;
boost::shared_ptr<ARDOUR::Region> step_edit_region;
MidiRegionView* step_edit_region_view;
+ uint8_t _step_edit_triplet_countdown;
+ bool _step_edit_within_chord;
+ Evoral::MusicalTime _step_edit_chord_duration;
void region_removed (boost::weak_ptr<ARDOUR::Region>);
void playlist_changed ();
PBD::ScopedConnection step_edit_region_connection;