From 93da5a0578e7f16ea846eb257f36a24e316ef8d4 Mon Sep 17 00:00:00 2001 From: inmarket Date: Sun, 8 Jul 2018 15:15:15 +1000 Subject: gDelayNone/gDelayForever to replace TIME_IMMEDIATE/TIME_INFINITE --- demos/3rdparty/notepad-2/notepadApp.c | 2 +- demos/applications/combo/main.c | 2 +- demos/modules/gadc/gwinosc.c | 2 +- demos/modules/gaudio/oscilloscope/gwinosc.c | 2 +- demos/modules/gaudio/play-vs1053/main.c | 4 ++-- demos/modules/gaudio/play-wave/main.c | 4 ++-- demos/modules/gdisp/images_animated/main.c | 4 ++-- demos/modules/ginput/keyboard/main.c | 2 +- demos/modules/gwin/button/main.c | 2 +- demos/modules/gwin/checkbox/main.c | 2 +- demos/modules/gwin/container_nested/main.c | 2 +- demos/modules/gwin/frame/main.c | 2 +- demos/modules/gwin/keyboard/main.c | 2 +- demos/modules/gwin/label/main.c | 2 +- demos/modules/gwin/list/main.c | 2 +- demos/modules/gwin/radio/main.c | 2 +- demos/modules/gwin/slider/main.c | 2 +- demos/modules/gwin/tabset/main.c | 2 +- demos/modules/gwin/textedit/main.c | 2 +- demos/modules/gwin/widgets/main.c | 2 +- demos/tools/touch_driver_test/main.c | 14 +++++++------- demos/tools/touch_raw_readings/main.c | 2 +- demos/tools/uGFXnetDisplay/main.c | 2 +- 23 files changed, 32 insertions(+), 32 deletions(-) (limited to 'demos') diff --git a/demos/3rdparty/notepad-2/notepadApp.c b/demos/3rdparty/notepad-2/notepadApp.c index f274a23f..3ce60db0 100644 --- a/demos/3rdparty/notepad-2/notepadApp.c +++ b/demos/3rdparty/notepad-2/notepadApp.c @@ -402,7 +402,7 @@ static DECLARE_THREAD_FUNCTION(notepadThread, param) { ncoreSpawnDrawThread(nDrawingArea, gstatusConsole); while(1) { - pem = (GEventMouse *) geventEventWait(&gl, TIME_INFINITE); + pem = (GEventMouse *) geventEventWait(&gl, gDelayForever); /* button pressed... */ if (pem->type == GEVENT_GWIN_BUTTON) { diff --git a/demos/applications/combo/main.c b/demos/applications/combo/main.c index a614b23b..da97e5d6 100644 --- a/demos/applications/combo/main.c +++ b/demos/applications/combo/main.c @@ -436,7 +436,7 @@ int main(void) { while(1) { // Get an Event - pe = geventEventWait(&gl, TIME_INFINITE); + pe = geventEventWait(&gl, gDelayForever); switch(pe->type) { case GEVENT_GWIN_BUTTON: diff --git a/demos/modules/gadc/gwinosc.c b/demos/modules/gadc/gwinosc.c index 4f89a262..b018fe7e 100644 --- a/demos/modules/gadc/gwinosc.c +++ b/demos/modules/gadc/gwinosc.c @@ -101,7 +101,7 @@ void gwinScopeWaitForTrace(GHandle gh) { return; /* Wait for a set of conversions */ - pd = gadcHighSpeedGetData(TIME_INFINITE); + pd = gadcHighSpeedGetData(gDelayForever); /* Ensure we are drawing in the right area */ #if GDISP_NEED_CLIP diff --git a/demos/modules/gaudio/oscilloscope/gwinosc.c b/demos/modules/gaudio/oscilloscope/gwinosc.c index 17ea9566..e46640e8 100644 --- a/demos/modules/gaudio/oscilloscope/gwinosc.c +++ b/demos/modules/gaudio/oscilloscope/gwinosc.c @@ -118,7 +118,7 @@ void gwinScopeWaitForTrace(GHandle gh) { return; /* Wait for a set of audio conversions */ - paud = gaudioRecordGetData(TIME_INFINITE); + paud = gaudioRecordGetData(gDelayForever); /* Ensure we are drawing in the right area */ #if GDISP_NEED_CLIP diff --git a/demos/modules/gaudio/play-vs1053/main.c b/demos/modules/gaudio/play-vs1053/main.c index 4e9c4b97..8cfa60f6 100644 --- a/demos/modules/gaudio/play-vs1053/main.c +++ b/demos/modules/gaudio/play-vs1053/main.c @@ -83,7 +83,7 @@ repeatplay: toplay = gfileGetSize(f); while(toplay) { // Get a buffer to put the data into - pd = gfxBufferGet(TIME_INFINITE); // This should never fail as we are waiting forever + pd = gfxBufferGet(gDelayForever); // This should never fail as we are waiting forever // How much data can we put in len = toplay > pd->size ? pd->size : toplay; @@ -101,7 +101,7 @@ repeatplay: gfileClose(f); // Wait for the play to finish - gaudioPlayWait(TIME_INFINITE); + gaudioPlayWait(gDelayForever); gdispDrawString(0, gdispGetHeight()/2+10, "Done", font, GFX_GREEN); // Repeat the whole thing diff --git a/demos/modules/gaudio/play-wave/main.c b/demos/modules/gaudio/play-wave/main.c index 9717b4fe..c6a5ea84 100644 --- a/demos/modules/gaudio/play-wave/main.c +++ b/demos/modules/gaudio/play-wave/main.c @@ -165,7 +165,7 @@ repeatplay: gdispDrawString(0, gdispGetHeight()/2, "Playing...", font, GFX_YELLOW); while(toplay) { // Get a buffer to put the data into - pd = gfxBufferGet(TIME_INFINITE); // This should never fail as we are waiting forever + pd = gfxBufferGet(gDelayForever); // This should never fail as we are waiting forever // How much data can we put in len = toplay > pd->size ? pd->size : toplay; @@ -183,7 +183,7 @@ repeatplay: gfileClose(f); // Wait for the play to finish - gaudioPlayWait(TIME_INFINITE); + gaudioPlayWait(gDelayForever); gdispDrawString(0, gdispGetHeight()/2+10, "Done", font, GFX_GREEN); // Repeat the whole thing diff --git a/demos/modules/gdisp/images_animated/main.c b/demos/modules/gdisp/images_animated/main.c index 5891de4f..0503bcd3 100644 --- a/demos/modules/gdisp/images_animated/main.c +++ b/demos/modules/gdisp/images_animated/main.c @@ -89,12 +89,12 @@ int main(void) { break; } delay = gdispImageNext(&myImage); - if (delay == TIME_INFINITE) { + if (delay == gDelayForever) { SHOW_ERROR(GFX_GREEN); break; } SHOW_ERROR(GFX_YELLOW); - if (delay != TIME_IMMEDIATE) + if (delay != gDelayNone) gfxSleepMilliseconds(delay); } gdispImageClose(&myImage); diff --git a/demos/modules/ginput/keyboard/main.c b/demos/modules/ginput/keyboard/main.c index e521207f..12aa6585 100644 --- a/demos/modules/ginput/keyboard/main.c +++ b/demos/modules/ginput/keyboard/main.c @@ -70,7 +70,7 @@ int main(void) { while(1) { // Get an Event - pk = (GEventKeyboard *)geventEventWait(&gl, TIME_INFINITE); + pk = (GEventKeyboard *)geventEventWait(&gl, gDelayForever); if (pk->type != GEVENT_KEYBOARD) continue; diff --git a/demos/modules/gwin/button/main.c b/demos/modules/gwin/button/main.c index ab70d1a0..fc600e79 100644 --- a/demos/modules/gwin/button/main.c +++ b/demos/modules/gwin/button/main.c @@ -76,7 +76,7 @@ int main(void) { while(1) { // Get an Event - pe = geventEventWait(&gl, TIME_INFINITE); + pe = geventEventWait(&gl, gDelayForever); switch(pe->type) { case GEVENT_GWIN_BUTTON: diff --git a/demos/modules/gwin/checkbox/main.c b/demos/modules/gwin/checkbox/main.c index 486c4057..d2c395e8 100644 --- a/demos/modules/gwin/checkbox/main.c +++ b/demos/modules/gwin/checkbox/main.c @@ -70,7 +70,7 @@ int main(void) { while(1) { // Get an Event - pe = geventEventWait(&gl, TIME_INFINITE); + pe = geventEventWait(&gl, gDelayForever); switch(pe->type) { case GEVENT_GWIN_CHECKBOX: diff --git a/demos/modules/gwin/container_nested/main.c b/demos/modules/gwin/container_nested/main.c index 6d86704e..0900f404 100644 --- a/demos/modules/gwin/container_nested/main.c +++ b/demos/modules/gwin/container_nested/main.c @@ -134,7 +134,7 @@ int main(void) { while(1) { // Get an Event - pe = geventEventWait(&gl, TIME_INFINITE); + pe = geventEventWait(&gl, gDelayForever); switch(pe->type) { case GEVENT_GWIN_CHECKBOX: diff --git a/demos/modules/gwin/frame/main.c b/demos/modules/gwin/frame/main.c index 3ee330df..18e15046 100644 --- a/demos/modules/gwin/frame/main.c +++ b/demos/modules/gwin/frame/main.c @@ -131,7 +131,7 @@ int main(void) { while(1) { // Get an Event - pe = geventEventWait(&gl, TIME_INFINITE); + pe = geventEventWait(&gl, gDelayForever); switch(pe->type) { case GEVENT_GWIN_SLIDER: diff --git a/demos/modules/gwin/keyboard/main.c b/demos/modules/gwin/keyboard/main.c index cf31118f..3d137b4e 100644 --- a/demos/modules/gwin/keyboard/main.c +++ b/demos/modules/gwin/keyboard/main.c @@ -85,7 +85,7 @@ int main(void) { while(1) { // Get an Event - pe = geventEventWait(&gl, TIME_INFINITE); + pe = geventEventWait(&gl, gDelayForever); switch(pe->type) { case GEVENT_GWIN_KEYBOARD: diff --git a/demos/modules/gwin/label/main.c b/demos/modules/gwin/label/main.c index 6a2429a4..c4261ae3 100644 --- a/demos/modules/gwin/label/main.c +++ b/demos/modules/gwin/label/main.c @@ -72,7 +72,7 @@ int main(void) { while(1) { // Get an Event - pe = geventEventWait(&gl, TIME_INFINITE); + pe = geventEventWait(&gl, gDelayForever); } return 0; diff --git a/demos/modules/gwin/list/main.c b/demos/modules/gwin/list/main.c index 86e50e9a..a893c62a 100644 --- a/demos/modules/gwin/list/main.c +++ b/demos/modules/gwin/list/main.c @@ -124,7 +124,7 @@ int main(void) { while(1) { // Get an Event - pe = geventEventWait(&gl, TIME_INFINITE); + pe = geventEventWait(&gl, gDelayForever); } diff --git a/demos/modules/gwin/radio/main.c b/demos/modules/gwin/radio/main.c index f6cc5b4d..ee1f87c7 100644 --- a/demos/modules/gwin/radio/main.c +++ b/demos/modules/gwin/radio/main.c @@ -92,7 +92,7 @@ int main(void) { while(1) { // Get an Event - pe = geventEventWait(&gl, TIME_INFINITE); + pe = geventEventWait(&gl, gDelayForever); switch(pe->type) { case GEVENT_GWIN_RADIO: diff --git a/demos/modules/gwin/slider/main.c b/demos/modules/gwin/slider/main.c index b813a393..a8aca9c8 100644 --- a/demos/modules/gwin/slider/main.c +++ b/demos/modules/gwin/slider/main.c @@ -84,7 +84,7 @@ int main(void) { while(1) { // Get an Event (assume it is a slider event) - pe = (GEventGWinSlider *)geventEventWait(&gl, TIME_INFINITE); + pe = (GEventGWinSlider *)geventEventWait(&gl, gDelayForever); switch(pe->type) { case GEVENT_GWIN_SLIDER: diff --git a/demos/modules/gwin/tabset/main.c b/demos/modules/gwin/tabset/main.c index bedd7ed8..e505121e 100644 --- a/demos/modules/gwin/tabset/main.c +++ b/demos/modules/gwin/tabset/main.c @@ -87,7 +87,7 @@ int main(void) { while(1) { // Get an Event - pe = geventEventWait(&gl, TIME_INFINITE); + pe = geventEventWait(&gl, gDelayForever); (void)pe; } diff --git a/demos/modules/gwin/textedit/main.c b/demos/modules/gwin/textedit/main.c index 490a949c..29b075cd 100644 --- a/demos/modules/gwin/textedit/main.c +++ b/demos/modules/gwin/textedit/main.c @@ -117,7 +117,7 @@ int main(void) { while(1) { // Get an Event - pk = (GEventKeyboard *)geventEventWait(&gl, TIME_INFINITE); + pk = (GEventKeyboard *)geventEventWait(&gl, gDelayForever); if (pk->type != GEVENT_KEYBOARD) continue; diff --git a/demos/modules/gwin/widgets/main.c b/demos/modules/gwin/widgets/main.c index 4b8e1146..52ffdc91 100644 --- a/demos/modules/gwin/widgets/main.c +++ b/demos/modules/gwin/widgets/main.c @@ -535,7 +535,7 @@ int main(void) { while(1) { // Get an Event - pe = geventEventWait(&gl, TIME_INFINITE); + pe = geventEventWait(&gl, gDelayForever); switch(pe->type) { case GEVENT_GWIN_BUTTON: diff --git a/demos/tools/touch_driver_test/main.c b/demos/tools/touch_driver_test/main.c index c338e24c..2a1e6486 100644 --- a/demos/tools/touch_driver_test/main.c +++ b/demos/tools/touch_driver_test/main.c @@ -176,7 +176,7 @@ StepDeviceType: } while(1) { - pem = (GEventMouse *)geventEventWait(&gl, TIME_INFINITE); + pem = (GEventMouse *)geventEventWait(&gl, gDelayForever); if (isCalibrated) { switch (CheckButtons(pem)) { case BTN_NEXT: @@ -225,7 +225,7 @@ StepRawReading: // Always sleep a bit first to enable other events. We actually don't // mind missing events for this test. gfxSleepMilliseconds(100); - pem = (GEventMouse *)geventEventWait(&gl, TIME_INFINITE); + pem = (GEventMouse *)geventEventWait(&gl, gDelayForever); gwinPrintf(ghc, "%u, %u z=%u b=0x%04x\n", pem->x, pem->y, pem->z, pem->buttons & ~GINPUT_MISSED_MOUSE_EVENT); if ((pem->buttons & GMETA_MOUSE_UP)) break; @@ -265,7 +265,7 @@ StepCalibrate: gwinPrintf(ghc, "Press and release your %s to move on to start calibration.\n", deviceText); while(1) { - pem = (GEventMouse *)geventEventWait(&gl, TIME_INFINITE); + pem = (GEventMouse *)geventEventWait(&gl, gDelayForever); if (isCalibrated) { switch (CheckButtons(pem)) { case BTN_NEXT: @@ -317,7 +317,7 @@ StepMouseCoords: // Always sleep a bit first to enable other events. We actually don't // mind missing events for this test. gfxSleepMilliseconds(100); - pem = (GEventMouse *)geventEventWait(&gl, TIME_INFINITE); + pem = (GEventMouse *)geventEventWait(&gl, gDelayForever); switch (CheckButtons(pem)) { case BTN_NEXT: @@ -359,7 +359,7 @@ StepMovementJitter: gwinPrintf(ghc, "Press Next or Back to continue.\n\n"); while(1) { - pem = (GEventMouse *)geventEventWait(&gl, TIME_INFINITE); + pem = (GEventMouse *)geventEventWait(&gl, gDelayForever); switch (CheckButtons(pem)) { case BTN_NEXT: break; @@ -402,7 +402,7 @@ StepClickJitter: gwinPrintf(ghc, "Press Next or Back to continue.\n\n"); while(1) { - pem = (GEventMouse *)geventEventWait(&gl, TIME_INFINITE); + pem = (GEventMouse *)geventEventWait(&gl, gDelayForever); switch (CheckButtons(pem)) { case BTN_NEXT: break; @@ -444,7 +444,7 @@ StepDrawing: gwinPrintf(ghc, "Press Next or Back to continue.\n\n"); while(1) { - pem = (GEventMouse *)geventEventWait(&gl, TIME_INFINITE); + pem = (GEventMouse *)geventEventWait(&gl, gDelayForever); if (pem->y < bHeight && pem->x >= swidth-2*bWidth) { if ((pem->buttons & GMETA_MOUSE_UP)) { if (pem->x >= swidth-bWidth) diff --git a/demos/tools/touch_raw_readings/main.c b/demos/tools/touch_raw_readings/main.c index 9b3c125c..1d38b3de 100644 --- a/demos/tools/touch_raw_readings/main.c +++ b/demos/tools/touch_raw_readings/main.c @@ -101,7 +101,7 @@ int main(void) { geventAttachSource(&gl, gs, GLISTEN_MOUSEDOWNMOVES|GLISTEN_MOUSEUPMOVES|GLISTEN_MOUSEMETA|GLISTEN_MOUSENOFILTER); while(1) { - pem = (GEventMouse *)geventEventWait(&gl, TIME_INFINITE); + pem = (GEventMouse *)geventEventWait(&gl, gDelayForever); gwinPrintf(ghc, "%u, %u z=%u b=0x%04x\n", pem->x, pem->y, pem->z, pem->buttons & ~GINPUT_MISSED_MOUSE_EVENT); // Always sleep a bit first to enable other events. We actually don't mind missing events. diff --git a/demos/tools/uGFXnetDisplay/main.c b/demos/tools/uGFXnetDisplay/main.c index de814dde..dc396cfb 100644 --- a/demos/tools/uGFXnetDisplay/main.c +++ b/demos/tools/uGFXnetDisplay/main.c @@ -198,7 +198,7 @@ static gBool sendpkt(uint16_t *pkt, int len) { while(1) { // Get a (mouse) event - pem = (GEventMouse *)geventEventWait(&gl, TIME_INFINITE); + pem = (GEventMouse *)geventEventWait(&gl, gDelayForever); if (pem->type != GEVENT_MOUSE && pem->type != GEVENT_TOUCH) continue; -- cgit v1.2.3