DLNA Renderer correction

Author: pschatzmann

examples/examples-communication/dlna/dlna-audio-renderer/dlna-audio-renderer.ino

@@ -1,4 +1,4 @@
-// Example for creating a Media Renderer backed by a AudioPlayer
+// Example for creating a Media Renderer
 
 #include "WiFi.h"
 #include "DLNA.h" // https://github.com/pschatzmann/arduino-dlna
@@ -18,6 +18,7 @@ WiFiServer wifi(port);
 HttpServer<WiFiClient, WiFiServer> server(wifi);
 UDPService<WiFiUDP> udp;
 DLNAMediaRenderer<WiFiClient> media_renderer(server, udp);
+Task dlna_task("dlna", 8000, 10, 0);
 
 // AudioPlayer
 URLStream url;
@@ -28,39 +29,38 @@ AACDecoderHelix dec_aac;
 MP3DecoderHelix dec_mp3;
 WAVDecoder dec_wav;
 AudioPlayer player(source, i2s, multi_decoder);
-bool is_paused = false;
-Task dlna_task("dlna", 8000, 10, 0);
-
 // Callback when playback reaches EOF
 void onEOF(AudioPlayer& player) {
-  media_renderer.setPlaybackCompleted();
+  if (source.size() > 0) {
+    Serial.println("*** onEOF() ***");
+    player.end();
+    source.clear();
+    media_renderer.setPlaybackCompleted();
+  }
 }
 
-// DLNA event handler
 void handleMediaEvent(MediaEvent ev, DLNAMediaRenderer<WiFiClient>& mr) {
   switch (ev) {
     case MediaEvent::SET_URI:
       Serial.print("Event: SET_URI ");
-      if (mr.getCurrentUri()) {
-        Serial.println(mr.getCurrentUri());
-        source.clear();
-        source.addURL(mr.getCurrentUri());
-      }
+      Serial.println(mr.getCurrentUri());
+      source.clear();
+      source.addURL(mr.getCurrentUri());
+      source.setTimeoutAutoNext(1000);
+      player.begin(0, false);
       break;
     case MediaEvent::PLAY:
       Serial.println("Event: PLAY");
-      if (is_paused) player.setActive(true);
-      else player.begin();
+      player.setActive(true);
       break;
     case MediaEvent::STOP:
       Serial.println("Event: STOP");
-      is_paused = false;
       player.end();
+      url.end();
       break;
     case MediaEvent::PAUSE:
       Serial.println("Event: PAUSE");
       player.setActive(false);
-      is_paused = true;
       break;
     case MediaEvent::SET_VOLUME:
       Serial.print("Event: SET_VOLUME ");
@@ -77,7 +77,6 @@ void handleMediaEvent(MediaEvent ev, DLNAMediaRenderer<WiFiClient>& mr) {
   }
 }
 
-// start WiFi
 void setupWifi() {
   WiFi.begin(ssid, password);
   WiFi.setSleep(false);
@@ -106,6 +105,7 @@ void setup() {
 
   // configure player: EOF handling
   player.setOnEOFCallback(onEOF);
+  player.setAutoNext(false);
 
   // start I2S
   i2s.begin();
@@ -119,12 +119,11 @@ void setup() {
     Serial.println("MediaRenderer failed to start");
   }
 
-  // DLNA processing in separate task
   dlna_task.begin([]() {
     media_renderer.loop();
   });
 }
 
 void loop() {
-  player.copy();
+  if (player) player.copy();
 }

src/AudioTools/CoreAudio/AudioPlayer.h

@@ -438,13 +438,6 @@ class AudioPlayer : public AudioInfoSupport, public VolumeSupport {
         LOGD("copy: %d -> 0", (int)bytes);
         return 0;
       }
-      // EOF callback: when no bytes were copied, trigger once per stream
-      if (result == 0 && p_input_stream != nullptr && !eof_called) {
-        eof_called = true;
-        if (on_eof_callback != nullptr) {
-          on_eof_callback(*this);
-        }
-      }
 
       // handle sound
       result = copier.copyBytes(bytes);
@@ -603,6 +596,15 @@ class AudioPlayer : public AudioInfoSupport, public VolumeSupport {
       return;
     if (p_input_stream == nullptr || millis() > timeout) {
       if (is_auto_fade) fade.setFadeInActive(true);
+
+      // EOF callback: trigger once per stream
+      if (!eof_called) {
+        eof_called = true;
+        if (on_eof_callback != nullptr) {
+          on_eof_callback(*this);
+        }
+      }
+
       if (autonext) {
         LOGI("-> timeout - moving by %d", stream_increment);
         // open next stream

src/AudioTools/Disk/AudioSourceURL.h

@@ -112,6 +112,8 @@ class AudioSourceURL : public AudioSource {
     return actual_stream->setMetadataCallback(fn);
   }
 
+  virtual int size() { return max; }
+
  protected:
   AbstractURLStream* actual_stream = nullptr;
   const char** urlArray = nullptr;
@@ -128,7 +130,6 @@ class AudioSourceURL : public AudioSource {
     return urlArray[pos];
   }
 
-  virtual int size() { return max; }
 };
 
 /**
@@ -166,12 +167,13 @@ class AudioSourceDynamicURL : public AudioSourceURL {
 
   void clear() { url_vector.clear(); }
 
- protected:
+  int size() override { return url_vector.size(); }
+
+  protected:
   Vector<Str> url_vector;
 
   const char* value(int pos) override { return url_vector[pos].c_str(); }
 
-  int size() override { return url_vector.size(); }
 };
 
 }  // namespace audio_tools