Cleanup

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

common/JackEngine.cpp

@@ -99,12 +99,10 @@ int JackEngine::Close()
 //------------------
 
 bool JackEngine::Process(jack_time_t callback_usecs)
-{
-	bool res = true;
+{
     // Transport
     fEngineControl->fTransport.CycleBegin(fEngineControl->fSampleRate, callback_usecs);
-
-    //JackLog("Process: callback_usecs %lld\n",callback_usecs/1000);
+	bool res = true;
 
     // Timing
     fEngineControl->fFrameTimer.IncFrameTime(fEngineControl->fBufferSize, callback_usecs, fEngineControl->fPeriodUsecs);
@@ -115,31 +113,29 @@ bool JackEngine::Process(jack_time_t callback_usecs)
         fLastSwitchUsecs = callback_usecs;
         if (fGraphManager->RunNextGraph())	// True if the graph actually switched to a new state
             fChannel->ClientNotify(ALL_CLIENTS, JackNotifyChannelInterface::kGraphOrderCallback, 0);
-        fSignal->SignalAll();				// Signal for threads waiting for next cycle
-		//jack_error("Process: finished!\n");
+        fSignal->SignalAll();				// Signal for threads waiting for next cycle
 		res = true;
     } else {
-        JackLog("Process: graph not finished!\n");
-		//jack_error("Process: graph not finished!\n");
-        if (callback_usecs > fLastSwitchUsecs + fEngineControl->fTimeOutUsecs) {
+        JackLog("Process: graph not finished!\n");
+		if (callback_usecs > fLastSwitchUsecs + fEngineControl->fTimeOutUsecs) {
             JackLog("Process: switch to next state %ld\n", long(callback_usecs - fLastSwitchUsecs));
             //RemoveZombifiedClients(callback_usecs); TODO
             fLastSwitchUsecs = callback_usecs;
             if (fGraphManager->RunNextGraph())
                 fChannel->ClientNotify(ALL_CLIENTS, JackNotifyChannelInterface::kGraphOrderCallback, 0);
-            fSignal->SignalAll();			// Signal for threads waiting for next cycle
+            fSignal->SignalAll();			// Signal for threads waiting for next cycle
 			res = true;
         } else {
             JackLog("Process: waiting to switch %ld\n", long(callback_usecs - fLastSwitchUsecs));
             if (callback_usecs < fLastSwitchUsecs + 2 * fEngineControl->fPeriodUsecs) // Signal XRun only for the first failling cycle
                 CheckXRun(callback_usecs);
-            fGraphManager->RunCurrentGraph();
+            fGraphManager->RunCurrentGraph();
 			res = false;
         }
     }
 
     // Transport
-    fEngineControl->fTransport.CycleEnd(fClientTable, fEngineControl->fSampleRate, fEngineControl->fBufferSize);
+    fEngineControl->fTransport.CycleEnd(fClientTable, fEngineControl->fSampleRate, fEngineControl->fBufferSize);
 	return res;
 }