comparison examples/scope_analogue/render.cpp @ 314:611306d840b3 prerelease

Merge
author Giulio Moro <giuliomoro@yahoo.it>
date Fri, 27 May 2016 19:00:43 +0100
parents 1feb9c23ac57
children db2fe4e1b88e
comparison
equal deleted inserted replaced
313:c770cdf3d8b2 314:611306d840b3
28 { 28 {
29 29
30 for(unsigned int n = 0; n < context->audioFrames; n++) { 30 for(unsigned int n = 0; n < context->audioFrames; n++) {
31 31
32 // read analogIn channels 0 and 1 32 // read analogIn channels 0 and 1
33 float in1 = analogReadFrame(context, n, 0); 33 float in1 = analogRead(context, n, 0);
34 float in2 = analogReadFrame(context, n, 1); 34 float in2 = analogRead(context, n, 1);
35 35
36 // map in1 to amplitude and in2 to frequency 36 // map in1 to amplitude and in2 to frequency
37 float amplitude = in1 * 0.8f; 37 float amplitude = in1 * 0.8f;
38 float frequency = map(in2, 0, 1, 100, 1000); 38 float frequency = map(in2, 0, 1, 100, 1000);
39 39