From 8b9d31ef902b80c27065ab542c4783d6194f420f Mon Sep 17 00:00:00 2001 From: inmarket Date: Thu, 20 Mar 2014 23:33:32 +1000 Subject: Move queued buffer code from gaudio into gqueue --- demos/modules/gaudio/oscilloscope/gwinosc.c | 4 ++-- demos/modules/gaudio/oscilloscope/main.c | 2 +- demos/modules/gaudio/play-wave/main.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'demos') diff --git a/demos/modules/gaudio/oscilloscope/gwinosc.c b/demos/modules/gaudio/oscilloscope/gwinosc.c index 21a83760..9d095c86 100644 --- a/demos/modules/gaudio/oscilloscope/gwinosc.c +++ b/demos/modules/gaudio/oscilloscope/gwinosc.c @@ -96,7 +96,7 @@ GHandle gwinGScopeCreate(GDisplay *g, GScopeObject *gs, GWindowInit *pInit, uint void gwinScopeWaitForTrace(GHandle gh) { #define gs ((GScopeObject *)(gh)) - GAudioData *paud; + GDataBuffer *paud; int i; coord_t x, y; coord_t yoffset; @@ -216,6 +216,6 @@ void gwinScopeWaitForTrace(GHandle gh) { gs->scopemin = scopemin; #endif - gaudioReleaseBuffer(paud); + gfxBufferRelease(paud); #undef gs } diff --git a/demos/modules/gaudio/oscilloscope/main.c b/demos/modules/gaudio/oscilloscope/main.c index b44b5a02..a0b9320e 100644 --- a/demos/modules/gaudio/oscilloscope/main.c +++ b/demos/modules/gaudio/oscilloscope/main.c @@ -58,7 +58,7 @@ int main(void) { // Allocate audio buffers - 4 x 128 byte buffers. // You may need to increase this for slower cpu's. // You may be able to decrease this for low latency operating systems. - gaudioAllocBuffers(4, 128); + gfxBufferAlloc(4, 128); /* Get the screen dimensions */ swidth = gdispGetWidth(); diff --git a/demos/modules/gaudio/play-wave/main.c b/demos/modules/gaudio/play-wave/main.c index f15ec7a1..855c39ff 100644 --- a/demos/modules/gaudio/play-wave/main.c +++ b/demos/modules/gaudio/play-wave/main.c @@ -64,7 +64,7 @@ int main(void) { // Allocate audio buffers - 4 x 512 byte buffers. // You may need to increase this for slower cpu's. // You may be able to decrease this for low latency operating systems. - if (!gaudioAllocBuffers(4, 512)) { + if (!gfxBufferAlloc(4, 512)) { errmsg = "Err: No Memory"; goto theend; } @@ -164,7 +164,7 @@ int main(void) { gdispDrawString(0, gdispGetHeight()/2, "Playing...", font, Yellow); while(toplay) { // Get a buffer to put the data into - paud = gaudioGetBuffer(TIME_INFINITE); // This should never fail as we are waiting forever + paud = gfxBufferGet(TIME_INFINITE); // This should never fail as we are waiting forever // How much data can we put in len = toplay > paud->size ? paud->size : toplay; -- cgit v1.2.3