gDelayNone/gDelayForever to replace TIME_IMMEDIATE/TIME_INFINITE

6 files changed, 14 insertions, 14 deletions

diff --git a/src/gdisp/gdisp_image.h b/src/gdisp/gdisp_image.h
index 1f0acffb..03ddb459 100644
--- a/src/gdisp/gdisp_image.h
+++ b/src/gdisp/gdisp_image.h
@@ -227,20 +227,20 @@ gdispImageError gdispGImageDraw(GDisplay *g, gdispImage *img, gCoord x, gCoord y
 /**
  * @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.
+ * 			the next frame. Watch out for the special values gDelayNone and gDelayForever.
  *
  * @param[in] img   The image structure
  *
  * @pre		gdispImageOpen() must have returned successfully.
  *
- * @note	It will return TIME_IMMEDIATE if the first frame/page hasn't been drawn or if the next frame
+ * @note	It will return gDelayNone 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
+ * @note	It will return gDelayForever if another image frame doesn't exist or an error has occurred.
+ * @note	Images that support multiple pages (eg TIFF files) will return gDelayNone between pages
+ * 			and then gDelayForever when there are no more pages.
+ * @note	An image that displays a looped animation will never return gDelayForever unless it
  * 			gets an error.
- * @note	Calling gdispImageDraw() after getting a TIME_INFINITE will go back to drawing the first
+ * @note	Calling gdispImageDraw() after getting a gDelayForever will go back to drawing the first
  * 			frame/page.
  */
 gDelay gdispImageNext(gdispImage *img);
diff --git a/src/gdisp/gdisp_image_bmp.c b/src/gdisp/gdisp_image_bmp.c
index 0647e9ab..3066d9ef 100644
--- a/src/gdisp/gdisp_image_bmp.c
+++ b/src/gdisp/gdisp_image_bmp.c
@@ -819,7 +819,7 @@ gDelay gdispImageNext_BMP(gdispImage *img) {
 	(void) img;
 
 	/* No more frames/pages */
-	return TIME_INFINITE;
+	return gDelayForever;
 }
 
 uint16_t gdispImageGetPaletteSize_BMP(gdispImage *img) {
diff --git a/src/gdisp/gdisp_image_gif.c b/src/gdisp/gdisp_image_gif.c
index bad2a150..5ee76130 100644
--- a/src/gdisp/gdisp_image_gif.c
+++ b/src/gdisp/gdisp_image_gif.c
@@ -1122,7 +1122,7 @@ gDelay gdispImageNext_GIF(gdispImage *img) {
 		gfileSetPos(img->f, priv->frame.posimg+1);				// Skip the code size byte too
 		while(1) {
 			if (gfileRead(img->f, &blocksz, 1) != 1)
-				return TIME_INFINITE;
+				return gDelayForever;
 			if (!blocksz)
 				break;
 			gfileSetPos(img->f, gfileGetPos(img->f) + blocksz);
@@ -1145,10 +1145,10 @@ gDelay gdispImageNext_GIF(gdispImage *img) {
 		case GDISP_IMAGE_ERR_NOMEMORY:				// Out of Memory
 		case GDISP_IMAGE_ERR_UNSUPPORTED:			// Unsupported
 		default:
-			return TIME_INFINITE;
+			return gDelayForever;
 		}
 	}
-	return TIME_INFINITE;
+	return gDelayForever;
 }
 
 #endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_GIF */
diff --git a/src/gdisp/gdisp_image_jpg.c b/src/gdisp/gdisp_image_jpg.c
index 1deaaa0b..7a684eb7 100644
--- a/src/gdisp/gdisp_image_jpg.c
+++ b/src/gdisp/gdisp_image_jpg.c
@@ -202,7 +202,7 @@ gDelay gdispImageNext_JPG(gdispImage *img) {
 	(void) img;
 
 	/* No more frames/pages */
-	return TIME_INFINITE;
+	return gDelayForever;
 }
 
 /*----------------------------------------------------------------------------/
diff --git a/src/gdisp/gdisp_image_native.c b/src/gdisp/gdisp_image_native.c
index 3ac5eb36..ec596856 100644
--- a/src/gdisp/gdisp_image_native.c
+++ b/src/gdisp/gdisp_image_native.c
@@ -144,7 +144,7 @@ gDelay gdispImageNext_NATIVE(gdispImage *img) {
 	(void) img;
 
 	/* No more frames/pages */
-	return TIME_INFINITE;
+	return gDelayForever;
 }
 
 #endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_NATIVE */
diff --git a/src/gdisp/gdisp_image_png.c b/src/gdisp/gdisp_image_png.c
index f714b779..b977d8f3 100644
--- a/src/gdisp/gdisp_image_png.c
+++ b/src/gdisp/gdisp_image_png.c
@@ -1625,7 +1625,7 @@ gDelay gdispImageNext_PNG(gdispImage *img) {
 	(void) img;
 
 	/* No more frames/pages */
-	return TIME_INFINITE;
+	return gDelayForever;
 }
 
 #endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_PNG */