From 45eb51b6a704d0ea3410503953cc28a3142524b5 Mon Sep 17 00:00:00 2001 From: sletz Date: Sun, 6 Jul 2008 16:42:14 +0000 Subject: [PATCH] Fix JackAlsaDriver::frame_time() git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2656 0c269be4-1314-0410-8aa9-9f06e86f4224 --- common/JackNetManager.cpp | 2 +- linux/alsa/JackAlsaDriver.cpp | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/common/JackNetManager.cpp b/common/JackNetManager.cpp index 5857df10..71460e05 100644 --- a/common/JackNetManager.cpp +++ b/common/JackNetManager.cpp @@ -323,7 +323,7 @@ namespace Jack int JackNetMaster::SetProcess ( jack_nframes_t nframes, void* arg ) { - JackNetMaster* master = static_cast ( arg ); ; + JackNetMaster* master = static_cast ( arg ); return master->Process(); } diff --git a/linux/alsa/JackAlsaDriver.cpp b/linux/alsa/JackAlsaDriver.cpp index 7e25316d..a89904d3 100644 --- a/linux/alsa/JackAlsaDriver.cpp +++ b/linux/alsa/JackAlsaDriver.cpp @@ -2386,12 +2386,7 @@ jack_nframes_t JackAlsaDriver::frame_time() const { JackTimer timer; fEngineControl->ReadFrameTime(&timer); - if (timer.fInitialized) { - return timer.fFrames + - (long) rint(((double) ((GetMicroSeconds() - timer.fCurrentWakeup)) / - ((jack_time_t)(timer.fNextWakeUp - timer.fCurrentWakeup))) * fEngineControl->fBufferSize); - } else - return 0; + return timer.Time2Frames(fEngineControl->fBufferSize); } jack_nframes_t JackAlsaDriver::last_frame_time() const