diff --git a/common/JackThreadedDriver.cpp b/common/JackThreadedDriver.cpp index 1fa80d3c..29fab30f 100644 --- a/common/JackThreadedDriver.cpp +++ b/common/JackThreadedDriver.cpp @@ -232,7 +232,7 @@ bool JackThreadedDriver::Init() jack_log("JackThreadedDriver::Init IsRealTime"); // Will do "something" on OSX only... GetEngineControl()->fPeriod = GetEngineControl()->fConstraint = GetEngineControl()->fPeriodUsecs * 1000; - GetEngineControl()->fComputation = JackMachThread::ComputationMicroSec(GetEngineControl()->fBufferSize) * 1000; + GetEngineControl()->fComputation = ComputationMicroSec(GetEngineControl()->fBufferSize) * 1000; fThread.SetParams(GetEngineControl()->fPeriod, GetEngineControl()->fComputation, GetEngineControl()->fConstraint); if (fThread.AcquireSelfRealTime(GetEngineControl()->fServerPriority) < 0) { jack_error("AcquireSelfRealTime error"); diff --git a/common/JackThreadedDriver.h b/common/JackThreadedDriver.h index 9d4876b1..83d09faf 100644 --- a/common/JackThreadedDriver.h +++ b/common/JackThreadedDriver.h @@ -110,6 +110,18 @@ class SERVER_EXPORT JackThreadedDriver : public JackDriverClientInterface, publi virtual bool Execute(); virtual bool Init(); + // For OSX only + int ComputationMicroSec(int buffer_size) + { + if (buffer_size < 128) { + return 500; + } else if (buffer_size < 256) { + return 300; + } else { + return 100; + } + } + }; } // end of namespace diff --git a/common/JackWaitThreadedDriver.cpp b/common/JackWaitThreadedDriver.cpp index 5c2310c1..76637440 100644 --- a/common/JackWaitThreadedDriver.cpp +++ b/common/JackWaitThreadedDriver.cpp @@ -47,7 +47,7 @@ bool JackWaitThreadedDriver::Execute() jack_log("JackWaitThreadedDriver::Init IsRealTime"); // Will do "something" on OSX only... GetEngineControl()->fPeriod = GetEngineControl()->fConstraint = GetEngineControl()->fPeriodUsecs * 1000; - GetEngineControl()->fComputation = JackMachThread::ComputationMicroSec(GetEngineControl()->fBufferSize) * 1000; + GetEngineControl()->fComputation = ComputationMicroSec(GetEngineControl()->fBufferSize) * 1000; fThread.SetParams(GetEngineControl()->fPeriod, GetEngineControl()->fComputation, GetEngineControl()->fConstraint); if (fThread.AcquireSelfRealTime(GetEngineControl()->fServerPriority) < 0) { jack_error("AcquireSelfRealTime error"); diff --git a/macosx/JackMachThread.h b/macosx/JackMachThread.h index d06c0af8..1aad4cc6 100644 --- a/macosx/JackMachThread.h +++ b/macosx/JackMachThread.h @@ -134,17 +134,6 @@ class SERVER_EXPORT JackMachThread : public JackPosixThread } static int DropRealTimeImp(jack_native_thread_t thread); - static int ComputationMicroSec(int buffer_size) - { - if (buffer_size < 128) { - return 500; - } else if (buffer_size < 256) { - return 300; - } else { - return 100; - } - } - }; } // end of namespace