summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gtk2_ardour/midi_time_axis.cc14
-rw-r--r--gtk2_ardour/midi_time_axis.h2
-rw-r--r--gtk2_ardour/route_ui.cc2
3 files changed, 13 insertions, 5 deletions
diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc
index 41c85a193d..23d4adb104 100644
--- a/gtk2_ardour/midi_time_axis.cc
+++ b/gtk2_ardour/midi_time_axis.cc
@@ -247,6 +247,7 @@ MidiTimeAxisView::~MidiTimeAxisView ()
void
MidiTimeAxisView::check_step_edit ()
{
+ ensure_step_editor ();
_step_editor->check_step_edit ();
}
@@ -1054,13 +1055,18 @@ MidiTimeAxisView::add_region (framepos_t pos, framecnt_t length, bool commit)
return boost::dynamic_pointer_cast<MidiRegion>(region);
}
+void
+MidiTimeAxisView::ensure_step_editor ()
+{
+ if (!_step_editor) {
+ _step_editor = new StepEditor (_editor, midi_track(), *this);
+ }
+}
+
void
MidiTimeAxisView::start_step_editing ()
{
- if (!_step_editor) {
- _step_editor = new StepEditor (_editor, midi_track(), *this);
- }
-
+ ensure_step_editor ();
_step_editor->start_step_editing ();
}
diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h
index 28eab2b348..a72ccc5914 100644
--- a/gtk2_ardour/midi_time_axis.h
+++ b/gtk2_ardour/midi_time_axis.h
@@ -158,6 +158,8 @@ class MidiTimeAxisView : public RouteTimeAxisView
void extend_note_selection_region_view (RegionView*, uint8_t note, uint16_t chn_mask);
void toggle_note_selection_region_view (RegionView*, uint8_t note, uint16_t chn_mask);
+ void ensure_step_editor ();
+
/** parameter -> menu item map for the channel command items */
ParameterMenuMap _channel_command_menu_map;
/** parameter -> menu item map for the controller menu */
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index a470da3125..385279ac30 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -587,7 +587,7 @@ RouteUI::build_record_menu ()
using namespace Menu_Helpers;
MenuList& items = record_menu->items();
- items.push_back (CheckMenuElem (_("Step Edit"), sigc::mem_fun (*this, &RouteUI::toggle_step_edit)));
+ items.push_back (CheckMenuElem (_("Step Entry"), sigc::mem_fun (*this, &RouteUI::toggle_step_edit)));
step_edit_item = dynamic_cast<CheckMenuItem*> (&items.back());
if (_route->record_enabled()) {