Cleanup

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

common/JackAPI.cpp

@@ -851,7 +851,6 @@ EXPORT int jack_engine_takeover_timebase(jack_client_t* ext_client)
 EXPORT jack_nframes_t jack_frames_since_cycle_start(const jack_client_t* ext_client)
 {
     JackTimer timer;
-    //GetEngineControl()->fFrameTimer.ReadFrameTime(&timer);
 	GetEngineControl()->ReadFrameTime(&timer);
     return (jack_nframes_t) floor((((float)GetEngineControl()->fSampleRate) / 1000000.0f) * (GetMicroSeconds() - timer.fCurrentCallback));
 }
@@ -864,8 +863,7 @@ EXPORT jack_nframes_t jack_frame_time(const jack_client_t* ext_client)
         return 0;
     } else {
         JackTimer timer;
-        //GetEngineControl()->fFrameTimer.ReadFrameTime(&timer);
-		GetEngineControl()->ReadFrameTime(&timer);
+  		GetEngineControl()->ReadFrameTime(&timer);
         if (timer.fInitialized) {
             return timer.fFrames +
                    (long) rint(((double) ((jack_time_t)(GetMicroSeconds() - timer.fCurrentWakeup)) /
@@ -879,7 +877,6 @@ EXPORT jack_nframes_t jack_frame_time(const jack_client_t* ext_client)
 EXPORT jack_nframes_t jack_last_frame_time(const jack_client_t* ext_client)
 {
     JackTimer timer;
-	//GetEngineControl()->fFrameTimer.ReadFrameTime(&timer);
 	GetEngineControl()->ReadFrameTime(&timer);
     return timer.fFrames;
 }

common/JackEngine.cpp

@@ -115,12 +115,10 @@ bool JackEngine::Process(jack_time_t callback_usecs)
 	bool res = true;
 	
     // Transport
-    //fEngineControl->fTransport.CycleBegin(fEngineControl->fSampleRate, callback_usecs);
-	fEngineControl->CycleBegin(callback_usecs);
+ 	fEngineControl->CycleBegin(callback_usecs);
 
     // Timing
-    //fEngineControl->fFrameTimer.IncFrameTime(fEngineControl->fBufferSize, callback_usecs, fEngineControl->fPeriodUsecs);
-	fEngineControl->IncFrameTime(callback_usecs);
+ 	fEngineControl->IncFrameTime(callback_usecs);
     fEngineTiming->UpdateTiming(callback_usecs);
 
     // Graph
@@ -150,8 +148,7 @@ bool JackEngine::Process(jack_time_t callback_usecs)
     }
 
     // Transport
-    //fEngineControl->fTransport.CycleEnd(fClientTable, fEngineControl->fSampleRate, fEngineControl->fBufferSize);
-	fEngineControl->CycleEnd(fClientTable);
+ 	fEngineControl->CycleEnd(fClientTable);
 	return res;
 }
 
@@ -292,7 +289,6 @@ void JackEngine::NotifyRemoveClient(const char* name, int refnum)
 void JackEngine::NotifyXRun(jack_time_t callback_usecs)
 {
     // Use the audio thread => request thread communication channel
-    //fEngineControl->fFrameTimer.ResetFrameTime(fEngineControl->fSampleRate, callback_usecs, fEngineControl->fPeriodUsecs);
 	fEngineControl->ResetFrameTime(callback_usecs);
     fChannel->ClientNotify(ALL_CLIENTS, JackNotifyChannelInterface::kXRunCallback, 0);
 }