experiment playing stream on InternalAudio and WebAudio sink

Signed-off-by: Laurent ARNAL <laurent@clae.net>

Author: lo92fr

bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/javasound/JavaSoundAudioSinkImpl.java

@@ -145,6 +145,11 @@ private void playInThread(final AudioStream audioStream, boolean store) throws J
         threadFactory.newThread(() -> {
             try {
                 streamPlayerFinal.play();
+
+                while (!streamPlayerFinal.isComplete()) {
+                    int pos = streamPlayerFinal.getPosition();
+                    Thread.sleep(1000);
+                }
             } catch (Exception e) {
                 logger.error("An exception occurred while playing audio : '{}'", e.getMessage());
             } finally {
@@ -179,17 +184,17 @@ public String getId() {
 
     @Override
     public @Nullable String getLabel(@Nullable Locale locale) {
-        return "System Speaker";
+        return "Internal Audio";
     }
 
     @Override
     public String getName() {
-        return "SystemSpeaker";
+        return "internalaudio";
     }
 
     @Override
     public String getBinding() {
-        return "core.audio";
+        return "audio";
     }
 
     @Override

bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/internal/webaudio/WebAudioAudioSinkImpl.java

@@ -110,12 +110,12 @@ public String getId() {
 
     @Override
     public String getName() {
-        return "WebAudio";
+        return "webaudio";
     }
 
     @Override
     public String getBinding() {
-        return "core.audio";
+        return "audio";
     }
 
     @Override

bundles/org.openhab.core.io.rest.media/src/main/java/org/openhab/core/io/rest/media/internal/MediaResource.java

@@ -51,6 +51,7 @@
 import org.openhab.core.media.model.MediaTrack;
 import org.openhab.core.thing.ChannelUID;
 import org.openhab.core.thing.Thing;
+import org.openhab.core.thing.ThingUID;
 import org.openhab.core.thing.link.ItemChannelLinkRegistry;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -252,18 +253,28 @@ public Response getSinks(
             MediaSinkDTO dto = new MediaSinkDTO(device.getName(), "" + device.getLabel(null), device.getType(),
                     device.getBinding());
 
-            if (device.getType() == "internal") {
-                dto.setPlayerItemName("internal");
-            }
-
+            logger.info("");
             for (Item item : colItem) {
                 Set<ChannelUID> r1 = itemChannelLinkRegistry.getBoundChannels(item.getName());
+                Set<Thing> r2 = itemChannelLinkRegistry.getBoundThings(item.getName());
+
                 for (ChannelUID ruid : r1) {
-                    if ((ruid.getBindingId().equals(device.getBinding())
-                            && ruid.getThingUID().getId().equals(device.getName()))) {
+                    ThingUID uid = ruid.getThingUID();
+
+                    if (ruid.getBindingId().equals(device.getBinding()) && uid.getId().equals(device.getName())) {
                         dto.setPlayerItemName(item.getName());
                     }
                 }
+
+                if ("".equals(dto.getPlayerItemName())) {
+                    for (Thing thing : r2) {
+                        if (thing.getThingTypeUID().getBindingId().equals(device.getBinding())
+                                && thing.getThingTypeUID().getId().equals(device.getName())) {
+                            dto.setPlayerItemName(item.getName());
+                        }
+                    }
+                }
+
             }
             dtoCol.addMediaSinkDTO(dto);
         }

bundles/org.openhab.core.io.rest.media/src/main/java/org/openhab/core/io/rest/media/internal/MediaSinkDTO.java

@@ -52,7 +52,7 @@ public String getBinding() {
     }
 
     public String getPlayerItemName() {
-        return this.getPlayerItemName();
+        return this.playerItemName;
     }
 
     public void setPlayerItemName(String playerItemName) {