summaryrefslogtreecommitdiff
path: root/libs/evoral/src/Control.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'libs/evoral/src/Control.cpp')
-rw-r--r--libs/evoral/src/Control.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/libs/evoral/src/Control.cpp b/libs/evoral/src/Control.cpp
index 480d027ccc..b7537c57ed 100644
--- a/libs/evoral/src/Control.cpp
+++ b/libs/evoral/src/Control.cpp
@@ -22,14 +22,16 @@
#include "evoral/Control.hpp"
#include "evoral/ControlList.hpp"
+#include "evoral/ParameterDescriptor.hpp"
+#include "evoral/TypeMap.hpp"
namespace Evoral {
-Parameter::TypeMetadata Parameter::_type_metadata;
-
-Control::Control(const Parameter& parameter, boost::shared_ptr<ControlList> list)
+Control::Control(const Parameter& parameter,
+ const ParameterDescriptor& desc,
+ boost::shared_ptr<ControlList> list)
: _parameter(parameter)
- , _user_value(list ? list->default_value() : parameter.normal())
+ , _user_value(list ? list->default_value() : desc.normal)
{
set_list (list);
}