diff examples/basic_analog_input/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
line wrap: on
line diff
--- a/examples/basic_analog_input/render.cpp	Fri May 27 18:55:34 2016 +0100
+++ b/examples/basic_analog_input/render.cpp	Fri May 27 19:00:43 2016 +0100
@@ -61,8 +61,8 @@
 	for(unsigned int n = 0; n < context->audioFrames; n++) {
 		if(!(n % gAudioFramesPerAnalogFrame)) {
 			// Even audio samples: update frequency and amplitude from the matrix
-			frequency = map(analogReadFrame(context, n/gAudioFramesPerAnalogFrame, gSensorInputFrequency), 0, 1, 100, 1000);
-			amplitude = analogReadFrame(context, n/gAudioFramesPerAnalogFrame, gSensorInputAmplitude);
+			frequency = map(analogRead(context, n/gAudioFramesPerAnalogFrame, gSensorInputFrequency), 0, 1, 100, 1000);
+			amplitude = analogRead(context, n/gAudioFramesPerAnalogFrame, gSensorInputAmplitude);
 		}
 
 		float out = amplitude * sinf(gPhase);