From 6e054114b9b88f1418f45f1cce00af88849646ee Mon Sep 17 00:00:00 2001 From: sletz Date: Thu, 17 Mar 2011 14:43:44 +0000 Subject: [PATCH] Typo. git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4215 0c269be4-1314-0410-8aa9-9f06e86f4224 --- common/JackServer.cpp | 2 +- linux/firewire/JackFFADODriver.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/JackServer.cpp b/common/JackServer.cpp index 1ce15e59..90baca3f 100644 --- a/common/JackServer.cpp +++ b/common/JackServer.cpp @@ -322,7 +322,7 @@ int JackServer::SwitchMaster(jack_driver_desc_t* driver_desc, JSList* driver_par JackDriverInfo* info = new JackDriverInfo(); JackDriverClientInterface* master = info->Open(driver_desc, fEngine, GetSynchroTable(), driver_params); - if (master == NULL || info == NULL) { + if (master == NULL) { delete info; return -1; } else { diff --git a/linux/firewire/JackFFADODriver.cpp b/linux/firewire/JackFFADODriver.cpp index 0966b1da..55bf70ce 100644 --- a/linux/firewire/JackFFADODriver.cpp +++ b/linux/firewire/JackFFADODriver.cpp @@ -526,7 +526,7 @@ int JackFFADODriver::Attach() port = fGraphManager->GetPort(port_index); // Add one buffer more latency if "async" mode is used... - range.min = range.max = (driver->period_size * (driver->device_options.nb_buffers - 1)) + ((fEngineControl->fSyncMode) ? 0 : fEngineControl->fBufferSize) + driver->playback_frame_latency + range.min = range.max = (driver->period_size * (driver->device_options.nb_buffers - 1)) + ((fEngineControl->fSyncMode) ? 0 : fEngineControl->fBufferSize) + driver->playback_frame_latency; port->SetLatencyRange(JackPlaybackLatency, &range); // playback port aliases (jackd1 style port names) snprintf(buf, sizeof(buf) - 1, "%s:playback_%i", fClientControl.fName, (int) chn + 1);