summaryrefslogtreecommitdiff
path: root/libs/evoral
diff options
context:
space:
mode:
Diffstat (limited to 'libs/evoral')
-rw-r--r--libs/evoral/evoral/Control.hpp2
-rw-r--r--libs/evoral/src/ControlSet.cpp5
2 files changed, 4 insertions, 3 deletions
diff --git a/libs/evoral/evoral/Control.hpp b/libs/evoral/evoral/Control.hpp
index bc525a0e72..5c45823184 100644
--- a/libs/evoral/evoral/Control.hpp
+++ b/libs/evoral/evoral/Control.hpp
@@ -40,7 +40,6 @@ public:
virtual void set_double(double val, bool to_list=false, double frame=0);
virtual double get_double(bool from_list=false, double frame=0) const;
-
/** Get the latest user-set value
* (which may not equal get_value() when automation is playing back).
*
@@ -51,7 +50,6 @@ public:
void set_list(boost::shared_ptr<ControlList>);
-
boost::shared_ptr<ControlList> list() { return _list; }
boost::shared_ptr<const ControlList> list() const { return _list; }
diff --git a/libs/evoral/src/ControlSet.cpp b/libs/evoral/src/ControlSet.cpp
index 1dd73c0115..6b793a08ea 100644
--- a/libs/evoral/src/ControlSet.cpp
+++ b/libs/evoral/src/ControlSet.cpp
@@ -54,8 +54,11 @@ void
ControlSet::what_has_data (set<Parameter>& s) const
{
Glib::Mutex::Lock lm (_control_lock);
+
for (Controls::const_iterator li = _controls.begin(); li != _controls.end(); ++li) {
- s.insert(li->first);
+ if (li->second->list() && !li->second->list()->empty()) {
+ s.insert (li->first);
+ }
}
}