ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

AudioEngine tweaks from Tracks, related to stopping audioengine and halting

Browse Source
This commit is contained in:
Paul Davis 2015-05-13 11:01:37 -04:00
parent 289078f7f8
commit 2911bb9fb8
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/ardour/audioengine.cc
View File

@ -770,7 +770,7 @@ void
AudioEngine::drop_backend () AudioEngine::drop_backend ()
{ {
if (_backend) { if (_backend) {
stop(false); _backend->stop ();
_backend->drop_device (); _backend->drop_device ();
_backend.reset (); _backend.reset ();
_running = false; _running = false;
@ -858,18 +858,20 @@ AudioEngine::stop (bool for_latency)
return 0; return 0;
} }
if (_session && _running) {
// it's not a halt, but should be handled the same way:
// disable record, stop transport and I/O processign but save the data.
_session->engine_halted ();
}
Glib::Threads::Mutex::Lock lm (_process_lock); Glib::Threads::Mutex::Lock lm (_process_lock);
if (_backend->stop ()) { if (_backend->stop ()) {
return -1; return -1;
} }
if (_session && _running &&
(_session->state_of_the_state() & Session::Loading) == 0 &&
(_session->state_of_the_state() & Session::Deletion) == 0) {
// it's not a halt, but should be handled the same way:
// disable record, stop transport and I/O processign but save the data.
_session->engine_halted ();
}
_running = false; _running = false;
_processed_frames = 0; _processed_frames = 0;
_measuring_latency = MeasureNone; _measuring_latency = MeasureNone;