Browse Source

Compilation on Windows

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2362 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/1.90
sletz 17 years ago
parent
commit
43b936c53b
7 changed files with 12 additions and 5 deletions
  1. +5
    -0
      common/JackAudioDriver.cpp
  2. +2
    -0
      common/JackAudioDriver.h
  3. +1
    -1
      linux/alsa/JackAlsaDriver.cpp
  4. +1
    -1
      linux/firewire/JackFFADODriver.cpp
  5. +1
    -1
      linux/freebob/JackFreebobDriver.cpp
  6. +1
    -1
      macosx/JackCoreAudioDriver.cpp
  7. +1
    -1
      windows/JackPortAudioDriver.cpp

+ 5
- 0
common/JackAudioDriver.cpp View File

@@ -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

+ 2
- 0
common/JackAudioDriver.h View File

@@ -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();


+ 1
- 1
linux/alsa/JackAlsaDriver.cpp View File

@@ -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);
}


+ 1
- 1
linux/firewire/JackFFADODriver.cpp View File

@@ -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);


+ 1
- 1
linux/freebob/JackFreebobDriver.cpp View File

@@ -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);


+ 1
- 1
macosx/JackCoreAudioDriver.cpp View File

@@ -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();
}



+ 1
- 1
windows/JackPortAudioDriver.cpp View File

@@ -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;
}



Loading…
Cancel
Save