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/patch_change_dialog.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/patch_change_dialog.cc')
| -rw-r--r-- | gtk2_ardour/patch_change_dialog.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gtk2_ardour/patch_change_dialog.cc b/gtk2_ardour/patch_change_dialog.cc index c8394c2848..2ecfd4bdd7 100644 --- a/gtk2_ardour/patch_change_dialog.cc +++ b/gtk2_ardour/patch_change_dialog.cc @@ -25,6 +25,8 @@ #include "gtkmm2ext/utils.h" +#include "midi++/midnam_patch.h" + #include "ardour/midi_patch_manager.h" #include "ardour/beats_frames_converter.h" #include "ardour/instrument_info.h" @@ -255,8 +257,8 @@ PatchChangeDialog::fill_patch_combo () return; } - const MIDI::Name::PatchBank::PatchNameList& patches = _current_patch_bank->patch_name_list (); - for (MIDI::Name::PatchBank::PatchNameList::const_iterator j = patches.begin(); j != patches.end(); ++j) { + const MIDI::Name::PatchNameList& patches = _current_patch_bank->patch_name_list (); + for (MIDI::Name::PatchNameList::const_iterator j = patches.begin(); j != patches.end(); ++j) { string n = (*j)->name (); boost::replace_all (n, "_", " "); _patch_combo.append_text (n); @@ -278,8 +280,8 @@ PatchChangeDialog::set_active_patch_combo () return; } - const MIDI::Name::PatchBank::PatchNameList& patches = _current_patch_bank->patch_name_list (); - for (MIDI::Name::PatchBank::PatchNameList::const_iterator j = patches.begin(); j != patches.end(); ++j) { + const MIDI::Name::PatchNameList& patches = _current_patch_bank->patch_name_list (); + for (MIDI::Name::PatchNameList::const_iterator j = patches.begin(); j != patches.end(); ++j) { string n = (*j)->name (); boost::replace_all (n, "_", " "); @@ -305,9 +307,9 @@ PatchChangeDialog::patch_combo_changed () return; } - const MIDI::Name::PatchBank::PatchNameList& patches = _current_patch_bank->patch_name_list (); + const MIDI::Name::PatchNameList& patches = _current_patch_bank->patch_name_list (); - for (MIDI::Name::PatchBank::PatchNameList::const_iterator j = patches.begin(); j != patches.end(); ++j) { + for (MIDI::Name::PatchNameList::const_iterator j = patches.begin(); j != patches.end(); ++j) { string n = (*j)->name (); boost::replace_all (n, "_", " "); |