diff options
| author | David Robillard <d@drobilla.net> | 2013-01-20 08:56:00 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2013-01-20 08:56:00 +0000 |
| commit | 4e6d0c9e61b62931a4a2120b548f0ff02a966351 (patch) | |
| tree | 17c395d18338fb92d7af62fa635a8e957d523f93 /gtk2_ardour/canvas_patch_change.cc | |
| parent | 0ebad4279b765d3fbe85649e9ef29e5b61c1d162 (diff) | |
Show matching controller name in automation lane header.
Completely eliminate static MIDI controller name code.
Reduce dependency on midnam_patch.h (which would have saved me several hours if I did it earlier).
Store controller name numbers as an integer.
Keep controller names in a map keyed by int instead of a list for fast lookup.
More cleanup of MIDI::Name code.
git-svn-id: svn://localhost/ardour2/branches/3.0@13927 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/canvas_patch_change.cc')
| -rw-r--r-- | gtk2_ardour/canvas_patch_change.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk2_ardour/canvas_patch_change.cc b/gtk2_ardour/canvas_patch_change.cc index 1958ea2b5e..34658f51a4 100644 --- a/gtk2_ardour/canvas_patch_change.cc +++ b/gtk2_ardour/canvas_patch_change.cc @@ -25,6 +25,7 @@ #include "gtkmm2ext/keyboard.h" #include "ardour/instrument_info.h" +#include "midi++/midnam_patch.h" #include "ardour_ui.h" #include "midi_region_view.h" @@ -92,10 +93,10 @@ CanvasPatchChange::initialize_popup_menus() ++bank) { Gtk::Menu& patch_bank_menu = *manage(new Gtk::Menu()); - const PatchBank::PatchNameList& patches = (*bank)->patch_name_list(); + const PatchNameList& patches = (*bank)->patch_name_list(); Gtk::Menu::MenuList& patch_menus = patch_bank_menu.items(); - for (PatchBank::PatchNameList::const_iterator patch = patches.begin(); + for (PatchNameList::const_iterator patch = patches.begin(); patch != patches.end(); ++patch) { std::string name = (*patch)->name(); @@ -119,10 +120,10 @@ CanvasPatchChange::initialize_popup_menus() } else { /* only one patch bank, so make it the initial menu */ - const PatchBank::PatchNameList& patches = patch_banks.front()->patch_name_list(); + const PatchNameList& patches = patch_banks.front()->patch_name_list(); Gtk::Menu::MenuList& patch_menus = _popup.items(); - for (PatchBank::PatchNameList::const_iterator patch = patches.begin(); + for (PatchNameList::const_iterator patch = patches.begin(); patch != patches.end(); ++patch) { std::string name = (*patch)->name(); |