Finish bufferred samples

src/AudioGenerator.h

@@ -43,6 +43,7 @@ class AudioGenerator
 
   protected:
     bool running;
+    bool finishing;
     AudioFileSource *file;
     AudioOutput *output;
     int16_t lastSample[2];

src/AudioGeneratorMP3.cpp

@@ -24,6 +24,7 @@
 AudioGeneratorMP3::AudioGeneratorMP3()
 {
   running = false;
+  finishing = false;
   file = NULL;
   output = NULL;
   buff = NULL;
@@ -34,6 +35,7 @@ AudioGeneratorMP3::AudioGeneratorMP3()
 AudioGeneratorMP3::AudioGeneratorMP3(void *space, int size): preallocateSpace(space), preallocateSize(size)
 {
   running = false;
+  finishing = false;
   file = NULL;
   output = NULL;
   buff = NULL;
@@ -48,6 +50,7 @@ AudioGeneratorMP3::AudioGeneratorMP3(void *buff, int buffSize, void *stream, int
     preallocateSynthSpace(synth), preallocateSynthSize(synthSize)
 {
   running = false;
+  finishing = false;
   file = NULL;
   output = NULL;
   buff = NULL;
@@ -88,13 +91,14 @@ bool AudioGeneratorMP3::stop()
   stream = NULL;
 
   running = false;
+  finishing = false;
   output->stop();
   return file->close();
 }
 
 bool AudioGeneratorMP3::isRunning()
 {
-  return running;
+  return running || finishing;
 }
 
 enum mad_flow AudioGeneratorMP3::ErrorToFlow()
@@ -209,6 +213,11 @@ bool AudioGeneratorMP3::GetOneSample(int16_t sample[2])
 
 bool AudioGeneratorMP3::loop()
 {
+  if ( finishing )
+  {
+    return output->finish() == false;
+  }
+
   if (!running) goto done; // Nothing to do here!
 
   // First, try and push in the stored sample.  If we can't, then punt and try later
@@ -221,7 +230,9 @@ bool AudioGeneratorMP3::loop()
     if ( (samplePtr >= synth->pcm.length) && (nsCount >= nsCountMax) ) {
 retry:
       if (Input() == MAD_FLOW_STOP) {
-        return false;
+        running = false;
+        finishing = true;
+        return true;
       }
 
       if (!DecodeNextFrame()) {

src/AudioGeneratorWAV.cpp

@@ -24,6 +24,7 @@
 AudioGeneratorWAV::AudioGeneratorWAV()
 {
   running = false;
+  finishing = false;
   file = NULL;
   output = NULL;
   buffSize = 128;
@@ -42,6 +43,7 @@ bool AudioGeneratorWAV::stop()
 {
   if (!running) return true;
   running = false;
+  finishing = false;
   free(buff);
   buff = NULL;
   output->stop();
@@ -50,7 +52,7 @@ bool AudioGeneratorWAV::stop()
 
 bool AudioGeneratorWAV::isRunning()
 {
-  return running;
+  return running || finishing;
 }
 
 
@@ -76,6 +78,19 @@ bool AudioGeneratorWAV::GetBufferedData(int bytes, void *dest)
 
 bool AudioGeneratorWAV::loop()
 {
+  if ( finishing )
+  {
+    if ( output->finish() ) 
+    {
+      stop();
+      return false;
+    }
+    else
+    {
+      return true;
+    }
+  }
+
   if (!running) goto done; // Nothing to do here!
 
   // First, try and push in the stored sample.  If we can't, then punt and try later
@@ -86,18 +101,18 @@ bool AudioGeneratorWAV::loop()
   {
     if (bitsPerSample == 8) {
       uint8_t l, r;
-      if (!GetBufferedData(1, &l)) stop();
+      if (!GetBufferedData(1, &l)) finishing = true;
       if (channels == 2) {
-        if (!GetBufferedData(1, &r)) stop();
+        if (!GetBufferedData(1, &r)) finishing = true;
       } else {
         r = 0;
       }
       lastSample[AudioOutput::LEFTCHANNEL] = l;
       lastSample[AudioOutput::RIGHTCHANNEL] = r;
     } else if (bitsPerSample == 16) {
-      if (!GetBufferedData(2, &lastSample[AudioOutput::LEFTCHANNEL])) stop();
+      if (!GetBufferedData(2, &lastSample[AudioOutput::LEFTCHANNEL])) finishing = true;
       if (channels == 2) {
-        if (!GetBufferedData(2, &lastSample[AudioOutput::RIGHTCHANNEL])) stop();
+        if (!GetBufferedData(2, &lastSample[AudioOutput::RIGHTCHANNEL])) finishing = true;
       } else {
         lastSample[AudioOutput::RIGHTCHANNEL] = 0;
       }

src/AudioOutput.h

@@ -44,6 +44,7 @@ class AudioOutput
       }
       return count;
     }
+    virtual bool finish() { return true; }
     virtual bool stop() { return false; }
     virtual void flush() { return; }
     virtual bool loop() { return true; }

src/AudioOutputI2S.cpp

@@ -272,6 +272,7 @@ bool AudioOutputI2S::begin(bool txDAC)
     }
   #endif
   i2sOn = true;
+  finalSamples = 2*128*dma_buf_count;
   SetRate(hertz); // Default
   return true;
 }
@@ -338,6 +339,21 @@ void AudioOutputI2S::flush()
   #endif
 }
 
+bool AudioOutputI2S::finish()
+{
+  if (!i2sOn)
+    return true;
+
+  int16_t sample[2];
+  sample[0] = 0;
+  sample[1] = 0;
+
+  while ( finalSamples > 0 && ConsumeSample(sample)) finalSamples--;
+
+  return finalSamples == 0;
+}
+
+
 bool AudioOutputI2S::stop()
 {
   if (!i2sOn)

src/AudioOutputI2S.h

@@ -40,6 +40,7 @@ class AudioOutputI2S : public AudioOutput
     virtual bool begin() override { return begin(true); }
     virtual bool ConsumeSample(int16_t sample[2]) override;
     virtual void flush() override;
+    virtual bool finish() override;
     virtual bool stop() override;
 
     bool begin(bool txDAC);
@@ -63,4 +64,5 @@ class AudioOutputI2S : public AudioOutput
     uint8_t bclkPin;
     uint8_t wclkPin;
     uint8_t doutPin;
+    unsigned long finalSamples;
 };