Merge pull request #390 from PepperDash/hotfix/fix-hdcp-issues-on-specific-inputcard-types

Hotfix/fix hdcp issues on specific inputcard types

essentials-framework/Essentials DM/Essentials_DM/Chassis/DmChassisController.cs

@@ -358,8 +358,16 @@ namespace PepperDash.Essentials.DM
                             }
                             if (inputCard.Card is Dmc4kHdDspBase)
                             {
-                                InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.Hdcp2_2Support;
-                                return (int)(inputCard.Card as Dmc4kHdDspBase).HdmiInput.HdcpReceiveCapability;
+                                if (PropertiesConfig.InputSlotSupportsHdcp2[tempX])
+                                {
+                                    InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.Hdcp2_2Support;
+                                    return (int)(inputCard.Card as Dmc4kHdDspBase).HdmiInput.HdcpReceiveCapability;
+                                }
+
+                                InputCardHdcpCapabilityTypes[tempX] = eHdcpCapabilityType.HdcpAutoSupport;
+                                if ((inputCard.Card as Dmc4kHdDspBase).HdmiInput.HdcpSupportOnFeedback.BoolValue)
+                                    return 1;
+                                return 0;
                             }
 
                             if (inputCard.Card is Dmc4kCBase)
@@ -877,16 +885,15 @@ namespace PepperDash.Essentials.DM
                                 Debug.Console(1, this, "No index of {0} found in InputCardHdcpCapabilityFeedbacks");
                             break;
                         }
-                    // This case may be redundant as the case above should fire when HdcpSupport changes to on or off
-                    //case DMInputEventIds.HdcpSupportOnEventId:
-                    //    {
-                    //        Debug.Console(2, this, "DM Input {0} HdcpSupportOnEventId", args.Number);
-                    //        if (InputCardHdcpStateFeedbacks[args.Number] != null)
-                    //            InputCardHdcpStateFeedbacks[args.Number].FireUpdate();
-                    //        else
-                    //            Debug.Console(1, this, "No index of {0} found in InputCardHdcpCapabilityFeedbacks");
-                    //        break;
-                    //    }
+                    case DMInputEventIds.HdcpSupportOnEventId:
+                        {
+                            Debug.Console(2, this, "DM Input {0} HdcpSupportOnEventId", args.Number);
+                            if (InputCardHdcpStateFeedbacks[args.Number] != null)
+                                InputCardHdcpStateFeedbacks[args.Number].FireUpdate();
+                            else
+                                Debug.Console(1, this, "No index of {0} found in InputCardHdcpCapabilityFeedbacks");
+                            break;
+                        }
                     default:
                         {
                             Debug.Console(2, this, "DMInputChange fired for Input {0} with Unhandled EventId: {1}", args.Number, args.EventId);