[oppo] Fix Play Mode and Disc Type updates (#12066)

* Fix Play Mode and Disc Type updates

Signed-off-by: Michael Lobstein <michael.lobstein@gmail.com>

diff --git a/bundles/org.openhab.binding.oppo/README.md b/bundles/org.openhab.binding.oppo/README.md
index 4428152bf0884fff664a1e986e266de53b008033..e4a8abea77f5e6324460a398cdd15881888d3c1a 100644 (file)
--- a/bundles/org.openhab.binding.oppo/README.md
+++ b/bundles/org.openhab.binding.oppo/README.md
@@ -279,7 +279,8 @@ M3D 3D Show/hide the 2D-to-3D Conversion or 3D adjustment menu
 SEH Display the Picture Adjustment menu  
 DRB Display the Darbee Adjustment menu  
 
-#### Extra buttons on UDP models:  
+#### Extra buttons on UDP models:
+
 HDR Display the HDR selection menu  
 INH Show on-screen detailed information  
 RLH Set resolution to Auto  

diff --git a/bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/OppoBindingConstants.java b/bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/OppoBindingConstants.java
index bddcf573a9339f6bd79bb3e19cf82c8723d68537..d02354c3e7b885e326912891914729f75acbc8b0 100644 (file)
--- a/bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/OppoBindingConstants.java
+++ b/bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/OppoBindingConstants.java
@@ -119,6 +119,7 @@ public class OppoBindingConstants {
     public static final String QHD = "QHD";
     public static final String QHR = "QHR";
 
+    public static final String UNKNOW_DISC = "UNKNOW-DISC";
     public static final String NO_DISC = "NO DISC";
     public static final String LOADING = "LOADING";
     public static final String OPEN = "OPEN";

diff --git a/bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/communication/OppoStatusCodes.java b/bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/communication/OppoStatusCodes.java
index b2154ea3bcc7fc4b1db2e4dfb99085bc0c441d0f..19fb4a1d75e5af97219b5e12cfd078db0e6a6938 100644 (file)
--- a/bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/communication/OppoStatusCodes.java
+++ b/bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/communication/OppoStatusCodes.java
@@ -12,6 +12,9 @@
  */
 package org.openhab.binding.oppo.internal.communication;
 
+import static java.util.Map.entry;
+import static org.openhab.binding.oppo.internal.OppoBindingConstants.*;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -54,4 +57,16 @@ public class OppoStatusCodes {
         ZOOM_MODE.put("11", "1/3");
         ZOOM_MODE.put("12", "1/4");
     }
+
+    // map to lookup disc type
+    public static final Map<String, String> DISC_TYPE = Map.ofEntries(entry("BDMV", "BD-MV"),
+            entry("DVDV", "DVD-VIDEO"), entry("DVDA", "DVD-AUDIO"), entry("SACD", "SACD"), entry("CDDA", "CDDA"),
+            entry("HDCD", "HDCD"), entry("DATA", "DATA-DISC"), entry("VCD2", "VCD2"), entry("SVCD", "SVCD"),
+            entry("UHBD", "UHBD"), entry("UNKN", UNKNOW_DISC));
+
+    // map to lookup playback status
+    public static final Map<String, String> PLAYBACK_STATUS = Map.ofEntries(entry("DISC", "NO DISC"),
+            entry("LOAD", "LOADING"), entry("OPEN", "OPEN"), entry("CLOS", "CLOSE"), entry("PLAY", "PLAY"),
+            entry("PAUS", "PAUSE"), entry("STOP", "STOP"), entry("HOME", "HOME MENU"), entry("MCTR", "MEDIA CENTER"),
+            entry("SCSV", "SCREEN SAVER"), entry("MENU", "DISC MENU"));
 }

diff --git a/bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/handler/OppoHandler.java b/bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/handler/OppoHandler.java
index 2cc7bfd0d9cd705dd9603ea70f0ff8fd20a19f75..53675a7691eb10bb897f6df0cb752cf24446e4d1 100644 (file)
--- a/bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/handler/OppoHandler.java
+++ b/bundles/org.openhab.binding.oppo/src/main/java/org/openhab/binding/oppo/internal/handler/OppoHandler.java
@@ -456,11 +456,6 @@ public class OppoHandler extends BaseThingHandler implements OppoMessageEventLis
                         // example: 0 BD-PLAYER, split off just the number
                         updateChannelState(CHANNEL_SOURCE, updateData.split(SPACE)[0]);
                         break;
-                    case UPL:
-                        // we got the playback status update, throw it away and call the query because the text output
-                        // is better
-                        connector.sendCommand(OppoCommand.QUERY_PLAYBACK_STATUS);
-                        break;
                     case QTK:
                         // example: 02/10, split off both numbers
                         String[] track = updateData.split(SLASH);
@@ -477,10 +472,17 @@ public class OppoHandler extends BaseThingHandler implements OppoMessageEventLis
                             updateChannelState(CHANNEL_TOTAL_CHAPTER, chapter[1]);
                         }
                         break;
