Extend API to allow calling new_midi_source_path() with source_lock held

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

diff --git a/libs/ardour/ardour/graph.h b/libs/ardour/ardour/graph.h
index b735d6988828d9ae1f76ec804750ed8766c31cc8..9dfc89398d65f300f4af5c24849779ba7acdb0aa 100644 (file)
--- a/libs/ardour/ardour/graph.h
+++ b/libs/ardour/ardour/graph.h
@@ -28,14 +28,13 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <glib/gatomic.h>
-#include <cassert>
-
-#include <pthread.h>
+#include <glib.h>
 
 #include "pbd/semutils.h"
 
+#include "ardour/libardour_visibility.h"
 #include "ardour/types.h"
+#include "ardour/audio_backend.h"
 #include "ardour/session_handle.h"
 
 namespace ARDOUR
@@ -46,32 +45,25 @@ class Graph;
 
 class Route;
 class Session;
-class GraphEdges;      
+class GraphEdges;
 
 typedef boost::shared_ptr<GraphNode> node_ptr_t;
 
 typedef std::list< node_ptr_t > node_list_t;
 typedef std::set< node_ptr_t > node_set_t;
 
-class Graph : public SessionHandleRef
+class LIBARDOUR_API 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 &);
 
        void dump (int chain);
-       void process();
        void dec_ref();
-       void restart_cycle();
 
-       bool run_one();
        void helper_thread();
-       void main_thread();
 
        int silent_process_routes (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
                                   bool& need_butler);
@@ -92,11 +84,14 @@ protected:
        virtual void session_going_away ();
 
 private:
-       std::list<pthread_t> _thread_list;
-       volatile bool        _quit_threads;
+       volatile bool        _threads_active;
 
        void reset_thread_list ();
        void drop_threads ();
+       void restart_cycle();
+       bool run_one();
+       void main_thread();
+       void prep();
 
        node_list_t _nodes_rt[2];
 
@@ -105,12 +100,11 @@ private:
        std::vector<GraphNode *> _trigger_queue;
        pthread_mutex_t          _trigger_mutex;
 
-       PBD::ProcessSemaphore _execution_sem;
+       PBD::Semaphore _execution_sem;
 
        /** Signalled to start a run of the graph for a process callback */
-       PBD::ProcessSemaphore _callback_start_sem;
-       PBD::ProcessSemaphore _callback_done_sem;
-       PBD::ProcessSemaphore _cleanup_sem;
+       PBD::Semaphore _callback_start_sem;
+       PBD::Semaphore _callback_done_sem;
 
        /** The number of processing threads that are asleep */
        volatile gint _execution_tokens;
@@ -122,8 +116,8 @@ private:
        bool _graph_empty;
 
        // chain swapping
-       Glib::Mutex  _swap_mutex;
-       Glib::Cond   _cleanup_cond;
+       Glib::Threads::Mutex  _swap_mutex;
+        Glib::Threads::Cond   _cleanup_cond;
        volatile int _current_chain;
        volatile int _pending_chain;
        volatile int _setup_chain;
@@ -140,6 +134,10 @@ private:
        bool _process_noroll;
        int  _process_retval;
        bool _process_need_butler;
+
+       // enginer / thread connection
+       PBD::ScopedConnectionList engine_connections;
+       void engine_stopped ();
 };
 
 } // namespace