summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour/automation_watch.h
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2012-11-14 15:06:41 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2012-11-14 15:06:41 +0000
commitbb9ab696b1f295f90b9faed0886287a2035ccc3e (patch)
tree8749f19807923a5af68fb4985372eb31e549b852 /libs/ardour/ardour/automation_watch.h
parent4a64b67d931369cbd87ab19d7c51a6e5c9e5b80b (diff)
likely fixes for most remaining issues with data in automation/control lists, but more testing needed
git-svn-id: svn://localhost/ardour2/branches/3.0@13497 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/automation_watch.h')
-rw-r--r--libs/ardour/ardour/automation_watch.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/ardour/automation_watch.h b/libs/ardour/ardour/automation_watch.h
index 6fd5a0eb65..f3e343468d 100644
--- a/libs/ardour/ardour/automation_watch.h
+++ b/libs/ardour/ardour/automation_watch.h
@@ -17,7 +17,7 @@
*/
-#include <list>
+#include <set>
#include <boost/shared_ptr.hpp>
#include <glibmm/threads.h>
#include <sigc++/signal.h>
@@ -41,7 +41,7 @@ class AutomationWatch : public sigc::trackable, public ARDOUR::SessionHandlePtr,
gint timer ();
private:
- typedef std::list<boost::shared_ptr<ARDOUR::AutomationControl> > AutomationWatches;
+ typedef std::set<boost::shared_ptr<ARDOUR::AutomationControl> > AutomationWatches;
AutomationWatch ();
~AutomationWatch();
@@ -50,7 +50,7 @@ class AutomationWatch : public sigc::trackable, public ARDOUR::SessionHandlePtr,
Glib::Threads::Thread* _thread;
bool _run_thread;
AutomationWatches automation_watches;
- Glib::Threads::Mutex automation_watch_lock;
+ Glib::Threads::Mutex automation_watch_lock;
PBD::ScopedConnection transport_connection;
void transport_state_change ();