[sonos] Add TrueHD5.1 and normalize Atmos (#15831)

* Add TrueHD5.1 and normalize Atmos

---------

Signed-off-by: Ben Rosenblum <rosenblumb@gmail.com>

diff --git a/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/handler/ZonePlayerHandler.java b/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/handler/ZonePlayerHandler.java
index 242fc486cc13513926b557aa13d888bb6716585a..8f5a0f5e7118255999f997e8e6d3679f7a21fe6a 100644 (file)
--- a/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/handler/ZonePlayerHandler.java
+++ b/bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/handler/ZonePlayerHandler.java
@@ -1468,7 +1468,7 @@ public class ZonePlayerHandler extends BaseThingHandler implements UpnpIOPartici
                 case "59":
                 case "61":
                 case "63":
-                    codec = "dolbyAtmos";
+                    codec = "Atmos";
                     break;
                 case "33554434":
                 case "33554488":
@@ -1486,6 +1486,9 @@ public class ZonePlayerHandler extends BaseThingHandler implements UpnpIOPartici
                 case "84934714":
                     codec = "DDPlus51";
                     break;
+                case "84934716":
+                    codec = "TrueHD51";
+                    break;
                 case "84934718":
                     codec = "PCM51";
                     break;

diff --git a/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/i18n/sonos.properties b/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/i18n/sonos.properties
index 0e9c06e8e73348695610922342b392b6be18ba5f..4335c96d2b5dbaffc22c0b01db1b900d488f250c 100644 (file)
--- a/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/i18n/sonos.properties
+++ b/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/i18n/sonos.properties
@@ -91,11 +91,13 @@ channel-type.sonos.codec.description = Name of codec currently being decoded
 channel-type.sonos.codec.state.option.noSignal = No Signal
 channel-type.sonos.codec.state.option.silence = Silence
 channel-type.sonos.codec.state.option.DTS = DTS
-channel-type.sonos.codec.state.option.dolbyAtmos = Dolby Atmos
+channel-type.sonos.codec.state.option.Atmos = Dolby Atmos
 channel-type.sonos.codec.state.option.DD20 = Dolby Digital 2.0
 channel-type.sonos.codec.state.option.PCM20 = Dolby Multichannel PCM 2.0
 channel-type.sonos.codec.state.option.DD51 = Dolby Digital 5.1
+channel-type.sonos.codec.state.option.DDPlus20 = Dolby Digital Plus 2.0
 channel-type.sonos.codec.state.option.DDPlus51 = Dolby Digital Plus 5.1
+channel-type.sonos.codec.state.option.TrueHD51 = Dolby TrueHD 5.1
 channel-type.sonos.codec.state.option.PCM51 = Dolby Multichannel PCM 5.1
 channel-type.sonos.codec.state.option.DTS51 = DTS Surround 5.1
 channel-type.sonos.coordinator.label = Coordinator

diff --git a/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/thing/channels.xml
index 8eb64d848262df4ad1351b123bf73fba79acc619..d38350d33595ab5ac11dd962c8b117c5c2537ccd 100644 (file)
--- a/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/thing/channels.xml
+++ b/bundles/org.openhab.binding.sonos/src/main/resources/OH-INF/thing/channels.xml
@@ -54,12 +54,13 @@
                                <option value="noSignal">No Signal</option>
                                <option value="silence">Silence</option>
                                <option value="DTS">DTS</option>
-                               <option value="dolbyAtmos">Dolby Atmos</option>
+                               <option value="Atmos">Dolby Atmos</option>
                                <option value="DD20">Dolby Digital 2.0</option>
                                <option value="PCM20">Dolby Multichannel PCM 2.0</option>
                                <option value="DD51">Dolby Digital 5.1</option>
                                <option value="DDPlus20">Dolby Digital Plus 2.0</option>
                                <option value="DDPlus51">Dolby Digital Plus 5.1</option>
+                               <option value="TrueHD51">Dolby TrueHD 5.1</option>
                                <option value="PCM51">Dolby Multichannel PCM 5.1</option>
                                <option value="DTS51">DTS Surround 5.1</option>
                        </options>