X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fgraph.h;h=0dc8e164c4e44d664f7353a7a7851e022ac6a269;hb=7a524285385d4581ad3f1e085629379e32f82fda;hp=b433580a54a9dec7aa32709ad56031f8d0206583;hpb=59631acc5f41153a294c97ab820a4b41a886e24c;p=ardour.git

diff --git a/libs/ardour/ardour/graph.h b/libs/ardour/ardour/graph.h
index b433580a54..0dc8e164c4 100644
--- a/libs/ardour/ardour/graph.h
+++ b/libs/ardour/ardour/graph.h
@@ -29,7 +29,6 @@
 #include <boost/shared_ptr.hpp>
 
 #include <glib.h>
-#include <cassert>
 
 #include "pbd/semutils.h"
 
@@ -46,7 +45,7 @@ class Graph;
 
 class Route;
 class Session;
-class GraphEdges;	
+class GraphEdges;
 
 typedef boost::shared_ptr<GraphNode> node_ptr_t;
 
@@ -58,26 +57,18 @@ class LIBARDOUR_API Graph : public SessionHandleRef
 public:
 	Graph (Session & session);
 
-	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);
 
-	int process_routes (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, int declick,
+	int process_routes (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample, int declick,
 	                    bool& need_butler);
 
-	int routes_no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
+	int routes_no_roll (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample,
 	                    bool non_rt_pending, int declick);
 
 	void process_one_route (Route * route);
@@ -90,10 +81,14 @@ protected:
 	virtual void session_going_away ();
 
 private:
-	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];
 
@@ -102,12 +97,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;
@@ -127,16 +121,19 @@ private:
 
 	// parameter caches.
 	pframes_t  _process_nframes;
-	framepos_t _process_start_frame;
-	framepos_t _process_end_frame;
+	samplepos_t _process_start_sample;
+	samplepos_t _process_end_sample;
 	bool	   _process_can_record;
 	bool	   _process_non_rt_pending;
 	int        _process_declick;
 
-	bool _process_silent;
 	bool _process_noroll;
 	int  _process_retval;
 	bool _process_need_butler;
+
+	// enginer / thread connection
+	PBD::ScopedConnectionList engine_connections;
+	void engine_stopped ();
 };
 
 } // namespace