+                    case UPL:
                     case QPL:
+                        // try to normalize the slightly different responses between UPL and QPL
+                        String playStatus = OppoStatusCodes.PLAYBACK_STATUS.get(updateData);
+                        if (playStatus == null) {
+                            playStatus = updateData;
+                        }
+
                         // if playback has stopped, we have to zero out Time, Title and Track info and so on manually
-                        if (NO_DISC.equals(updateData) || LOADING.equals(updateData) || OPEN.equals(updateData)
-                                || CLOSE.equals(updateData) || STOP.equals(updateData)) {
+                        if (NO_DISC.equals(playStatus) || LOADING.equals(playStatus) || OPEN.equals(playStatus)
+                                || CLOSE.equals(playStatus) || STOP.equals(playStatus)) {
                             updateChannelState(CHANNEL_CURRENT_TITLE, ZERO);
                             updateChannelState(CHANNEL_TOTAL_TITLE, ZERO);
                             updateChannelState(CHANNEL_CURRENT_CHAPTER, ZERO);
@@ -489,15 +491,21 @@ public class OppoHandler extends BaseThingHandler implements OppoMessageEventLis
                             updateChannelState(CHANNEL_AUDIO_TYPE, UNDEF);
                             updateChannelState(CHANNEL_SUBTITLE_TYPE, UNDEF);
                         }
-                        updateChannelState(CHANNEL_PLAY_MODE, updateData);
+                        updateChannelState(CHANNEL_PLAY_MODE, playStatus);
+
+                        // ejecting the disc does not produce a UDT message, so clear disc type manually
+                        if (OPEN.equals(playStatus) || NO_DISC.equals(playStatus)) {
+                            updateChannelState(CHANNEL_DISC_TYPE, UNKNOW_DISC);
+                            currentDiscType = BLANK;
+                        }
 
                         // if switching to play mode and not a CD then query the subtitle type...
                         // because if subtitles were on when playback stopped, they got nulled out above
                         // and the subtitle update message ("UST") is not sent when play starts like it is for audio
-                        if (PLAY.equals(updateData) && !CDDA.equals(currentDiscType)) {
+                        if (PLAY.equals(playStatus) && !CDDA.equals(currentDiscType)) {
                             connector.sendCommand(OppoCommand.QUERY_SUBTITLE_TYPE);
                         }
-                        currentPlayMode = updateData;
+                        currentPlayMode = playStatus;
                         break;
                     case QRP:
                         updateChannelState(CHANNEL_REPEAT_MODE, updateData);
@@ -506,16 +514,17 @@ public class OppoHandler extends BaseThingHandler implements OppoMessageEventLis
                         updateChannelState(CHANNEL_ZOOM_MODE, updateData);
                         break;
                     case UDT:
-                        // we got the disc type status update, throw it away
-                        // and call the query because the text output is better
-                        connector.sendCommand(OppoCommand.QUERY_DISC_TYPE);
                     case QDT:
-                        currentDiscType = updateData;
-                        updateChannelState(CHANNEL_DISC_TYPE, updateData);
+                        // try to normalize the slightly different responses between UDT and QDT
+                        final String discType = OppoStatusCodes.DISC_TYPE.get(updateData);
+                        currentDiscType = (discType != null ? discType : updateData);
+                        updateChannelState(CHANNEL_DISC_TYPE, currentDiscType);
                         break;
                     case UAT:
                         // we got the audio type status update, throw it away
                         // and call the query because the text output is better
+                        // wait before sending the command to give the player time to catch up
+                        Thread.sleep(SLEEP_BETWEEN_CMD_MS);
                         connector.sendCommand(OppoCommand.QUERY_AUDIO_TYPE);
                         break;
                     case QAT:
@@ -524,6 +533,8 @@ public class OppoHandler extends BaseThingHandler implements OppoMessageEventLis
                     case UST:
                         // we got the subtitle type status update, throw it away
                         // and call the query because the text output is better
+                        // wait before sending the command to give the player time to catch up
+                        Thread.sleep(SLEEP_BETWEEN_CMD_MS);
                         connector.sendCommand(OppoCommand.QUERY_SUBTITLE_TYPE);
                         break;
                     case QST:
@@ -563,7 +574,7 @@ public class OppoHandler extends BaseThingHandler implements OppoMessageEventLis
                         logger.debug("onNewMessageEvent: unhandled key {}, value: {}", key, updateData);
                         break;
                 }
-            } catch (OppoException e) {
+            } catch (OppoException | InterruptedException e) {
                 logger.debug("Exception processing event from player: {}", e.getMessage());
             }
         }