Browse Source

Move InitFrameTime in JackDriver::Start method.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3538 0c269be4-1314-0410-8aa9-9f06e86f4224
tags/v1.9.3
sletz 16 years ago
parent
commit
d38a6c9c1d
7 changed files with 9 additions and 5 deletions
  1. +4
    -0
      ChangeLog
  2. +1
    -0
      common/JackDriver.cpp
  3. +0
    -5
      common/JackServer.cpp
  4. +1
    -0
      linux/alsa/JackAlsaDriver.cpp
  5. +1
    -0
      linux/firewire/JackFFADODriver.cpp
  6. +1
    -0
      linux/freebob/JackFreebobDriver.cpp
  7. +1
    -0
      solaris/oss/JackBoomerDriver.cpp

+ 4
- 0
ChangeLog View File

@@ -25,6 +25,10 @@ Paul Davis
Jackdmp changes log
---------------------------

2009-05-15 Stephane Letz <letz@grame.fr>
* Move InitFrameTime in JackDriver::Start method.

2009-05-13 Stephane Letz <letz@grame.fr>
* Reworked Torben Hohn fix for server restart issue on Windows.


+ 1
- 0
common/JackDriver.cpp View File

@@ -315,6 +315,7 @@ int JackDriver::Write()

int JackDriver::Start()
{
fEngineControl->InitFrameTime();
return 0;
}



+ 0
- 5
common/JackServer.cpp View File

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


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

@@ -2255,6 +2255,7 @@ int JackAlsaDriver::Close()

int JackAlsaDriver::Start()
{
JackAudioDriver::Start();
return alsa_driver_start((alsa_driver_t *)fDriver);
}



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

@@ -709,6 +709,7 @@ int JackFFADODriver::Close()

int JackFFADODriver::Start()
{
JackAudioDriver::Start();
return ffado_driver_start((ffado_driver_t *)fDriver);
}



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

@@ -841,6 +841,7 @@ int JackFreebobDriver::Close()

int JackFreebobDriver::Start()
{
JackAudioDriver::Start();
return freebob_driver_start((freebob_driver_t *)fDriver);
}



+ 1
- 0
solaris/oss/JackBoomerDriver.cpp View File

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


Loading…
Cancel
Save