Display recorded controller data (fix show all/existing automation).

git-svn-id: svn://localhost/ardour2/branches/3.0@3779 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 4 insertions, 11 deletions

diff --git a/libs/evoral/src/Control.cpp b/libs/evoral/src/Control.cpp
index d23f6c3c9a..75b038f1d4 100644
--- a/libs/evoral/src/Control.cpp
+++ b/libs/evoral/src/Control.cpp
@@ -24,9 +24,10 @@ namespace Evoral {
 
 Parameter::TypeMetadata Parameter::_type_metadata;
 
-Control::Control(boost::shared_ptr<ControlList> list)
-	: _list(list)
-	, _user_value(list->default_value())
+Control::Control(const Parameter& parameter, boost::shared_ptr<ControlList> list)
+	: _parameter(parameter)
+	, _list(list)
+	, _user_value(list ? list->default_value() : parameter.normal())
 {
 }
 
@@ -70,14 +71,6 @@ void
 Control::set_list(boost::shared_ptr<ControlList> list)
 {
 	_list = list;
-	_user_value = list->default_value();
-}
-
-	
-const Parameter&
-Control::parameter() const
-{
-	return _list->parameter();
 }
 
 } // namespace Evoral