diff --git a/common/JackAudioAdapterInterface.cpp b/common/JackAudioAdapterInterface.cpp index 59e24ba9..bedf5ecb 100644 --- a/common/JackAudioAdapterInterface.cpp +++ b/common/JackAudioAdapterInterface.cpp @@ -186,7 +186,7 @@ namespace Jack fPlaybackRingBuffer = new JackResampler*[fPlaybackChannels]; if (fAdaptative) { - jack_info("Ringbuffer automatic adaptative mode"); + jack_info("Ringbuffer automatic adaptative mode size = %d frames", fRingbufferCurSize); } else { fRingbufferCurSize = DEFAULT_RB_SIZE; jack_info("Fixed ringbuffer size = %d frames", fRingbufferCurSize); diff --git a/common/JackAudioAdapterInterface.h b/common/JackAudioAdapterInterface.h index 34d627d5..ce24a8ca 100644 --- a/common/JackAudioAdapterInterface.h +++ b/common/JackAudioAdapterInterface.h @@ -144,20 +144,16 @@ namespace Jack virtual int SetHostBufferSize ( jack_nframes_t buffer_size ) { fHostBufferSize = buffer_size; - if (fAdaptative) { + if (fAdaptative) AdaptRingBufferSize(); - ResetRingBuffers(); - } return 0; } virtual int SetAdaptedBufferSize ( jack_nframes_t buffer_size ) { fAdaptedBufferSize = buffer_size; - if (fAdaptative) { + if (fAdaptative) AdaptRingBufferSize(); - ResetRingBuffers(); - } return 0; } diff --git a/linux/alsa/JackAlsaAdapter.cpp b/linux/alsa/JackAlsaAdapter.cpp index b038fa19..57c24d4e 100644 --- a/linux/alsa/JackAlsaAdapter.cpp +++ b/linux/alsa/JackAlsaAdapter.cpp @@ -104,7 +104,6 @@ namespace Jack //turn the thread realtime fThread.AcquireRealTime ( JackServerGlobals::fInstance->GetEngineControl()->fClientPriority ); - return 0; } diff --git a/solaris/oss/JackOSSAdapter.cpp b/solaris/oss/JackOSSAdapter.cpp index 24b4c5d5..04dcbb1b 100644 --- a/solaris/oss/JackOSSAdapter.cpp +++ b/solaris/oss/JackOSSAdapter.cpp @@ -494,9 +494,16 @@ int JackOSSAdapter::Open() } DisplayDeviceInfo(); - + + //start adapter thread + if (fThread.StartSync() < 0) { + jack_error ( "Cannot start audioadapter thread" ); + return -1; + } + + //turn the thread realtime fThread.AcquireRealTime(JackServerGlobals::fInstance->GetEngineControl()->fClientPriority); - return fThread.StartSync(); + return 0; error: CloseAux();