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 preset recall. Adds event to catch vumeter event ID and exit (can spam the event handler)

Browse Source
This commit is contained in:
Alex Johnson
2022-01-11 15:26:39 -05:00
parent 7d89f51dcf
commit 60ed2ea537
2 changed files with 9 additions and 2 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

@@ -74,7 +74,7 @@ namespace PepperDash.Essentials.DM
case DMOutputEventIds.OutputVuFeedBackEventId: case DMOutputEventIds.OutputVuFeedBackEventId:
{ {
//Frequently called event that isn't needed //Frequently called event that isn't needed
break; return;
} }
case DMOutputEventIds.MasterVolumeFeedBackEventId: case DMOutputEventIds.MasterVolumeFeedBackEventId:
{ {
@@ -183,7 +183,7 @@ namespace PepperDash.Essentials.DM
var mixer = MasterVolumeLevel as DmpsAudioOutputWithMixer; var mixer = MasterVolumeLevel as DmpsAudioOutputWithMixer;
if (mixer != null) 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) public void RecallPreset(ushort preset)
{ {
Debug.Console(1, "DMPS Recalling Preset {0}", preset);
Mixer.PresetNumber.UShortValue = preset; Mixer.PresetNumber.UShortValue = preset;
Mixer.RecallPreset(); Mixer.RecallPreset();
} }

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

@@ -895,6 +895,12 @@ namespace PepperDash.Essentials.DM
{ {
Debug.Console(2, this, "DMOutputChange Output: {0} EventId: {1}", args.Number, args.EventId.ToString()); 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; var output = args.Number;
DMOutput outputCard = Dmps.SwitcherOutputs[output] as DMOutput; DMOutput outputCard = Dmps.SwitcherOutputs[output] as DMOutput;