Browse Source

Cleanup in JackPortAudioDriver.

tags/1.9.9.5
Stephane Letz 12 years ago
parent
commit
335da63e26
1 changed files with 4 additions and 7 deletions
  1. +4
    -7
      windows/portaudio/JackPortAudioDriver.cpp

+ 4
- 7
windows/portaudio/JackPortAudioDriver.cpp View File

@@ -250,10 +250,9 @@ error:
int JackPortAudioDriver::Close() int JackPortAudioDriver::Close()
{ {
// Generic audio driver close // Generic audio driver close
int res = JackAudioDriver::Close();
jack_log("JackPortAudioDriver::Close"); jack_log("JackPortAudioDriver::Close");
Pa_CloseStream(fStream);
return res;
int res = JackAudioDriver::Close();
return (Pa_CloseStream(fStream) != paNoError) ? -1 : res;
} }


int JackPortAudioDriver::Attach() int JackPortAudioDriver::Attach()
@@ -293,8 +292,7 @@ int JackPortAudioDriver::Start()
{ {
jack_log("JackPortAudioDriver::Start"); jack_log("JackPortAudioDriver::Start");
if (JackAudioDriver::Start() >= 0) { if (JackAudioDriver::Start() >= 0) {
PaError err = Pa_StartStream(fStream);
if (err == paNoError) {
if (Pa_StartStream(fStream) == paNoError) {
return 0; return 0;
} }
JackAudioDriver::Stop(); JackAudioDriver::Stop();
@@ -305,8 +303,7 @@ int JackPortAudioDriver::Start()
int JackPortAudioDriver::Stop() int JackPortAudioDriver::Stop()
{ {
jack_log("JackPortAudioDriver::Stop"); jack_log("JackPortAudioDriver::Stop");
PaError err = Pa_StopStream(fStream);
int res = (err == paNoError) ? 0 : -1;
int res = (Pa_StopStream(fStream) == paNoError) ? 0 : -1;
if (JackAudioDriver::Stop() < 0) { if (JackAudioDriver::Stop() < 0) {
res = -1; res = -1;
} }


Loading…
Cancel
Save