diff options
| author | John Emmas <johne53@tiscali.co.uk> | 2013-10-06 11:56:03 +0100 |
|---|---|---|
| committer | John Emmas <johne53@tiscali.co.uk> | 2013-10-06 11:56:03 +0100 |
| commit | 300b484cf6ac14c15e365c4062345d64a61c4b18 (patch) | |
| tree | f10b9abedc141192f5c35f9c0f40e94f1d52786d /libs/ardour/ardour/graph.h | |
| parent | 7d78172abfd9b02bcb6809db3f7545e90dbe968d (diff) | |
| parent | 2d5e605bf124c82f77a5a893e540bc176164947d (diff) | |
Merge branch 'master' into windows+cc
Conflicts (hopefully resolved):
gtk2_ardour/ardour_ui.cc
gtk2_ardour/ardour_ui.h
gtk2_ardour/ardour_ui_options.cc
Diffstat (limited to 'libs/ardour/ardour/graph.h')
| -rw-r--r-- | libs/ardour/ardour/graph.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libs/ardour/ardour/graph.h b/libs/ardour/ardour/graph.h index 08af6fb721..763723c792 100644 --- a/libs/ardour/ardour/graph.h +++ b/libs/ardour/ardour/graph.h @@ -31,8 +31,6 @@ #include <glib.h> #include <cassert> -#include <pthread.h> - #include "pbd/semutils.h" #include "ardour/types.h" @@ -59,8 +57,6 @@ class Graph : public SessionHandleRef public: Graph (Session & session); - uint32_t threads_in_use () const { return _thread_list.size(); } - void prep(); void trigger (GraphNode * n); void rechain (boost::shared_ptr<RouteList>, GraphEdges const &); @@ -93,7 +89,6 @@ protected: virtual void session_going_away (); private: - std::list<AudioBackendNativeThread> _thread_list; volatile bool _quit_threads; void reset_thread_list (); |