diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-08-03 21:50:15 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-08-03 21:50:15 +0000 |
| commit | 6b641cdde4fa01baa1bf03e69131bd2b1a81b67b (patch) | |
| tree | a6b0a15f5bcc27724c6729b1eeed868ecf0c7b06 /gtk2_ardour/midi_time_axis.cc | |
| parent | b1f5a6a68d0b62a61684b2c011a97de825256a59 (diff) | |
properly track step edit status in editor & mixer windows
git-svn-id: svn://localhost/ardour2/branches/3.0@7533 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/midi_time_axis.cc')
| -rw-r--r-- | gtk2_ardour/midi_time_axis.cc | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index 098b96b5b2..bc36d6fbe8 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -892,20 +892,6 @@ MidiTimeAxisView::route_active_changed () } void -MidiTimeAxisView::toggle_step_edit () -{ - if (_route->record_enabled()) { - return; - } - - if (midi_track()->step_editing ()) { - stop_step_editing (); - } else { - start_step_editing (); - } -} - -void MidiTimeAxisView::start_step_editing () { step_edit_insert_position = _editor.get_preferred_edit_position (); @@ -923,7 +909,6 @@ MidiTimeAxisView::start_step_editing () step_edit_region_view = 0; } - midi_track()->set_step_editing (true); if (step_editor == 0) { step_editor = new StepEntry (*this); @@ -937,15 +922,14 @@ MidiTimeAxisView::start_step_editing () bool MidiTimeAxisView::step_editor_hidden (GdkEventAny*) { - stop_step_editing (); + /* everything else will follow the change in the model */ + midi_track()->set_step_editing (false); return true; } void MidiTimeAxisView::stop_step_editing () { - midi_track()->set_step_editing (false); - if (step_editor) { step_editor->hide (); } |