Fix JackAlsaDriver::frame_time()

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2656 0c269be4-1314-0410-8aa9-9f06e86f4224

common/JackNetManager.cpp

@@ -323,7 +323,7 @@ namespace Jack
 
 	int JackNetMaster::SetProcess ( jack_nframes_t nframes, void* arg )
 	{
-		JackNetMaster* master = static_cast<JackNetMaster*> ( arg );	;
+		JackNetMaster* master = static_cast<JackNetMaster*> ( arg );	
 		return master->Process();
 	}
 

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