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

Update to route correctly for DMPS3-4K

Browse Source
This commit is contained in:
Andrew Welker
2020-11-02 12:38:23 -07:00
parent d9bcaa0b1d
commit b457886ee3
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
essentials-framework/Essentials DM/Essentials_DM/Chassis/DmpsRoutingController.cs
View File

@@ -813,36 +813,42 @@ namespace PepperDash.Essentials.DM
} }
} }
DMInput inCard = input == 0 ? null : Dmps.SwitcherInputs[input] as DMInput; DMInput dmInputCard = input == 0 ? null : Dmps.SwitcherInputs[input] as DMInput;
DMOutput outCard = output == 0 ? null : Dmps.SwitcherOutputs[output] as DMOutput; DMOutput dmOutputCard = output == 0 ? null : Dmps.SwitcherOutputs[output] as DMOutput;
//if (inCard != null) //if (inCard != null)
//{ //{
// NOTE THAT BITWISE COMPARISONS - TO CATCH ALL ROUTING TYPES // NOTE THAT BITWISE COMPARISONS - TO CATCH ALL ROUTING TYPES
if ((sigType | eRoutingSignalType.Video) == eRoutingSignalType.Video) if ((sigType & eRoutingSignalType.Video) == eRoutingSignalType.Video)
{ {
//SystemControl.VideoEnter.BoolValue = true; //SystemControl.VideoEnter.BoolValue = true;
if (outCard != null) if (dmOutputCard != null)
outCard.VideoOut = inCard; dmOutputCard.VideoOut = dmInputCard;
} }
if ((sigType | eRoutingSignalType.Audio) == eRoutingSignalType.Audio) if ((sigType & eRoutingSignalType.Audio) == eRoutingSignalType.Audio)
{ {
if (outCard != null) if (dmOutputCard != null)
outCard.AudioOut = inCard; try
{
dmOutputCard.AudioOut = dmInputCard;
}
catch (NotSupportedException)
{
dmOutputCard.AudioOutSource = (eDmps34KAudioOutSource) input;
}
} }
if ((sigType | eRoutingSignalType.UsbOutput) == eRoutingSignalType.UsbOutput) if ((sigType & eRoutingSignalType.UsbOutput) == eRoutingSignalType.UsbOutput)
{ {
if (outCard != null) if (dmOutputCard != null)
outCard.USBRoutedTo = inCard; dmOutputCard.USBRoutedTo = dmInputCard;
} }
if ((sigType | eRoutingSignalType.UsbInput) == eRoutingSignalType.UsbInput) if ((sigType & eRoutingSignalType.UsbInput) == eRoutingSignalType.UsbInput)
{ {
if (inCard != null) if (dmInputCard != null)
inCard.USBRoutedTo = outCard; dmInputCard.USBRoutedTo = dmOutputCard;
} }
//} //}
//else //else