diff options
Diffstat (limited to 'demos/modules/gaudio')
-rw-r--r-- | demos/modules/gaudio/oscilloscope/main.c | 4 | ||||
-rw-r--r-- | demos/modules/gaudio/play-vs1053/main.c | 8 | ||||
-rw-r--r-- | demos/modules/gaudio/play-wave/main.c | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/demos/modules/gaudio/oscilloscope/main.c b/demos/modules/gaudio/oscilloscope/main.c index b544016e..335b2cee 100644 --- a/demos/modules/gaudio/oscilloscope/main.c +++ b/demos/modules/gaudio/oscilloscope/main.c @@ -79,8 +79,8 @@ int main(void) { wi.width = swidth; wi.height = sheight; ghScope = gwinScopeCreate(&gScopeWindow, &wi, MY_AUDIO_CHANNEL, MY_AUDIO_FREQUENCY, MY_AUDIO_FORMAT); } - gwinSetBgColor(ghScope, White); - gwinSetColor(ghScope, Red); + gwinSetBgColor(ghScope, GFX_WHITE); + gwinSetColor(ghScope, GFX_RED); gwinClear(ghScope); /* Just keep displaying the scope traces */ diff --git a/demos/modules/gaudio/play-vs1053/main.c b/demos/modules/gaudio/play-vs1053/main.c index e0204cba..66ac5f8d 100644 --- a/demos/modules/gaudio/play-vs1053/main.c +++ b/demos/modules/gaudio/play-vs1053/main.c @@ -79,7 +79,7 @@ repeatplay: } // Play the file - gdispDrawString(0, gdispGetHeight()/2, "Playing...", font, Yellow); + gdispDrawString(0, gdispGetHeight()/2, "Playing...", font, GFX_YELLOW); toplay = gfileGetSize(f); while(toplay) { // Get a buffer to put the data into @@ -102,17 +102,17 @@ repeatplay: // Wait for the play to finish gaudioPlayWait(TIME_INFINITE); - gdispDrawString(0, gdispGetHeight()/2+10, "Done", font, Green); + gdispDrawString(0, gdispGetHeight()/2+10, "Done", font, GFX_GREEN); // Repeat the whole thing gfxSleepMilliseconds(1500); - gdispClear(Black); + gdispClear(GFX_BLACK); goto repeatplay; // The end theend: if (errmsg) - gdispDrawString(0, gdispGetHeight()/2, errmsg, font, Red); + gdispDrawString(0, gdispGetHeight()/2, errmsg, font, GFX_RED); while(TRUE) gfxSleepMilliseconds(1000); diff --git a/demos/modules/gaudio/play-wave/main.c b/demos/modules/gaudio/play-wave/main.c index 888e4c8e..af3df7d1 100644 --- a/demos/modules/gaudio/play-wave/main.c +++ b/demos/modules/gaudio/play-wave/main.c @@ -162,7 +162,7 @@ repeatplay: } // Play the file - gdispDrawString(0, gdispGetHeight()/2, "Playing...", font, Yellow); + 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 @@ -184,17 +184,17 @@ repeatplay: // Wait for the play to finish gaudioPlayWait(TIME_INFINITE); - gdispDrawString(0, gdispGetHeight()/2+10, "Done", font, Green); + gdispDrawString(0, gdispGetHeight()/2+10, "Done", font, GFX_GREEN); // Repeat the whole thing gfxSleepMilliseconds(1500); - gdispClear(Black); + gdispClear(GFX_BLACK); goto repeatplay; // The end theend: if (errmsg) - gdispDrawString(0, gdispGetHeight()/2, errmsg, font, Red); + gdispDrawString(0, gdispGetHeight()/2, errmsg, font, GFX_RED); while(TRUE) gfxSleepMilliseconds(1000); |