position+width panning improvements (reverse width now works); relabel pan automation...

[ardour.git] / libs / ardour / ardour / graph.h

diff --git a/libs/ardour/ardour/graph.h b/libs/ardour/ardour/graph.h
index 6226ed56020dbecd25146432cf9bec01a0f5e9dc..bb51c992372ccda528396e7b1cf45678749a3fce 100644 (file)
--- a/libs/ardour/ardour/graph.h
+++ b/libs/ardour/ardour/graph.h
@@ -32,10 +32,11 @@
 #include <cassert>
 
 #include <pthread.h>
-#include <semaphore.h>
 
-#include <ardour/types.h>
-#include <ardour/session_handle.h>
+#include "pbd/semutils.h"
+
+#include "ardour/types.h"
+#include "ardour/session_handle.h"
 
 namespace ARDOUR
 {
@@ -81,11 +82,13 @@ class Graph : public SessionHandleRef
 
        void process_one_route (Route * route);
 
+        void clear_other_chain ();
+
     protected:
         virtual void session_going_away ();
 
     private:
-        std::list<Glib::Thread *> _thread_list;
+        std::list<pthread_t> _thread_list;
         volatile bool _quit_threads;
         
        node_list_t _nodes_rt[2];
@@ -95,11 +98,11 @@ class Graph : public SessionHandleRef
        std::vector<GraphNode *> _trigger_queue;
        pthread_mutex_t _trigger_mutex;
 
+       PBD::ProcessSemaphore _execution_sem;
 
-       sem_t _execution_sem;
-
-       sem_t _callback_start_sem;
-       sem_t _callback_done_sem;
+       PBD::ProcessSemaphore _callback_start_sem;
+       PBD::ProcessSemaphore _callback_done_sem;
+       PBD::ProcessSemaphore _cleanup_sem;
 
        volatile gint _execution_tokens;
        volatile gint _finished_refcount;
@@ -108,7 +111,8 @@ class Graph : public SessionHandleRef
         bool _graph_empty;
 
        // chain swapping
-       pthread_mutex_t _swap_mutex;
+        Glib::Mutex  _swap_mutex;
+        Glib::Cond   _cleanup_cond;
        volatile int _current_chain;
        volatile int _pending_chain;
        volatile int _setup_chain;