projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "add minLineSize at text-utils-devel" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
animated-image
/
image-cache.h
diff --git
a/dali-toolkit/internal/visuals/animated-image/image-cache.h
b/dali-toolkit/internal/visuals/animated-image/image-cache.h
index
e8277de
..
1d385c8
100644
(file)
--- a/
dali-toolkit/internal/visuals/animated-image/image-cache.h
+++ b/
dali-toolkit/internal/visuals/animated-image/image-cache.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_INTERNAL_IMAGE_CACHE_H
/*
#define DALI_TOOLKIT_INTERNAL_IMAGE_CACHE_H
/*
- * Copyright (c) 20
17
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-46,7
+46,7
@@
public:
struct UrlStore
{
struct UrlStore
{
- TextureManager::TextureId mTextureId;
+ TextureManager::TextureId mTextureId
= TextureManager::INVALID_TEXTURE_ID
;
std::string mUrl;
};
std::string mUrl;
};
@@
-79,17
+79,22
@@
public:
virtual TextureSet FirstFrame() = 0;
/**
virtual TextureSet FirstFrame() = 0;
/**
- * Get the
next
frame. If it's not ready, this will trigger the
+ * Get the
Nth
frame. If it's not ready, this will trigger the
* sending of FrameReady() when the image becomes ready.
* sending of FrameReady() when the image becomes ready.
- * This will trigger the loading of the next batch.
*/
*/
- virtual TextureSet NextFrame() = 0;
+ virtual TextureSet Frame( uint32_t frameIndex ) = 0;
+
+ /**
+ * Get the interval of Nth frame.
+ */
+ virtual uint32_t GetFrameInterval( uint32_t frameIndex ) = 0;
private:
private:
+
/**
* Called before the texture manager is destroyed.
*/
/**
* Called before the texture manager is destroyed.
*/
- v
irtual void TextureManagerDestroyed() override
final;
+ v
oid TextureManagerDestroyed()
final;
protected:
TextureManager& mTextureManager;
protected:
TextureManager& mTextureManager;