From 43b936c53b4c5eaceb329b05de8c54e2892ec42a Mon Sep 17 00:00:00 2001 From: sletz Date: Tue, 27 May 2008 15:12:00 +0000 Subject: [PATCH] Compilation on Windows git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2362 0c269be4-1314-0410-8aa9-9f06e86f4224 --- common/JackAudioDriver.cpp | 5 +++++ common/JackAudioDriver.h | 2 ++ linux/alsa/JackAlsaDriver.cpp | 2 +- linux/firewire/JackFFADODriver.cpp | 2 +- linux/freebob/JackFreebobDriver.cpp | 2 +- macosx/JackCoreAudioDriver.cpp | 2 +- windows/JackPortAudioDriver.cpp | 2 +- 7 files changed, 12 insertions(+), 5 deletions(-) diff --git a/common/JackAudioDriver.cpp b/common/JackAudioDriver.cpp index 80fa5900..519ff5a7 100644 --- a/common/JackAudioDriver.cpp +++ b/common/JackAudioDriver.cpp @@ -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); } +void JackAudioDriver::CycleIncTime() +{ + fEngineControl->CycleIncTime(fLastWaitUst); +} + } // end of namespace diff --git a/common/JackAudioDriver.h b/common/JackAudioDriver.h index 6ffdf8c3..200b29eb 100644 --- a/common/JackAudioDriver.h +++ b/common/JackAudioDriver.h @@ -50,6 +50,8 @@ class EXPORT JackAudioDriver : public JackDriver jack_default_audio_sample_t* GetOutputBuffer(int port_index); jack_default_audio_sample_t* GetMonitorBuffer(int port_index); + void CycleIncTime(); + private: int ProcessAsync(); diff --git a/linux/alsa/JackAlsaDriver.cpp b/linux/alsa/JackAlsaDriver.cpp index eca1a6d4..841db673 100644 --- a/linux/alsa/JackAlsaDriver.cpp +++ b/linux/alsa/JackAlsaDriver.cpp @@ -2294,7 +2294,7 @@ int JackAlsaDriver::Read() jack_log("JackAlsaDriver::Read nframes = %ld", nframes); // Has to be done before read - fEngineControl->CycleIncTime(fLastWaitUst); + JackAudioDriver::CycleIncTime(); return alsa_driver_read((alsa_driver_t *)fDriver, fEngineControl->fBufferSize); } diff --git a/linux/firewire/JackFFADODriver.cpp b/linux/firewire/JackFFADODriver.cpp index 59228eb7..ee36f59c 100644 --- a/linux/firewire/JackFFADODriver.cpp +++ b/linux/firewire/JackFFADODriver.cpp @@ -747,7 +747,7 @@ int JackFFADODriver::Read() jack_log("JackFFADODriver::Read nframes = %ld", nframes); // Has to be done before read - fEngineControl->CycleIncTime(fLastWaitUst); + JackAudioDriver::CycleIncTime(); printExit(); return ffado_driver_read((ffado_driver_t *)fDriver, fEngineControl->fBufferSize); diff --git a/linux/freebob/JackFreebobDriver.cpp b/linux/freebob/JackFreebobDriver.cpp index 923c1a61..b91642d8 100644 --- a/linux/freebob/JackFreebobDriver.cpp +++ b/linux/freebob/JackFreebobDriver.cpp @@ -879,7 +879,7 @@ int JackFreebobDriver::Read() jack_log("JackFreebobDriver::Read nframes = %ld", nframes); // Has to be done before read - fEngineControl->CycleIncTime(fLastWaitUst); + JackAudioDriver::CycleIncTime(); printExit(); return freebob_driver_read((freebob_driver_t *)fDriver, fEngineControl->fBufferSize); diff --git a/macosx/JackCoreAudioDriver.cpp b/macosx/JackCoreAudioDriver.cpp index 818a5ba4..14cfeaf1 100644 --- a/macosx/JackCoreAudioDriver.cpp +++ b/macosx/JackCoreAudioDriver.cpp @@ -173,7 +173,7 @@ OSStatus JackCoreAudioDriver::Render(void *inRefCon, driver->fActionFags = ioActionFlags; driver->fCurrentTime = (AudioTimeStamp *)inTimeStamp; driver->fDriverOutputData = ioData; - driver->fEngineControl->CycleIncTime(driver->fLastWaitUst); + driver->CycleIncTime(); return driver->Process(); } diff --git a/windows/JackPortAudioDriver.cpp b/windows/JackPortAudioDriver.cpp index 206c5e28..438cfa06 100644 --- a/windows/JackPortAudioDriver.cpp +++ b/windows/JackPortAudioDriver.cpp @@ -223,7 +223,7 @@ int JackPortAudioDriver::Render(const void* inputBuffer, void* outputBuffer, driver->fOutputBuffer = (float**)outputBuffer; // Setup threadded based log function set_threaded_log_function(); - driver->fEngineControl->CycleIncTime(driver->fLastWaitUst); + driver->CycleIncTime(); return (driver->Process() == 0) ? paContinue : paAbort; }