git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2362 0c269be4-1314-0410-8aa9-9f06e86f4224tags/1.90
@@ -270,4 +270,9 @@ jack_default_audio_sample_t* JackAudioDriver::GetMonitorBuffer(int port_index) | |||||
return (jack_default_audio_sample_t*)fGraphManager->GetBuffer(fMonitorPortList[port_index], fEngineControl->fBufferSize); | return (jack_default_audio_sample_t*)fGraphManager->GetBuffer(fMonitorPortList[port_index], fEngineControl->fBufferSize); | ||||
} | } | ||||
void JackAudioDriver::CycleIncTime() | |||||
{ | |||||
fEngineControl->CycleIncTime(fLastWaitUst); | |||||
} | |||||
} // end of namespace | } // end of namespace |
@@ -50,6 +50,8 @@ class EXPORT JackAudioDriver : public JackDriver | |||||
jack_default_audio_sample_t* GetOutputBuffer(int port_index); | jack_default_audio_sample_t* GetOutputBuffer(int port_index); | ||||
jack_default_audio_sample_t* GetMonitorBuffer(int port_index); | jack_default_audio_sample_t* GetMonitorBuffer(int port_index); | ||||
void CycleIncTime(); | |||||
private: | private: | ||||
int ProcessAsync(); | int ProcessAsync(); | ||||
@@ -2294,7 +2294,7 @@ int JackAlsaDriver::Read() | |||||
jack_log("JackAlsaDriver::Read nframes = %ld", nframes); | jack_log("JackAlsaDriver::Read nframes = %ld", nframes); | ||||
// Has to be done before read | // Has to be done before read | ||||
fEngineControl->CycleIncTime(fLastWaitUst); | |||||
JackAudioDriver::CycleIncTime(); | |||||
return alsa_driver_read((alsa_driver_t *)fDriver, fEngineControl->fBufferSize); | return alsa_driver_read((alsa_driver_t *)fDriver, fEngineControl->fBufferSize); | ||||
} | } | ||||
@@ -747,7 +747,7 @@ int JackFFADODriver::Read() | |||||
jack_log("JackFFADODriver::Read nframes = %ld", nframes); | jack_log("JackFFADODriver::Read nframes = %ld", nframes); | ||||
// Has to be done before read | // Has to be done before read | ||||
fEngineControl->CycleIncTime(fLastWaitUst); | |||||
JackAudioDriver::CycleIncTime(); | |||||
printExit(); | printExit(); | ||||
return ffado_driver_read((ffado_driver_t *)fDriver, fEngineControl->fBufferSize); | return ffado_driver_read((ffado_driver_t *)fDriver, fEngineControl->fBufferSize); | ||||
@@ -879,7 +879,7 @@ int JackFreebobDriver::Read() | |||||
jack_log("JackFreebobDriver::Read nframes = %ld", nframes); | jack_log("JackFreebobDriver::Read nframes = %ld", nframes); | ||||
// Has to be done before read | // Has to be done before read | ||||
fEngineControl->CycleIncTime(fLastWaitUst); | |||||
JackAudioDriver::CycleIncTime(); | |||||
printExit(); | printExit(); | ||||
return freebob_driver_read((freebob_driver_t *)fDriver, fEngineControl->fBufferSize); | return freebob_driver_read((freebob_driver_t *)fDriver, fEngineControl->fBufferSize); | ||||
@@ -173,7 +173,7 @@ OSStatus JackCoreAudioDriver::Render(void *inRefCon, | |||||
driver->fActionFags = ioActionFlags; | driver->fActionFags = ioActionFlags; | ||||
driver->fCurrentTime = (AudioTimeStamp *)inTimeStamp; | driver->fCurrentTime = (AudioTimeStamp *)inTimeStamp; | ||||
driver->fDriverOutputData = ioData; | driver->fDriverOutputData = ioData; | ||||
driver->fEngineControl->CycleIncTime(driver->fLastWaitUst); | |||||
driver->CycleIncTime(); | |||||
return driver->Process(); | return driver->Process(); | ||||
} | } | ||||
@@ -223,7 +223,7 @@ int JackPortAudioDriver::Render(const void* inputBuffer, void* outputBuffer, | |||||
driver->fOutputBuffer = (float**)outputBuffer; | driver->fOutputBuffer = (float**)outputBuffer; | ||||
// Setup threadded based log function | // Setup threadded based log function | ||||
set_threaded_log_function(); | set_threaded_log_function(); | ||||
driver->fEngineControl->CycleIncTime(driver->fLastWaitUst); | |||||
driver->CycleIncTime(); | |||||
return (driver->Process() == 0) ? paContinue : paAbort; | return (driver->Process() == 0) ? paContinue : paAbort; | ||||
} | } | ||||