ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Remove dependence on the order of calls of listeners to MidiTrack::StepEditStatusChange, and rename the step entry menu item to make it consistent with the dialogue title. Should fix #3765. 

git-svn-id: svn://localhost/ardour2/branches/3.0@8831 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-02-12 12:29:20 +00:00
parent e8e0da71a0
commit 27cbe72d96
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk2_ardour/midi_time_axis.cc
View File

@ -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 ();
}

2
gtk2_ardour/midi_time_axis.h
View File

@ -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 */

2
gtk2_ardour/route_ui.cc
View File

@ -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()) {