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

Merge 9ea65883b7 into 6b7c5c01f8

Browse Source
This commit is contained in:
Jason T Alborough
2021-04-30 19:08:44 +00:00
committed by GitHub
parent 6b7c5c01f8 9ea65883b7
commit 47afc65345
1 changed files with 1398 additions and 1398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
essentials-framework/Essentials DM/Essentials_DM/Chassis/DmChassisController.cs
View File

@@ -1220,7 +1220,7 @@ namespace PepperDash.Essentials.DM
{ {
dmMdMnxn.AudioEnter.BoolValue = true; dmMdMnxn.AudioEnter.BoolValue = true;
} }
output.VideoOut = input; output.AudioOut = input;
//Chassis.Outputs[output].AudioOut = inCard; //Chassis.Outputs[output].AudioOut = inCard;
} }
@@ -1643,7 +1643,7 @@ namespace PepperDash.Essentials.DM
{ {
// Routing Control // Routing Control
trilist.SetUShortSigAction(joinMap.OutputVideo.JoinNumber + ioSlotJoin, trilist.SetUShortSigAction(joinMap.OutputVideo.JoinNumber + ioSlotJoin,
o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.Video)); o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.Video));
trilist.SetUShortSigAction(joinMap.OutputAudio.JoinNumber + ioSlotJoin, trilist.SetUShortSigAction(joinMap.OutputAudio.JoinNumber + ioSlotJoin,
o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.Audio)); o => ExecuteNumericSwitch(o, (ushort) ioSlot, eRoutingSignalType.Audio));
trilist.SetUShortSigAction(joinMap.OutputUsb.JoinNumber + ioSlotJoin, trilist.SetUShortSigAction(joinMap.OutputUsb.JoinNumber + ioSlotJoin,