summaryrefslogtreecommitdiff
path: root/libs/ardour/audioengine.cc
diff options
context:
space:
mode:
authorGreg Zharun <grygoriiz@wavesglobal.com>2015-02-28 18:38:45 +0200
committerPaul Davis <paul@linuxaudiosystems.com>2015-03-31 17:29:41 -0400
commita2f82f8c5d46beead18d22a60c67c67e848d9561 (patch)
tree6c562159bcb62a5f8ad4c65d5c1099ee9034707d /libs/ardour/audioengine.cc
parentce069da6827717d1428637fb2e9d4e9cbd40b30b (diff)
[Summary] Added actions to handle abnormal behavior during stream stop for MIDI and Audio devices.
Made correct error handling for cases we didn't see before. Removed redundant and experimental code I forgot to remove months ago. Added debug output which will help in future testing Conflicts: libs/ardour/ardour/audioengine.h libs/ardour/engine_state_controller.cc libs/backends/wavesaudio/waves_midi_device.cc
Diffstat (limited to 'libs/ardour/audioengine.cc')
-rw-r--r--libs/ardour/audioengine.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index 160a2b36df..6d854a80a5 100644
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -394,6 +394,11 @@ AudioEngine::request_backend_reset()
_hw_reset_condition.signal ();
}
+int
+AudioEngine::backend_reset_requested()
+{
+ return g_atomic_int_get (&_hw_reset_request_count);
+}
void
AudioEngine::do_reset_backend()
@@ -409,7 +414,6 @@ AudioEngine::do_reset_backend()
_reset_request_lock.unlock();
Glib::Threads::RecMutex::Lock pl (_state_lock);
-
g_atomic_int_dec_and_test (&_hw_reset_request_count);
std::cout << "AudioEngine::RESET::Reset request processing" << std::endl;