diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-01-27 01:31:03 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-01-27 01:31:03 +0000 |
| commit | 15b5fce90480490455237da917167b0bcb5ce946 (patch) | |
| tree | 5c1c5929a83c05db1a901e775fefe4f6cf8dc1b7 /gtk2_ardour/automation_controller.cc | |
| parent | 1385643131a2b2231bbbc0c584c76883fcfb580a (diff) | |
merge 3.0-panexp (pan experiments) branch, revisions 8534-8585 into 3.0, thus ending 3.0-panexp. THIS COMMIT WILL BREAK ALL EXISTING 3.0 SESSIONS IN SOME WAY (possibly not fatally).
git-svn-id: svn://localhost/ardour2/branches/3.0@8586 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/automation_controller.cc')
| -rw-r--r-- | gtk2_ardour/automation_controller.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc index 3af5f34445..f09fae905b 100644 --- a/gtk2_ardour/automation_controller.cc +++ b/gtk2_ardour/automation_controller.cc @@ -27,6 +27,7 @@ #include "ardour/event_type_map.h" #include "ardour/automatable.h" #include "ardour/panner.h" +#include "ardour/pan_controllable.h" #include "ardour/session.h" #include "ardour_ui.h" @@ -90,8 +91,6 @@ AutomationController::get_label (int&) // Hack to display CC rounded to int if (_controllable->parameter().type() == MidiCCAutomation) { s << (int)_controllable->get_value(); - } else if (_controllable->parameter().type() == PanAutomation) { - s << Panner::value_as_string (_controllable->get_value ()); } else { s << std::fixed << std::setprecision(3) << _controllable->get_value(); } |