Diff: SlideShow/SlideShow.cpp

Revision:

21:0038059e3a8f

Parent:

13:bff2288c2c61

--- a/SlideShow/SlideShow.cpp	Mon Mar 23 14:28:07 2015 +0100
+++ b/SlideShow/SlideShow.cpp	Wed Oct 23 06:59:53 2019 +0000
@@ -205,7 +205,7 @@
           ss->rend->setFramebuffer(ss->rendHnd, ss->ImageBackBuffer);
 
           // Sleep and do over again
-          Thread::wait(LeftRight_DelayMs);
+          ThisThread::sleep_for(LeftRight_DelayMs);
         }
 
         // Show final image
@@ -232,7 +232,7 @@
           ss->rend->setFramebuffer(ss->rendHnd, ss->ImageBackBuffer + i * NewImage->width);
 
           // Sleep and do over again
-          Thread::wait(DownUp_DelayMs);
+          ThisThread::sleep_for(DownUp_DelayMs);
         }
 
         // show final image
@@ -259,7 +259,7 @@
           ss->rend->setFramebuffer(ss->rendHnd, ss->ImageBackBuffer + i*NewImage->width);
 
           // Sleep and do over again
-          Thread::wait(TopDown_DelayMs);
+          ThisThread::sleep_for(TopDown_DelayMs);
         }
 
         // show final image
@@ -300,11 +300,11 @@
           ss->rend->setFramebuffer(ss->rendHnd, ss->ImageBackBuffer);
 
           // Sleep and do over again
-          Thread::wait(Blinds_DelayMs);
+          ThisThread::sleep_for(Blinds_DelayMs);
         }
         memcpy(ss->ImageBackBuffer+i-blockNumPixels, bkgBlock, blockNumBytes);
         ss->rend->setFramebuffer(ss->rendHnd, ss->ImageBackBuffer);
-        Thread::wait(Blinds_DelayMs);
+        ThisThread::sleep_for(Blinds_DelayMs);
 
         for (i = 0; i < ss->screenPixels; i += blockNumPixels)
         {
@@ -320,7 +320,7 @@
           ss->rend->setFramebuffer(ss->rendHnd, ss->ImageBackBuffer);
 
           // Sleep and do over again
-          Thread::wait(Blinds_DelayMs);
+          ThisThread::sleep_for(Blinds_DelayMs);
         }
 
         // show final image
@@ -382,7 +382,7 @@
           ss->rend->setFramebuffer(ss->rendHnd, ss->ImageBackBuffer);
 
           // Sleep and do over again
-          Thread::wait(Fade_DelayMs);
+          ThisThread::sleep_for(Fade_DelayMs);
         }
 
         // show final image
@@ -429,7 +429,7 @@
         // Allocate memory to read into
         *pData = (unsigned char*)malloc(size);
         if (*pData == NULL) {
-            printf("Failed to allocate %lu bytes to load %s into\n", size, path);
+            printf("Failed to allocate %u bytes to load %s into\n", size, path);
             result = OutOfMemory;
             break;
         }
@@ -446,7 +446,7 @@
         } while ((num > 0) && (size > 0));
 
         if (size != 0) {
-            printf("Failed to read entire %s, got %lu of %lu\n", path, pos, *pSize);
+            printf("Failed to read entire %s, got %u of %u\n", path, pos, *pSize);
             result = FileError;
             break;
         }
@@ -778,7 +778,7 @@
 {
     int timeToWait = (lastTime + millis) - msTicks;
     if (timeToWait > 0) {
-        Thread::wait(timeToWait);
+        ThisThread::sleep_for(timeToWait);
     }
 }