X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=libs%2Fardour%2Fgraph.cc;h=de2ec802df3283eeeadf403deeb759c08869968d;hb=b68a4e5cdc59ffb81c1952ac9cad63ddf0c76d06;hp=72017d1b36472efb883b85945f34d337257ea726;hpb=d63e8ba0e8eeda4f53684bbd20f027c0cd6f7c89;p=ardour.git

diff --git a/libs/ardour/graph.cc b/libs/ardour/graph.cc
index 72017d1b36..de2ec802df 100644
--- a/libs/ardour/graph.cc
+++ b/libs/ardour/graph.cc
@@ -32,8 +32,6 @@
 #include "ardour/process_thread.h"
 #include "ardour/audioengine.h"
 
-#include <jack/thread.h>
-
 #include "i18n.h"
 
 using namespace ARDOUR;
@@ -55,7 +53,7 @@ int alloc_allowed ()
 
 Graph::Graph (Session & session)
         : SessionHandleRef (session)
-        , _quit_threads (false)
+        , _threads_active (false)
 	, _execution_sem ("graph_execution", 0)
 	, _callback_start_sem ("graph_start", 0)
 	, _callback_done_sem ("graph_done", 0)
@@ -73,9 +71,13 @@ Graph::Graph (Session & session)
         _current_chain = 0;
         _pending_chain = 0;
         _setup_chain   = 1;
-        _quit_threads = false;
         _graph_empty = true;
 
+
+	ARDOUR::AudioEngine::instance()->Running.connect_same_thread (engine_connections, boost::bind (&Graph::reset_thread_list, this));
+	ARDOUR::AudioEngine::instance()->Stopped.connect_same_thread (engine_connections, boost::bind (&Graph::engine_stopped, this));
+	ARDOUR::AudioEngine::instance()->Halted.connect_same_thread (engine_connections, boost::bind (&Graph::engine_stopped, this));
+
         reset_thread_list ();
 
 #ifdef DEBUG_RT_ALLOC
@@ -84,6 +86,14 @@ Graph::Graph (Session & session)
 #endif
 }
 
+void
+Graph::engine_stopped ()
+{
+	if (AudioEngine::instance()->process_thread_count() != 0) {
+		drop_threads ();
+	}
+}
+
 /** Set up threads for running the graph */
 void
 Graph::reset_thread_list ()
@@ -116,6 +126,7 @@ Graph::reset_thread_list ()
 			throw failed_constructor ();
 		}
         }
+        _threads_active = true;
 }
 
 void
@@ -134,7 +145,7 @@ Graph::session_going_away()
 void
 Graph::drop_threads ()
 {
-        _quit_threads = true;
+        _threads_active = false;
 
         uint32_t thread_count = AudioEngine::instance()->process_thread_count ();
 
@@ -147,8 +158,6 @@ Graph::drop_threads ()
 	AudioEngine::instance()->join_process_threads ();
 
 	_execution_tokens = 0;
-
-        _quit_threads = false;
 }
 
 void
@@ -224,7 +233,7 @@ Graph::trigger (GraphNode* n)
 void
 Graph::dec_ref()
 {
-        if (g_atomic_int_dec_and_test (&_finished_refcount)) {
+        if (g_atomic_int_dec_and_test (const_cast<gint*> (&_finished_refcount))) {
 
 		/* We have run all the nodes that are at the `output' end of
 		   the graph, so there is nothing more to do this time around.
@@ -245,7 +254,7 @@ Graph::restart_cycle()
         /* Block until the a process callback triggers us */
         _callback_start_sem.wait();
 
-        if (_quit_threads) {
+        if (!_threads_active) {
                 return;
         }
 
@@ -370,7 +379,7 @@ Graph::run_one()
                 pthread_mutex_unlock (&_trigger_mutex);
                 DEBUG_TRACE (DEBUG::ProcessThreads, string_compose ("%1 goes to sleep\n", pthread_name()));
                 _execution_sem.wait ();
-                if (_quit_threads) {
+                if (!_threads_active) {
                         return true;
                 }
                 DEBUG_TRACE (DEBUG::ProcessThreads, string_compose ("%1 is awake\n", pthread_name()));
@@ -423,13 +432,13 @@ Graph::main_thread()
 	
 	DEBUG_TRACE(DEBUG::ProcessThreads, "main thread is awake\n");
 
-        if (_quit_threads) {
+        if (!_threads_active) {
                 return;
         }
 
 	prep ();
 
-        if (_graph_empty && !_quit_threads) {
+        if (_graph_empty && _threads_active) {
                 _callback_done_sem.signal ();
                 DEBUG_TRACE(DEBUG::ProcessThreads, "main thread sees graph done, goes back to sleep\n");
                 goto again;
@@ -476,6 +485,8 @@ Graph::dump (int chain)
 int
 Graph::silent_process_routes (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, bool& need_butler)
 {
+	if (!_threads_active) return 0;
+
         _process_nframes = nframes;
         _process_start_frame = start_frame;
         _process_end_frame = end_frame;
@@ -501,6 +512,8 @@ Graph::process_routes (pframes_t nframes, framepos_t start_frame, framepos_t end
 {
 	DEBUG_TRACE (DEBUG::ProcessThreads, string_compose ("graph execution from %1 to %2 = %3\n", start_frame, end_frame, nframes));
 
+	if (!_threads_active) return 0;
+
         _process_nframes = nframes;
         _process_start_frame = start_frame;
         _process_end_frame = end_frame;
@@ -528,6 +541,8 @@ Graph::routes_no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end
 {
 	DEBUG_TRACE (DEBUG::ProcessThreads, string_compose ("no-roll graph execution from %1 to %2 = %3\n", start_frame, end_frame, nframes));
 
+	if (!_threads_active) return 0;
+
         _process_nframes = nframes;
         _process_start_frame = start_frame;
         _process_end_frame = end_frame;