diff --git a/common/JackAudioDriver.cpp b/common/JackAudioDriver.cpp index 82d8235c..5c897afb 100644 --- a/common/JackAudioDriver.cpp +++ b/common/JackAudioDriver.cpp @@ -187,6 +187,9 @@ int JackAudioDriver::ProcessNull() { JackDriver::CycleTakeTime(); + int wait_time = (int((float(fEngineControl->fBufferSize) / (float(fEngineControl->fSampleRate))) * 1000000.0f)); + usleep(wait_time); + if (!fEngine->Process(fLastWaitUst)) // fLastWaitUst is set in the "low level" layer jack_error("JackAudioDriver::ProcessNull Process error"); fGraphManager->ResumeRefNum(fClientControl, fSynchroTable); diff --git a/common/JackNetDriver.cpp b/common/JackNetDriver.cpp index 6a68b9c1..78ea749b 100644 --- a/common/JackNetDriver.cpp +++ b/common/JackNetDriver.cpp @@ -87,15 +87,7 @@ namespace Jack return 0; } - int JackNetDriver::ProcessNull() - { - JackDriver::CycleTakeTime(); - int wait_time = (int((float(fEngineControl->fBufferSize) / (float(fEngineControl->fSampleRate))) * 1000000.0f)); - usleep(wait_time); - return JackAudioDriver::ProcessNull(); - } - - bool JackNetDriver::Init() + bool JackNetDriver::Init() { jack_log ( "JackNetDriver::Init()" ); if ( fSockfd ) diff --git a/common/JackNetDriver.h b/common/JackNetDriver.h index 3259334e..b050a2c6 100644 --- a/common/JackNetDriver.h +++ b/common/JackNetDriver.h @@ -78,8 +78,6 @@ namespace Jack int Open ( jack_nframes_t frames_per_cycle, jack_nframes_t rate, bool capturing, bool playing, int inchannels, int outchannels, bool monitor, const char* capture_driver_name, const char* playback_driver_name, jack_nframes_t capture_latency, jack_nframes_t playback_latency ); - - int ProcessNull(); int Attach(); int Detach();