pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-02-15 20:54:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

HDCP Disable in from config

Browse Source
This commit is contained in:
Heath Volmer
2018-02-07 13:55:56 -07:00
parent 53ee87c9be
commit 88e82fb398
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Essentials DM/Essentials_DM/Chassis/HdMdNxM4kEController.cs
View File

@@ -49,7 +49,9 @@ namespace PepperDash.Essentials.DM.Chassis
{ {
foreach (var kvp in props.Inputs) foreach (var kvp in props.Inputs)
{ {
var inputNum = Convert.ToUInt32(kvp.Key); // strip "hdmiIn"
Debug.Console(0, "**************** {0}", kvp.Key);
var inputNum = Convert.ToUInt32(kvp.Key.Substring(6));
var port = chassis.HdmiInputs[inputNum].HdmiInputPort; var port = chassis.HdmiInputs[inputNum].HdmiInputPort;
// set hdcp disables // set hdcp disables

5
Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
View File

@@ -987,7 +987,6 @@ namespace PepperDash.Essentials
void SetupSourceList() void SetupSourceList()
{ {
var inCall = CurrentRoom.InCallFeedback.BoolValue; var inCall = CurrentRoom.InCallFeedback.BoolValue;
Debug.Console(0, "**** REDRAWING SOURCES InCall={0}", inCall);
var config = ConfigReader.ConfigObject.SourceLists; var config = ConfigReader.ConfigObject.SourceLists;
if (config.ContainsKey(_CurrentRoom.SourceListKey)) if (config.ContainsKey(_CurrentRoom.SourceListKey))
{ {
@@ -1000,11 +999,9 @@ namespace PepperDash.Essentials
var srcConfig = kvp.Value; var srcConfig = kvp.Value;
// Skip sources marked as not included, and filter list of non-sharable sources when in call // Skip sources marked as not included, and filter list of non-sharable sources when in call
// or on share screen // or on share screen
Debug.Console(0, "*** Source list item: {0}", Newtonsoft.Json.JsonConvert.SerializeObject(srcConfig)); if (!srcConfig.IncludeInSourceList || (inCall && srcConfig.DisableCodecSharing)
if (!srcConfig.IncludeInSourceList || (inCall && srcConfig.DisableCodecSharing)
|| this.CurrentMode == UiDisplayMode.Call && srcConfig.DisableCodecSharing) || this.CurrentMode == UiDisplayMode.Call && srcConfig.DisableCodecSharing)
{ {
Debug.Console(0, "**** SKIPPING {0} IN SOURCE LIST", kvp.Key);
continue; continue;
} }

BIN
Release Package/PepperDashEssentials.cpz
View File

Binary file not shown.