diff --git a/common/JackAudioDriver.cpp b/common/JackAudioDriver.cpp index 2a6f688d..adc28dd4 100644 --- a/common/JackAudioDriver.cpp +++ b/common/JackAudioDriver.cpp @@ -176,12 +176,7 @@ int JackAudioDriver::Write() int JackAudioDriver::Process() { - try { - return (fEngineControl->fSyncMode) ? ProcessSync() : ProcessAsync(); - } catch (JackException e) { - e.PrintMessage(); - return -1; - } + return (fEngineControl->fSyncMode) ? ProcessSync() : ProcessAsync(); } /* diff --git a/common/JackThreadedDriver.cpp b/common/JackThreadedDriver.cpp index d3d31ea5..68373935 100644 --- a/common/JackThreadedDriver.cpp +++ b/common/JackThreadedDriver.cpp @@ -105,15 +105,7 @@ int JackThreadedDriver::Stop() bool JackThreadedDriver::Execute() { - try { - // Keep running even in case of error - Process(); - return true; - } catch (JackException e) { - e.PrintMessage(); - jack_error("Driver is stopped"); - return false; - } + return (Process() == 0); } bool JackThreadedDriver::Init() @@ -129,9 +121,9 @@ bool JackRestartThreadedDriver::Execute() while (fThread->GetStatus() == JackThread::kRunning) { Process(); } - } catch (JackException e) { + } catch (JackDriverException e) { e.PrintMessage(); - jack_log("Driver is restarted..."); + jack_log("Driver is restarted"); Init(); } }