refactored anim::Task and anim::Controller to distinguish between normal Task ending and cancellation.

2 files changed, 19 insertions, 8 deletions

diff --git a/anim/controller.cpp b/anim/controller.cpp
index a68955d216..3e347cd4d8 100644
--- a/anim/controller.cpp
+++ b/anim/controller.cpp
@@ -60,14 +60,20 @@ namespace anim
     for (TTasks::const_iterator it = m_tasksList.begin(); it != m_tasksList.end(); ++it)
     {
       shared_ptr<Task> const & task = *it;
-      if (task->State() == Task::EWaitStart)
+      if (task->State() == Task::EStarted)
         task->OnStart(ts);
       if (task->State() == Task::EInProgress)
         task->OnStep(ts);
-      if (task->State() == Task::EWaitEnd)
-        task->OnEnd(ts);
-      else
+
+      if (task->State() == Task::EInProgress)
         l.push_back(task);
+      else
+      {
+        if (task->State() == Task::ECancelled)
+          task->OnCancel(ts);
+        if (task->State() == Task::EEnded)
+          task->OnEnd(ts);
+      }
     }
 
     m_tasks.ProcessList(bind(&Controller::CopyTasks, this, ref(l), _1));
diff --git a/anim/task.hpp b/anim/task.hpp
index 3853b27fce..538481ae15 100644
--- a/anim/task.hpp
+++ b/anim/task.hpp
@@ -9,9 +9,10 @@ namespace anim
 
     enum EState
     {
-      EWaitStart,
+      EStarted,
       EInProgress,
-      EWaitEnd
+      ECancelled,
+      EEnded
     };
 
   private:
@@ -32,8 +33,12 @@ namespace anim
     virtual void OnStart(double ts);
     virtual void OnStep(double ts);
     virtual void OnEnd(double ts);
+    virtual void OnCancel(double ts);
 
-    void Finish();
-    bool IsFinished() const;
+    void Cancel();
+    void End();
+
+    bool IsCancelled() const;
+    bool IsEnded() const;
   };
 }