Add CURRENT_FRAME_NUMBER and TOTAL_FRAME_NUMBER properties to the AnimatedImageVisual

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / visuals / animated-image / fixed-image-cache.cpp

diff --git a/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.cpp b/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.cpp
index d71ee94..1eea6e6 100644 (file)
--- a/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.cpp
+++ b/dali-toolkit/internal/visuals/animated-image/fixed-image-cache.cpp
@@ -58,8 +58,14 @@ TextureSet FixedImageCache::Frame( uint32_t frameIndex )
 {
   while( frameIndex > mFront )
   {
-    NextFrame();
+    ++mFront;
+    if( mFront >= mImageUrls.size() )
+    {
+      mFront = 0;
+    }
+    LoadBatch();
   }
+
   mFront = frameIndex;
 
   TextureSet textureSet;
@@ -89,23 +95,26 @@ TextureSet FixedImageCache::FirstFrame()
 
 TextureSet FixedImageCache::NextFrame()
 {
-  TextureSet textureSet;
-  ++mFront;
-  mFront %= mImageUrls.size();
-
-  if( IsFrontReady() == true )
-  {
-    textureSet = GetFrontTextureSet();
-  }
-  else
-  {
-    mWaitingForReadyFrame = true;
-  }
-  LoadBatch();
+  TextureSet textureSet = Frame((mFront + 1) % mImageUrls.size());
 
   return textureSet;
 }
 
+uint32_t FixedImageCache::GetFrameInterval( uint32_t frameIndex ) const
+{
+  return 0u;
+}
+
+int32_t FixedImageCache::GetCurrentFrameIndex() const
+{
+  return static_cast<int32_t>(mFront);
+}
+
+int32_t FixedImageCache::GetTotalFrameCount() const
+{
+  return mImageUrls.size();
+}
+
 bool FixedImageCache::IsFrontReady() const
 {
   return ( mReadyFlags.size() > 0 && mReadyFlags[mFront] == true );