From dfa39a2a90a4703076ae1fe4a8a112ff161f5fc8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 17 May 2010 12:01:53 +0000 Subject: [PATCH] Number controllers in the MIDI automation menu, as per #3138. Also use 0-index numbers for the parent menu. git-svn-id: svn://localhost/ardour2/branches/3.0@7110 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/midi_time_axis.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index 4843b1875f..a33b50ef64 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -641,9 +641,9 @@ MidiTimeAxisView::build_controller_menu () } /* add the per-channel menu to the list of controllers, with the name of the controller */ - - ctl_items.push_back (MenuElem (midi_name (ctl), *chn_menu)); - + ctl_items.push_back (MenuElem (string_compose ("%1: %2", ctl, midi_name (ctl)), *chn_menu)); + dynamic_cast (ctl_items.back().get_child())->set_use_markup (true); + } else { /* just one channel - create a single menu item for this ctl+channel combination*/ @@ -683,7 +683,7 @@ MidiTimeAxisView::build_controller_menu () /* add the menu for this block of controllers to the overall controller menu */ - items.push_back (MenuElem (string_compose (_("Controllers %1-%2"), i+1, i+16), *ctl_menu)); + items.push_back (MenuElem (string_compose (_("Controllers %1-%2"), i, i+15), *ctl_menu)); } }