diff --git a/hardware/arduino/sam/libraries/Audio/Audio.cpp b/hardware/arduino/sam/libraries/Audio/Audio.cpp index 64a418b7c..52ed57a6b 100644 --- a/hardware/arduino/sam/libraries/Audio/Audio.cpp +++ b/hardware/arduino/sam/libraries/Audio/Audio.cpp @@ -33,6 +33,17 @@ void AudioClass::end() { free( buffer); } +void AudioClass::prepare(int16_t *buffer, int S, int volume){ + uint16_t *ubuffer = (uint16_t*) buffer; + for (int i=0; i>= 4; + } +} + size_t AudioClass::write(const uint32_t *data, size_t size) { const uint32_t TAG = 0x10000000; int i; diff --git a/hardware/arduino/sam/libraries/Audio/Audio.h b/hardware/arduino/sam/libraries/Audio/Audio.h index cb49295d1..0f692ee07 100644 --- a/hardware/arduino/sam/libraries/Audio/Audio.h +++ b/hardware/arduino/sam/libraries/Audio/Audio.h @@ -18,6 +18,7 @@ class AudioClass : public Print { public: AudioClass(DACClass &_dac) : dac(&_dac) { }; + void prepare(int16_t *buffer, int S, int volume); void begin(uint32_t sampleRate, uint32_t msPreBuffer); void end(); diff --git a/hardware/arduino/sam/libraries/Audio/examples/SimpleAudioPlayer/SimpleAudioPlayer.ino b/hardware/arduino/sam/libraries/Audio/examples/SimpleAudioPlayer/SimpleAudioPlayer.ino index 07cae483f..38b7c8575 100644 --- a/hardware/arduino/sam/libraries/Audio/examples/SimpleAudioPlayer/SimpleAudioPlayer.ino +++ b/hardware/arduino/sam/libraries/Audio/examples/SimpleAudioPlayer/SimpleAudioPlayer.ino @@ -44,8 +44,8 @@ void loop() myFile.read(buffer, sizeof(buffer)); // Prepare samples - int volume = analogRead(2); - prepare(buffer, S, volume); + int volume = 1024; + Audio.prepare(buffer, S, volume); // Feed samples to audio Audio.write(buffer, S); @@ -58,20 +58,7 @@ void loop() } myFile.close(); - Serial.println("End of file. Thank you for listening!"); while (true) ; } - -void prepare(int16_t *buffer, int S, int volume) { - uint16_t *ubuffer = (uint16_t*) buffer; - for (int i=0; i>= 4; - } -} -