diff options
| author | Joel Bodenmann <joel@unormal.org> | 2014-04-30 13:41:34 +0200 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2014-04-30 13:41:34 +0200 |
| commit | 33c721c009465dd30d4e96e055a051480c567b57 (patch) | |
| tree | 5a6744a79b7469d80bae474d4314b47d4cd6d44d /demos/modules/gaudio/oscilloscope/gwinosc.c | |
| parent | 58cf2d2b35542166f1a4e50a83bcf28ff33574a5 (diff) | |
| parent | a394e2c35dde67241bea69409bcae9f46dcfc089 (diff) | |
| download | uGFX-33c721c009465dd30d4e96e055a051480c567b57.tar.gz uGFX-33c721c009465dd30d4e96e055a051480c567b57.tar.bz2 uGFX-33c721c009465dd30d4e96e055a051480c567b57.zip | |
Merge branch 'master' into freertos
Diffstat (limited to 'demos/modules/gaudio/oscilloscope/gwinosc.c')
| -rw-r--r-- | demos/modules/gaudio/oscilloscope/gwinosc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/demos/modules/gaudio/oscilloscope/gwinosc.c b/demos/modules/gaudio/oscilloscope/gwinosc.c index 21a83760..6b51232b 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; @@ -144,10 +144,10 @@ void gwinScopeWaitForTrace(GHandle gh) { scopemin = 0; #endif - for(i = paud->len/(gfxSampleFormatBits(gs->format)/8); i; i--) { + for(i = paud->len/((gfxSampleFormatBits(gs->format)+7)/8); i; i--) { /* Calculate the new scope value - re-scale using simple shifts for efficiency, re-center and y-invert */ - if (gs->format <= 8) + if (gfxSampleFormatBits(gs->format) <= 8) y = yoffset - (((coord_t)(*pa8++ ) << shr) >> (16-SCOPE_Y_BITS)); else y = yoffset - (((coord_t)(*pa16++) << shr) >> (16-SCOPE_Y_BITS)); @@ -216,6 +216,6 @@ void gwinScopeWaitForTrace(GHandle gh) { gs->scopemin = scopemin; #endif - gaudioReleaseBuffer(paud); + gfxBufferRelease(paud); #undef gs } |