X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fanimated-vector-image%2Fvector-animation-task.h;h=fdf1e2c95513b221e57111284af82c6a32b520ec;hb=4dec2735f5e5b5ed74f70a402c9a008d6c21af05;hp=0b2c43e481e8ff6ea31dd73681c519a5d390aba1;hpb=1913a75d0158e7142dd2d81324e650aa84c59056;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.h b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.h index 0b2c43e..fdf1e2c 100644 --- a/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.h +++ b/dali-toolkit/internal/visuals/animated-vector-image/vector-animation-task.h @@ -181,7 +181,7 @@ public: * @brief This callback is called after the animation is finished. * @param[in] callback The animation finished callback */ - void SetAnimationFinishedCallback(EventThreadCallback* callback); + void SetAnimationFinishedCallback(CallbackBase* callback); /** * @brief Gets the playing range in frame number. @@ -357,12 +357,12 @@ private: std::string mUrl; VectorAnimationRenderer mVectorRenderer; - AnimationData mAnimationData[2]; + std::vector mAnimationData[2]; VectorAnimationThread& mVectorAnimationThread; ConditionalWait mConditionalWait; ResourceReadySignalType mResourceReadySignal; - std::unique_ptr mAnimationFinishedTrigger; - std::unique_ptr mLoadCompletedTrigger; + std::unique_ptr mAnimationFinishedCallback{}; + std::unique_ptr mLoadCompletedCallback{}; PlayState mPlayState; DevelImageVisual::StopBehavior::Type mStopBehavior; DevelImageVisual::LoopingMode::Type mLoopingMode;