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 /libs/ardour/automatable.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 'libs/ardour/automatable.cc')
| -rw-r--r-- | libs/ardour/automatable.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc index 1689528123..84f8cd56cc 100644 --- a/libs/ardour/automatable.cc +++ b/libs/ardour/automatable.cc @@ -25,8 +25,6 @@ #include "pbd/error.h" -#include "midi++/names.h" - #include "ardour/amp.h" #include "ardour/automatable.h" #include "ardour/event_type_map.h" @@ -159,8 +157,7 @@ Automatable::describe_parameter (Evoral::Parameter param) if (param == Evoral::Parameter(GainAutomation)) { return _("Fader"); } else if (param.type() == MidiCCAutomation) { - return string_compose("%1: %2 [%3]", - param.id(), midi_name(param.id()), int(param.channel()) + 1); + return string_compose("Controller %1 [%2]", param.id(), int(param.channel()) + 1); } else if (param.type() == MidiPgmChangeAutomation) { return string_compose("Program [%1]", int(param.channel()) + 1); } else if (param.type() == MidiPitchBenderAutomation) { |