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

Add check for NameSig Support

Browse Source
This commit is contained in:
Andrew Welker
2020-10-21 11:53:52 -06:00
parent 8feb7037aa
commit 36e8dc9fa5
1 changed files with 44 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -149,9 +149,8 @@ namespace PepperDash.Essentials.DM
foreach (var kvp in OutputNames) foreach (var kvp in OutputNames)
{ {
var output = (Dmps.SwitcherOutputs[kvp.Key] as DMOutput); var output = (Dmps.SwitcherOutputs[kvp.Key] as DMOutput);
if (output != null && output.Name != null) if (output != null && output.Name.Type != eSigType.NA)
{ {
output.Name.StringValue = kvp.Value; output.Name.StringValue = kvp.Value;
} }
} }
@@ -166,7 +165,7 @@ namespace PepperDash.Essentials.DM
foreach (var kvp in InputNames) foreach (var kvp in InputNames)
{ {
var input = (Dmps.SwitcherInputs[kvp.Key] as DMInput); var input = (Dmps.SwitcherInputs[kvp.Key] as DMInput);
if (input != null && input.Name != null) if (input != null && input.Name.Type != eSigType.NA)
{ {
input.Name.StringValue = kvp.Value; input.Name.StringValue = kvp.Value;
} }
@@ -331,65 +330,57 @@ namespace PepperDash.Essentials.DM
{ {
foreach (var card in Dmps.SwitcherOutputs) foreach (var card in Dmps.SwitcherOutputs)
{ {
var outputCard = card as DMOutput;
var outputCard = card as DMOutput;
if (outputCard == null)
{
continue;
}
Debug.Console(1, this, "Adding Output Card Number {0} Type: {1}", outputCard.Number, outputCard.CardInputOutputType.ToString()); Debug.Console(1, this, "Adding Output Card Number {0} Type: {1}", outputCard.Number, outputCard.CardInputOutputType.ToString());
VideoOutputFeedbacks[outputCard.Number] = new IntFeedback(() =>
if (outputCard != null)
{ {
VideoOutputFeedbacks[outputCard.Number] = new IntFeedback(() => if (outputCard.VideoOutFeedback != null) { return (ushort)outputCard.VideoOutFeedback.Number; }
{ return 0;
if (outputCard.VideoOutFeedback != null) { return (ushort)outputCard.VideoOutFeedback.Number; } ;
else { return 0; }; });
}); AudioOutputFeedbacks[outputCard.Number] = new IntFeedback(() =>
AudioOutputFeedbacks[outputCard.Number] = new IntFeedback(() => {
{ if (outputCard.AudioOutFeedback != null) { return (ushort)outputCard.AudioOutFeedback.Number; }
if (outputCard.AudioOutFeedback != null) { return (ushort)outputCard.AudioOutFeedback.Number; } return 0;
else { return 0; }; ;
}); });
OutputNameFeedbacks[outputCard.Number] = new StringFeedback(() => OutputNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
{
if (outputCard.NameFeedback != null && !string.IsNullOrEmpty(outputCard.NameFeedback.StringValue))
{ {
if (outputCard.NameFeedback != null && !string.IsNullOrEmpty(outputCard.NameFeedback.StringValue)) Debug.Console(2, this, "Output Card {0} Name: {1}", outputCard.Number, outputCard.NameFeedback.StringValue);
{ return outputCard.NameFeedback.StringValue;
Debug.Console(2, this, "Output Card {0} Name: {1}", outputCard.Number, outputCard.NameFeedback.StringValue); }
return outputCard.NameFeedback.StringValue; return "";
} });
else
{
return "";
}
});
OutputVideoRouteNameFeedbacks[outputCard.Number] = new StringFeedback(() => OutputVideoRouteNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
{
if (outputCard.VideoOutFeedback != null && outputCard.VideoOutFeedback.NameFeedback != null)
{ {
if (outputCard.VideoOutFeedback != null && outputCard.VideoOutFeedback.NameFeedback != null) return outputCard.VideoOutFeedback.NameFeedback.StringValue;
{ }
return outputCard.VideoOutFeedback.NameFeedback.StringValue; return NoRouteText;
} });
else OutputAudioRouteNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
{ {
return NoRouteText; if (outputCard.AudioOutFeedback != null && outputCard.AudioOutFeedback.NameFeedback != null)
}
});
OutputAudioRouteNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
{ {
if (outputCard.AudioOutFeedback != null && outputCard.AudioOutFeedback.NameFeedback != null) return outputCard.AudioOutFeedback.NameFeedback.StringValue;
{ }
return outputCard.AudioOutFeedback.NameFeedback.StringValue; return NoRouteText;
} });
else
{
return NoRouteText;
} OutputEndpointOnlineFeedbacks[outputCard.Number] = new BoolFeedback(() => outputCard.EndpointOnlineFeedback);
});
OutputEndpointOnlineFeedbacks[outputCard.Number] = new BoolFeedback(() => { return outputCard.EndpointOnlineFeedback; }); AddOutputCard(outputCard.Number, outputCard);
AddOutputCard(outputCard.Number, outputCard);
}
} }
} }