ardour/livetrax
13
0
Fork 0
Code

synchronous shutdown of process graph.

Browse Source
This commit is contained in:
Robin Gareus 2015-08-28 15:39:06 +02:00
parent 9458fce148
commit 3a3d5c41be
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/audioengine.cc
View File

@ -776,6 +776,8 @@ AudioEngine::drop_backend ()
{ {
if (_backend) { if (_backend) {
_backend->stop (); _backend->stop ();
// Stopped is needed for Graph to explicitly terminate threads
Stopped (); /* EMIT SIGNAL */
_backend->drop_device (); _backend->drop_device ();
_backend.reset (); _backend.reset ();
_running = false; _running = false;

12
libs/ardour/graph.cc
View File

@ -117,6 +117,8 @@ Graph::reset_thread_list ()
drop_threads (); drop_threads ();
} }
_threads_active = true;
if (AudioEngine::instance()->create_process_thread (boost::bind (&Graph::main_thread, this)) != 0) { if (AudioEngine::instance()->create_process_thread (boost::bind (&Graph::main_thread, this)) != 0) {
throw failed_constructor (); throw failed_constructor ();
} }
@ -126,7 +128,6 @@ Graph::reset_thread_list ()
throw failed_constructor (); throw failed_constructor ();
} }
} }
_threads_active = true;
} }
void void
@ -145,15 +146,20 @@ Graph::session_going_away()
void void
Graph::drop_threads () Graph::drop_threads ()
{ {
Glib::Threads::Mutex::Lock ls (_swap_mutex);
_threads_active = false; _threads_active = false;
uint32_t thread_count = AudioEngine::instance()->process_thread_count (); uint32_t thread_count = AudioEngine::instance()->process_thread_count ();
for (unsigned int i=0; i < thread_count; i++) { for (unsigned int i=0; i < thread_count; i++) {
pthread_mutex_lock (&_trigger_mutex);
_execution_sem.signal (); _execution_sem.signal ();
pthread_mutex_unlock (&_trigger_mutex);
} }
pthread_mutex_lock (&_trigger_mutex);
_callback_start_sem.signal (); _callback_start_sem.signal ();
pthread_mutex_unlock (&_trigger_mutex);
AudioEngine::instance()->join_process_threads (); AudioEngine::instance()->join_process_threads ();
@ -260,7 +266,7 @@ Graph::restart_cycle()
prep (); prep ();
if (_graph_empty) { if (_graph_empty && _threads_active) {
goto again; goto again;
} }
@ -396,7 +402,7 @@ Graph::run_one()
DEBUG_TRACE(DEBUG::ProcessThreads, string_compose ("%1 has finished run_one()\n", pthread_name())); DEBUG_TRACE(DEBUG::ProcessThreads, string_compose ("%1 has finished run_one()\n", pthread_name()));
return false; return !_threads_active;
} }
void void