aboutsummaryrefslogtreecommitdiffstats
path: root/include/gwin
diff options
context:
space:
mode:
authorJoel Bodenmann <joel@unormal.org>2013-07-18 13:51:49 +0200
committerJoel Bodenmann <joel@unormal.org>2013-07-18 13:51:49 +0200
commitcb28adcfba206bd375d0d16e90c247b7bf8068fb (patch)
treead239d714fd032f201172e70c97fb7bbf5893a01 /include/gwin
parentbd8620fb93df1459e6a5f6169e982c5c415d23d6 (diff)
downloaduGFX-cb28adcfba206bd375d0d16e90c247b7bf8068fb.tar.gz
uGFX-cb28adcfba206bd375d0d16e90c247b7bf8068fb.tar.bz2
uGFX-cb28adcfba206bd375d0d16e90c247b7bf8068fb.zip
removed gwinImageNext() since the image box widget now automatically takes care of animated images
Diffstat (limited to 'include/gwin')
-rw-r--r--include/gwin/image.h23
1 files changed, 2 insertions, 21 deletions
diff --git a/include/gwin/image.h b/include/gwin/image.h
index 688435c7..6f4cc289 100644
--- a/include/gwin/image.h
+++ b/include/gwin/image.h
@@ -32,7 +32,8 @@
// An image window
typedef struct GImageObject {
GWindowObject g;
- gdispImage image;
+ gdispImage image; // The image itself
+ GTimer timer; // Timer used for animated images
} GImageObject;
#ifdef __cplusplus
@@ -104,26 +105,6 @@ bool_t gwinImageOpenMemory(GHandle gh, const void* memory);
*/
gdispImageError gwinImageCache(GHandle gh);
-
-/**
- * @brief Prepare for the next frame/page in the image file.
- * @return A time in milliseconds to keep displaying the current frame before trying to draw
- * the next frame. Watch out for the special values TIME_IMMEDIATE and TIME_INFINITE.
- *
- * @param[in] gh The widget handle (must be an image box handle)
- *
- * @pre gwinImageOpenXxx() must have returned successfully.
- *
- * @note It will return TIME_IMMEDIATE if the first frame/page hasn't been drawn or if the next frame
- * should be drawn immediately.
- * @note It will return TIME_INFINITE if another image frame doesn't exist or an error has occurred.
- * @note Images that support multiple pages (eg TIFF files) will return TIME_IMMEDIATE between pages
- * and then TIME_INFINITE when there are no more pages.
- * @note An image that displays a looped animation will never return TIME_INFINITE unless it
- * gets an error.
- */
-delaytime_t gwinImageNext(GHandle gh);
-
#ifdef __cplusplus
}
#endif