diff --git a/ChangeLog b/ChangeLog index 78bc7695..15c2793f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,10 @@ Paul Davis Jackdmp changes log --------------------------- +2009-05-15 Stephane Letz + + * Move InitFrameTime in JackDriver::Start method. + 2009-05-13 Stephane Letz * Reworked Torben Hohn fix for server restart issue on Windows. diff --git a/common/JackDriver.cpp b/common/JackDriver.cpp index 5a2092c8..609952dc 100644 --- a/common/JackDriver.cpp +++ b/common/JackDriver.cpp @@ -315,6 +315,7 @@ int JackDriver::Write() int JackDriver::Start() { + fEngineControl->InitFrameTime(); return 0; } diff --git a/common/JackServer.cpp b/common/JackServer.cpp index 523e1464..081e743b 100644 --- a/common/JackServer.cpp +++ b/common/JackServer.cpp @@ -168,7 +168,6 @@ int JackServer::InternalClientLoadAux(JackLoadableInternalClient* client, const int JackServer::Start() { jack_log("JackServer::Start"); - fEngineControl->InitFrameTime(); return fAudioDriver->Start(); } @@ -201,13 +200,11 @@ int JackServer::SetBufferSize(jack_nframes_t buffer_size) if (fAudioDriver->SetBufferSize(buffer_size) == 0) { fFreewheelDriver->SetBufferSize(buffer_size); fEngine->NotifyBufferSize(buffer_size); - fEngineControl->InitFrameTime(); return fAudioDriver->Start(); } else { // Failure: try to restore current value jack_error("Cannot SetBufferSize for audio driver, restore current value %ld", current_buffer_size); fAudioDriver->SetBufferSize(current_buffer_size); fFreewheelDriver->SetBufferSize(current_buffer_size); - fEngineControl->InitFrameTime(); fAudioDriver->Start(); // SetBufferSize actually failed, so return an error... return -1; @@ -239,7 +236,6 @@ int JackServer::SetFreewheel(bool onoff) fGraphManager->Restore(&fConnectionState); // Restore previous connection state fEngine->NotifyFreewheel(onoff); fFreewheelDriver->SetMaster(false); - fEngineControl->InitFrameTime(); return fAudioDriver->Start(); } } else { @@ -344,7 +340,6 @@ int JackServer::SwitchMaster(jack_driver_desc_t* driver_desc, JSList* driver_par // Activate master fAudioDriver = master; fDriverInfo = info; - fEngineControl->InitFrameTime(); fAudioDriver->Attach(); fAudioDriver->SetMaster(true); return fAudioDriver->Start(); diff --git a/linux/alsa/JackAlsaDriver.cpp b/linux/alsa/JackAlsaDriver.cpp index 7ed400d4..59743dc9 100644 --- a/linux/alsa/JackAlsaDriver.cpp +++ b/linux/alsa/JackAlsaDriver.cpp @@ -2255,6 +2255,7 @@ int JackAlsaDriver::Close() int JackAlsaDriver::Start() { + JackAudioDriver::Start(); return alsa_driver_start((alsa_driver_t *)fDriver); } diff --git a/linux/firewire/JackFFADODriver.cpp b/linux/firewire/JackFFADODriver.cpp index b89a0cf8..65e74caa 100644 --- a/linux/firewire/JackFFADODriver.cpp +++ b/linux/firewire/JackFFADODriver.cpp @@ -709,6 +709,7 @@ int JackFFADODriver::Close() int JackFFADODriver::Start() { + JackAudioDriver::Start(); return ffado_driver_start((ffado_driver_t *)fDriver); } diff --git a/linux/freebob/JackFreebobDriver.cpp b/linux/freebob/JackFreebobDriver.cpp index 04076b92..c5d5770a 100644 --- a/linux/freebob/JackFreebobDriver.cpp +++ b/linux/freebob/JackFreebobDriver.cpp @@ -841,6 +841,7 @@ int JackFreebobDriver::Close() int JackFreebobDriver::Start() { + JackAudioDriver::Start(); return freebob_driver_start((freebob_driver_t *)fDriver); } diff --git a/solaris/oss/JackBoomerDriver.cpp b/solaris/oss/JackBoomerDriver.cpp index 3080dcde..b77e7747 100644 --- a/solaris/oss/JackBoomerDriver.cpp +++ b/solaris/oss/JackBoomerDriver.cpp @@ -533,6 +533,7 @@ void JackBoomerDriver::CloseAux() int JackBoomerDriver::Start() { jack_log("JackBoomerDriver::Start"); + JackAudioDriver::Start(); // Start output thread only when needed if (fOutFD > 0) {