Returning also the real time from a scheduler unit

jamoma · Oct 3, 2013 · d08037e · d08037e
1 parent fbb1cec
commit d08037e
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 12 deletions.
diff --git a/Modular/extensions/Max/source/Max.cpp b/Modular/extensions/Max/source/Max.cpp
@@ -63,13 +63,18 @@ TTErr Max::Go()
 
         mRunning = NO;
         mProgression = 0.;
-        (mCallback)(mBaton, mProgression);
+        mRealTime = 0.;
+        (mCallback)(mBaton, mProgression, mRealTime);
 
         // notify each running attribute observers
         runningAttribute->sendNotification(kTTSym_notify, mRunning);          // we use kTTSym_notify because we know that observers are TTCallback
 
         // notify each progression attribute observers
         progressionAttribute->sendNotification(kTTSym_notify, mProgression);  // we use kTTSym_notify because we know that observers are TTCallback
+
+        // notify each elapsed time attribute observers
+        realTimeAttribute->sendNotification(kTTSym_notify, mRealTime);        // we use kTTSym_notify because we know that observers are TTCallback
+
     }
     else {
 
@@ -79,14 +84,18 @@ TTErr Max::Go()
 
         mRunning = YES;
         mProgression = 0.;
-        (mCallback)(mBaton, mProgression);
+        mRealTime = 0.;
+        (mCallback)(mBaton, mProgression, mRealTime);
 
         // notify each running attribute observers
         runningAttribute->sendNotification(kTTSym_notify, mRunning);          // we use kTTSym_notify because we know that observers are TTCallback
 
         // notify each progression attribute observers
         progressionAttribute->sendNotification(kTTSym_notify, mProgression);  // we use kTTSym_notify because we know that observers are TTCallback
 
+        // notify each elapsed time attribute observers
+        realTimeAttribute->sendNotification(kTTSym_notify, mRealTime);        // we use kTTSym_notify because we know that observers are TTCallback
+
         // schedule first tick
         setclock_fdelay(NULL, clock, mGranularity);
     }
@@ -133,7 +142,7 @@ TTErr Max::Tick()
 			mProgression = 1.0;
             mRealTime = mDuration;
 
-            (mCallback)(mBaton, mProgression);
+            (mCallback)(mBaton, mProgression, mRealTime);
 
             // notify each running attribute observers
             runningAttribute->sendNotification(kTTSym_notify, mRunning);          // we use kTTSym_notify because we know that observers are TTCallback
@@ -149,7 +158,7 @@ TTErr Max::Tick()
 			mProgression += stepSize;
             mRealTime = mDuration * mProgression;
 
-            (mCallback)(mBaton, mProgression);
+            (mCallback)(mBaton, mProgression, mRealTime);
 
             // notify each progression attribute observers
             progressionAttribute->sendNotification(kTTSym_notify, mProgression);  // we use kTTSym_notify because we know that observers are TTCallback

diff --git a/Modular/extensions/System/source/System.cpp b/Modular/extensions/System/source/System.cpp
@@ -70,7 +70,7 @@ TTErr System::Go()
         mProgression = 0.;
         mRealTime = 0.;
 
-        (mCallback)(mBaton, mProgression);
+        (mCallback)(mBaton, mProgression, mRealTime);
 
         // notify each running attribute observers
         runningAttribute->sendNotification(kTTSym_notify, mRunning);          // we use kTTSym_notify because we know that observers are TTCallback
@@ -120,7 +120,7 @@ TTErr System::Tick()
 
     if (mProgression < 1.) {
 
-        (mCallback)(mBaton, mProgression);
+        (mCallback)(mBaton, mProgression, mRealTime);
 
         // notify each progression attribute observers
         progressionAttribute->sendNotification(kTTSym_notify, mProgression);    // we use kTTSym_notify because we know that observers are TTCallback
@@ -135,7 +135,7 @@ TTErr System::Tick()
         // forcing progression to 1. to allow filtering
         mProgression = 1.;
 
-        (mCallback)(mBaton, mProgression);
+        (mCallback)(mBaton, mProgression, mRealTime);
 
         // notify each progression attribute observers
         progressionAttribute->sendNotification(kTTSym_notify, mProgression);    // we use kTTSym_notify because we know that observers are TTCallback

diff --git a/Modular/library/PeerObject/TTRamp.cpp b/Modular/library/PeerObject/TTRamp.cpp
@@ -200,7 +200,7 @@ TTErr TTRamp::Slide(const TTValue& inputValue, TTValue& outputValue)
 
         if (inputValue[0].type() == kTypeFloat64) {
 
-            TTRampSchedulerCallback(TTPtr(this), inputValue[0]);
+            TTRampSchedulerCallback(TTPtr(this), inputValue[0], 0.);
             return kTTErrNone;
         }
     }
@@ -238,7 +238,7 @@ TTErr TTRamp::getFunctionParameterValue(TTSymbol ParameterName, TTValue& value)
 	return kTTErrNone;
 }
 #endif
-void TTRampSchedulerCallback(TTPtr object, TTFloat64 progression)
+void TTRampSchedulerCallback(TTPtr object, TTFloat64 progression, TTFloat64 realTime)
 {
 	TTRampPtr	aRamp = (TTRampPtr)object;
     TTUInt32	i;

diff --git a/Modular/library/PeerObject/TTRamp.h b/Modular/library/PeerObject/TTRamp.h
@@ -81,14 +81,14 @@ class TTMODULAR_EXPORT TTRamp : public TTDataObjectBase {
     TTErr   setFunctionParameterValue(TTSymbol ParameterName, TTValue& newValue);
     TTErr   getFunctionParameterValue(TTSymbol ParameterName, TTValue& value);
 #endif
-    friend void TTMODULAR_EXPORT TTRampSchedulerCallback(TTPtr object, TTFloat64 progression);
+    friend void TTMODULAR_EXPORT TTRampSchedulerCallback(TTPtr object, TTFloat64 progression, TTFloat64 realTime);
 };
 typedef TTRamp* TTRampPtr;
 
 /**
  @param	baton						..
  @param	data						..
  @return							an error code */
-void TTMODULAR_EXPORT TTRampSchedulerCallback(TTPtr object, TTFloat64 progression);
+void TTMODULAR_EXPORT TTRampSchedulerCallback(TTPtr object, TTFloat64 progression, TTFloat64 realTime);
 
 #endif // __TT_RAMP_H__
diff --git a/Modular/library/SchedulerLib/Scheduler.h b/Modular/library/SchedulerLib/Scheduler.h
@@ -34,7 +34,7 @@ mStretchable = TTSymbol(thisSchedulerStretchable); \
 registerAttribute(TTSymbol("ParameterNames"), kTypeLocalValue, NULL, (TTGetterMethod)& thisTTClass::getParameterNames); \
 /*addAttributeProperty(ParameterNames, readOnly, YES); \ */
 
-typedef void (*SchedulerProgressionCallback)(TTPtr, TTFloat64);
+typedef void (*SchedulerProgressionCallback)(TTPtr, TTFloat64, TTFloat64);
 
 /****************************************************************************************************/
 // Class Specification