From e623c482a93ed7e9230778316eb210cf14a820a4 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Wed, 22 Mar 2023 11:37:28 -0600 Subject: [PATCH] refactor: modify feedback for HDCP capability --- .../Endpoints/Transmitters/DmTx4kz302CController.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx4kz302CController.cs b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx4kz302CController.cs index 63343522..4d77a7fc 100644 --- a/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx4kz302CController.cs +++ b/essentials-framework/Essentials DM/Essentials_DM/Endpoints/Transmitters/DmTx4kz302CController.cs @@ -146,9 +146,11 @@ namespace PepperDash.Essentials.DM */ //yeah this is gross - but it's the quickest way to do this... - HdcpStateFeedback = new IntFeedback(() => Math.Max((int) tx.DisplayPortInput.HdcpCapabilityFeedback, - Math.Max((int) tx.HdmiInputs[1].HdcpCapabilityFeedback, - (int) tx.HdmiInputs[2].HdcpCapabilityFeedback))); + HdcpStateFeedback = new IntFeedback(() => { + var states = new[] {(int) tx.DisplayPortInput.HdcpCapabilityFeedback, (int) tx.HdmiInputs[1].HdcpCapabilityFeedback, (int) tx.HdmiInputs[2].HdcpCapabilityFeedback}; + + return states.Max(); + }); HdcpSupportCapability = eHdcpCapabilityType.Hdcp2_2Support; @@ -158,7 +160,6 @@ namespace PepperDash.Essentials.DM DisplayPortVideoSyncFeedback = new BoolFeedback(() => (bool)tx.DisplayPortInput.SyncDetectedFeedback.BoolValue); - var combinedFuncs = new VideoStatusFuncsWrapper { HdcpActiveFeedbackFunc = () => @@ -423,8 +424,7 @@ namespace PepperDash.Essentials.DM AnyVideoInput.VideoStatus.VideoResolutionFeedback.FireUpdate(); break; } - } - + } #region IIROutputPorts Members public CrestronCollection IROutputPorts { get { return Tx.IROutputPorts; } }