Porting modifications introduced in PR openhab#15121

Signed-off-by: clinique <[email protected]>
clinique · Jun 22, 2023 · 2e862a0 · 2e862a0
1 parent f57f7d3
commit 2e862a0
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 23 deletions.
diff --git a/....freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/api/rest/HomeManager.java b/....freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/api/rest/HomeManager.java
@@ -60,7 +60,7 @@ private static enum DisplayType {
         UNKNOWN;
     }
 
-    private static record EndpointValue<T> (T value) {
+    private static record EndpointValue<T>(T value) {
     }
 
     private static record EndpointUi(AccessType access, DisplayType display, String iconUrl, @Nullable String unit) {

diff --git a/....freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/handler/AirMediaSink.java b/....freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/handler/AirMediaSink.java
@@ -27,10 +27,12 @@
 import org.openhab.binding.freeboxos.internal.api.rest.MediaReceiverManager.MediaType;
 import org.openhab.core.audio.AudioFormat;
 import org.openhab.core.audio.AudioHTTPServer;
-import org.openhab.core.audio.AudioSink;
+import org.openhab.core.audio.AudioSinkAsync;
 import org.openhab.core.audio.AudioStream;
-import org.openhab.core.audio.FixedLengthAudioStream;
+import org.openhab.core.audio.StreamServed;
 import org.openhab.core.audio.URLAudioStream;
+import org.openhab.core.audio.UnsupportedAudioFormatException;
+import org.openhab.core.audio.UnsupportedAudioStreamException;
 import org.openhab.core.library.types.PercentType;
 import org.openhab.core.thing.ThingStatus;
 import org.slf4j.Logger;
@@ -43,7 +45,7 @@
  * @author Gaël L'hopital - Initial contribution
  */
 @NonNullByDefault
-public class AirMediaSink implements AudioSink {
+public class AirMediaSink extends AudioSinkAsync {
     private static final Set<Class<? extends AudioStream>> SUPPORTED_STREAMS = Set.of(AudioStream.class);
     private static final Set<AudioFormat> BASIC_FORMATS = Set.of(WAV, OGG);
     private static final Set<AudioFormat> ALL_MP3_FORMATS = Set.of(
@@ -107,33 +109,46 @@ public String getId() {
     }
 
     @Override
-    public void process(@Nullable AudioStream audioStream) {
-        try {
-            if (thingHandler.getThing().getStatus() == ThingStatus.ONLINE) {
+    protected void processAsynchronously(@Nullable AudioStream audioStream)
+            throws UnsupportedAudioFormatException, UnsupportedAudioStreamException {
+        if (thingHandler.getThing().getStatus() == ThingStatus.ONLINE) {
+            try {
                 MediaReceiverManager manager = thingHandler.getManager(MediaReceiverManager.class);
                 if (audioStream == null) {
                     manager.sendToReceiver(playerName, password, Action.STOP, MediaType.VIDEO);
-                } else {
-                    String url = null;
-                    if (audioStream instanceof URLAudioStream) {
-                        // it is an external URL, we can access it directly
-                        url = ((URLAudioStream) audioStream).getURL();
-                    } else {
-                        // we serve it on our own HTTP server
-                        url = callbackUrl + (audioStream instanceof FixedLengthAudioStream
-                                ? audioHTTPServer.serve((FixedLengthAudioStream) audioStream, 20)
-                                : audioHTTPServer.serve(audioStream));
-                    }
-                    logger.debug("AirPlay audio sink: process url {}", url);
-                    manager.sendToReceiver(playerName, password, Action.STOP, MediaType.VIDEO);
-                    manager.sendToReceiver(playerName, password, Action.START, MediaType.VIDEO, url);
+                    return;
+                }
+
+                if (audioStream instanceof URLAudioStream urlAudioStream) {
+                    // it is an external URL, we can access it directly
+                    logger.debug("AirPlay audio sink: process url {}", urlAudioStream.getURL());
+                    playMedia(manager, urlAudioStream.getURL());
+                    return;
                 }
+                // we serve it on our own HTTP server
+                StreamServed streamServed = audioHTTPServer.serve(audioStream, 20, true);
+                streamServed.playEnd().thenRun(() -> this.playbackFinished(audioStream));
+                logger.debug("AirPlay audio sink: process url {}", callbackUrl + streamServed.url());
+                playMedia(manager, callbackUrl + streamServed.url());
+                try {
+                    audioStream.close();
+                } catch (IOException e) {
+                    logger.debug("Exception while closing audioStream", e);
+                }
+            } catch (FreeboxException e) {
+                logger.warn("Audio stream playback failed: {}", e.getMessage());
+            } catch (IOException e) {
+                throw new UnsupportedAudioStreamException("AirPlay device can only handle clonable audio streams.",
+                        audioStream.getClass(), e);
             }
-        } catch (FreeboxException e) {
-            logger.warn("Audio stream playback failed: {}", e.getMessage());
         }
     }
 
+    private void playMedia(MediaReceiverManager manager, String url) throws FreeboxException {
+        manager.sendToReceiver(playerName, password, Action.STOP, MediaType.VIDEO);
+        manager.sendToReceiver(playerName, password, Action.START, MediaType.VIDEO, url);
+    }
+
     @Override
     public Set<AudioFormat> getSupportedFormats() {
         return supportedFormats;