pepperdash/Essentials
1
0
Fork 0
mirror of https://github.com/PepperDash/Essentials.git synced 2026-04-12 03:57:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge 7c58221acc into 14f7c27b33

Browse source
This commit is contained in:
Jason T Alborough 2021-04-30 13:12:19 -06:00 • committed by GitHub
commit 3d1b8ab202
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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,