From 60ed2ea537fba9db0c750ba68e7901962777edcf Mon Sep 17 00:00:00 2001 From: Alex Johnson Date: Tue, 11 Jan 2022 15:26:39 -0500 Subject: [PATCH] Fixes DMPS preset recall. Adds event to catch vumeter event ID and exit (can spam the event handler) --- .../Essentials_DM/Chassis/DmpsAudioOutputController.cs | 5 +++-- .../Essentials_DM/Chassis/DmpsRoutingController.cs | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmpsAudioOutputController.cs b/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmpsAudioOutputController.cs index 4f8d8f02..751c1a5a 100644 --- a/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmpsAudioOutputController.cs +++ b/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmpsAudioOutputController.cs @@ -74,7 +74,7 @@ namespace PepperDash.Essentials.DM case DMOutputEventIds.OutputVuFeedBackEventId: { //Frequently called event that isn't needed - break; + return; } case DMOutputEventIds.MasterVolumeFeedBackEventId: { @@ -183,7 +183,7 @@ namespace PepperDash.Essentials.DM var mixer = MasterVolumeLevel as DmpsAudioOutputWithMixer; if (mixer != null) { - trilist.SetUShortSigAction(3, mixer.RecallPreset); + trilist.SetUShortSigAction(joinMap.MixerPresetRecall.JoinNumber, mixer.RecallPreset); } } @@ -266,6 +266,7 @@ namespace PepperDash.Essentials.DM public void RecallPreset(ushort preset) { + Debug.Console(1, "DMPS Recalling Preset {0}", preset); Mixer.PresetNumber.UShortValue = preset; Mixer.RecallPreset(); } diff --git a/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmpsRoutingController.cs b/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmpsRoutingController.cs index bf72afdf..e3ded3e3 100644 --- a/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmpsRoutingController.cs +++ b/essentials-framework/Essentials DM/Essentials_DM/Chassis/DmpsRoutingController.cs @@ -895,6 +895,12 @@ namespace PepperDash.Essentials.DM { Debug.Console(2, this, "DMOutputChange Output: {0} EventId: {1}", args.Number, args.EventId.ToString()); + if (args.EventId == DMOutputEventIds.OutputVuFeedBackEventId) + { + //Frequently called event that isn't needed + return; + } + var output = args.Number; DMOutput outputCard = Dmps.SwitcherOutputs[output] as DMOutput;