From 40dcca0e8d3c4f7f5bea28e5a605d80b9d2e391f Mon Sep 17 00:00:00 2001 From: Jason T Alborough Date: Fri, 10 Aug 2018 18:56:09 -0400 Subject: [PATCH] Minor changes for HDCP support. Not yet complete. --- PepperDashEssentials/Bridges/EssentialDM.cs | 6 ++++-- essentials-framework | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/PepperDashEssentials/Bridges/EssentialDM.cs b/PepperDashEssentials/Bridges/EssentialDM.cs index 48f204e5..34d9cc62 100644 --- a/PepperDashEssentials/Bridges/EssentialDM.cs +++ b/PepperDashEssentials/Bridges/EssentialDM.cs @@ -54,14 +54,16 @@ namespace PepperDash.Essentials { ApiEisc.Eisc.SetUShortSigAction(ApiMap.OutputVideoRoutes[tempX], u => DmSwitch.ExecuteSwitch(u, tempX, eRoutingSignalType.Video)); ApiEisc.Eisc.SetUShortSigAction(ApiMap.OutputAudioRoutes[tempX], u => DmSwitch.ExecuteSwitch(u, tempX, eRoutingSignalType.Audio)); + if (DmSwitch.TxDictionary.ContainsKey(tempX)) { Debug.Console(2, "Creating Tx Feedbacks {0}", tempX); var TxKey = DmSwitch.TxDictionary[tempX]; var TxDevice = DeviceManager.GetDeviceForKey(TxKey) as DmTxControllerBase; TxDevice.IsOnline.LinkInputSig(ApiEisc.Eisc.BooleanInput[ApiMap.TxOnlineStatus[tempX]]); TxDevice.AnyVideoInput.VideoStatus.VideoSyncFeedback.LinkInputSig(ApiEisc.Eisc.BooleanInput[ApiMap.TxVideoSyncStatus[tempX]]); - ApiEisc.Eisc.SetUShortSigAction(901, u => TxDevice.SetHdcpSupport((eHdcpSupportMode)(u))); - } else { + ApiEisc.Eisc.SetUShortSigAction(901, u => TxDevice.SetHdcpSupport((ePdtHdcpSupport)(u))); + } + else { DmSwitch.VideoInputSyncFeedbacks[tempX].LinkInputSig(ApiEisc.Eisc.BooleanInput[ApiMap.TxVideoSyncStatus[tempX]]); } if (DmSwitch.RxDictionary.ContainsKey(tempX)) { diff --git a/essentials-framework b/essentials-framework index 69bb8bca..095b99e4 160000 --- a/essentials-framework +++ b/essentials-framework @@ -1 +1 @@ -Subproject commit 69bb8bcabd299e0491b1459e9d4e9b31417a4c49 +Subproject commit 095b99e432e41f8db97c382c3ebd5125e52f1aa4