Changeset 12016 for code/branches/PresentationFS18/src/libraries/tools/Timer.h

Timestamp:

May 30, 2018, 2:37:02 PM (7 years ago)

Author:

patricwi

Message:

Merged Scriptable Controller

Location:

code/branches/PresentationFS18

Files:

• . (modified) (1 prop)
• src/libraries/tools/Timer.h (modified) (2 diffs)

code/branches/PresentationFS18/src/libraries/tools/Timer.h

@@ -108 +108 @@
 
             Timer(float interval, bool bLoop, const ExecutorPtr& executor, bool bKillAfterCall = false);
+            Timer(float interval, bool bLoop, std::function<void (void)> func, bool bKillAfterCall = false);
 
             void setTimer(float interval, bool bLoop, const ExecutorPtr& executor, bool bKillAfterCall = false);
+            void setTimer(float interval, bool bLoop, std::function<void (void)> func, bool bKillAfterCall = false);
 
             void run();
@@ -154 +156 @@
 
             ExecutorPtr executor_;  //!< The executor of the function that will be called when the time expires
+            std::function<void (void)> function_;
 
+            bool isStdFunction_;
             long long interval_;    //!< The time-interval in micro seconds
             bool bLoop_;            //!< If true, the executor gets called every @a interval seconds