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

Fixes DMPS input name feedback on DMPS-4k. Need to check for NullStringOutputSig which was causing an exception

Browse Source
This commit is contained in:
Alex Johnson
2022-01-06 16:47:11 -05:00
parent 4650d17695
commit ce785ceb25
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
essentials-framework/Essentials DM/Essentials_DM/Chassis/DmpsAudioOutputController.cs
View File

@@ -71,6 +71,11 @@ namespace PepperDash.Essentials.DM
Debug.Console(2, this, "Dmps Audio Controller Event Output: {0} EventId: {1}", args.Number, args.EventId.ToString()); Debug.Console(2, this, "Dmps Audio Controller Event Output: {0} EventId: {1}", args.Number, args.EventId.ToString());
switch (args.EventId) switch (args.EventId)
{ {
case DMOutputEventIds.OutputVuFeedBackEventId:
{
//Frequently called event that isn't needed
break;
}
case DMOutputEventIds.MasterVolumeFeedBackEventId: case DMOutputEventIds.MasterVolumeFeedBackEventId:
{ {
MasterVolumeLevel.VolumeLevelFeedback.FireUpdate(); MasterVolumeLevel.VolumeLevelFeedback.FireUpdate();

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

@@ -224,6 +224,24 @@ namespace PepperDash.Essentials.DM
{ {
x.Value.FireUpdate(); x.Value.FireUpdate();
} }
foreach (var x in InputNameFeedbacks)
{
Debug.Console(0, this, "input {0} name update", x.Key);
x.Value.FireUpdate();
}
foreach (var x in OutputNameFeedbacks)
{
Debug.Console(0, this, "output {0} name update", x.Key);
x.Value.FireUpdate();
}
foreach (var x in OutputVideoRouteNameFeedbacks)
{
x.Value.FireUpdate();
}
foreach (var x in OutputAudioRouteNameFeedbacks)
{
x.Value.FireUpdate();
}
foreach (var x in OutputEndpointOnlineFeedbacks) foreach (var x in OutputEndpointOnlineFeedbacks)
{ {
x.Value.FireUpdate(); x.Value.FireUpdate();
@@ -548,7 +566,7 @@ namespace PepperDash.Essentials.DM
InputNameFeedbacks[inputCard.Number] = new StringFeedback(() => InputNameFeedbacks[inputCard.Number] = new StringFeedback(() =>
{ {
if (inputCard.NameFeedback != null && !string.IsNullOrEmpty(inputCard.NameFeedback.StringValue)) if (inputCard.NameFeedback != null && inputCard.NameFeedback != CrestronControlSystem.NullStringOutputSig && !string.IsNullOrEmpty(inputCard.NameFeedback.StringValue))
{ {
Debug.Console(2, this, "Input Card {0} Name: {1}", inputCard.Number, inputCard.NameFeedback.StringValue); Debug.Console(2, this, "Input Card {0} Name: {1}", inputCard.Number, inputCard.NameFeedback.StringValue);
return inputCard.NameFeedback.StringValue; return inputCard.NameFeedback.StringValue;