diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-06-11 15:35:34 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-06-11 15:35:34 +0000 |
| commit | 106024330230fca331e2f611fec42ec1f4f43e5a (patch) | |
| tree | 56342e0e544be5223d2fa360caaec80ac0fe6fa4 /libs/evoral | |
| parent | 7468fdb9ca9892cec9b298690bf0edf3655d6453 (diff) | |
major, substantive reworking of how we store GUI information (visibility, height) for automation data. old design stored (insufficient) identifying information plus actual data in a GUI-only XML node; new scheme adds GUI data via extra_xml node to each AutomationControl object. reworked public/private methods for showing/hiding TimeAxisView objects; changed labelling of automation tracks to just show the name of the controlled parameter - more info can be viewed in the tooltip for the track headers. NOTE: Session file format ALTERED. No data loss but track visibility may be different than previous ardour3 versions
git-svn-id: svn://localhost/ardour2/branches/3.0@9703 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/evoral')
| -rw-r--r-- | libs/evoral/evoral/Control.hpp | 2 | ||||
| -rw-r--r-- | libs/evoral/src/ControlSet.cpp | 5 |
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); + } } } |