Browse Source

Simplify drivers exceptions

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2220 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.90
sletz 17 years ago
parent
commit
6394b96e6f
2 changed files with 4 additions and 17 deletions
  1. +1
    -6
      common/JackAudioDriver.cpp
  2. +3
    -11
      common/JackThreadedDriver.cpp

+ 1
- 6
common/JackAudioDriver.cpp View File

@@ -176,12 +176,7 @@ int JackAudioDriver::Write()


int JackAudioDriver::Process() int JackAudioDriver::Process()
{ {
try {
return (fEngineControl->fSyncMode) ? ProcessSync() : ProcessAsync();
} catch (JackException e) {
e.PrintMessage();
return -1;
}
return (fEngineControl->fSyncMode) ? ProcessSync() : ProcessAsync();
} }


/* /*


+ 3
- 11
common/JackThreadedDriver.cpp View File

@@ -105,15 +105,7 @@ int JackThreadedDriver::Stop()


bool JackThreadedDriver::Execute() 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() bool JackThreadedDriver::Init()
@@ -129,9 +121,9 @@ bool JackRestartThreadedDriver::Execute()
while (fThread->GetStatus() == JackThread::kRunning) { while (fThread->GetStatus() == JackThread::kRunning) {
Process(); Process();
} }
} catch (JackException e) {
} catch (JackDriverException e) {
e.PrintMessage(); e.PrintMessage();
jack_log("Driver is restarted...");
jack_log("Driver is restarted");
Init(); Init();
} }
} }


Loading…
Cancel
Save