Adds digital audio output volume control for DMPS to bridge

essentials-framework/Essentials Core/PepperDashEssentialsBase/Bridges/JoinMaps/DmpsAudioOutputControllerJoinMap.cs

@@ -17,6 +17,10 @@ namespace PepperDash.Essentials.Core.Bridges
         public JoinDataComplete MixerPresetRecall = new JoinDataComplete(new JoinData { JoinNumber = 3, JoinSpan = 1 },
             new JoinMetadata { Description = "Mixer Preset Recall Set", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
 
+        [JoinName("MixerEqPresetRecall")]
+        public JoinDataComplete MixerEqPresetRecall = new JoinDataComplete(new JoinData { JoinNumber = 4, JoinSpan = 1 },
+            new JoinMetadata { Description = "Mixer Eq Preset Recall Set", JoinCapabilities = eJoinCapabilities.FromSIMPL, JoinType = eJoinType.Analog });
+
         [JoinName("MasterVolumeMuteOn")]
         public JoinDataComplete MasterVolumeMuteOn = new JoinDataComplete(new JoinData { JoinNumber = 1, JoinSpan = 1 },
             new JoinMetadata { Description = "Master Volume Mute On Set / Get", JoinCapabilities = eJoinCapabilities.ToFromSIMPL, JoinType = eJoinType.Digital });

essentials-framework/Essentials DM/Essentials_DM/Chassis/DmpsAudioOutputController.cs

@@ -33,36 +33,44 @@ namespace PepperDash.Essentials.DM
             : base(key, name)
         {
             OutputCard = card;
-
             OutputCard.BaseDevice.DMOutputChange += new DMOutputEventHandler(BaseDevice_DMOutputChange);
 
+            SourceVolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Source);
+            MicsMasterVolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.MicsMaster);
+
             if (card is Card.Dmps3ProgramOutput)
             {
-                MasterVolumeLevel = new DmpsAudioOutputWithMixer(card, eDmpsLevelType.Master, (card as Card.Dmps3ProgramOutput).OutputMixer);
+                var output = card as Card.Dmps3ProgramOutput;
-                SourceVolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Source);
+                MasterVolumeLevel = new DmpsAudioOutputWithMixerAndEq(card, eDmpsLevelType.Master, output.OutputMixer, output.OutputEqualizer);
-                MicsMasterVolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.MicsMaster);
                 Codec1VolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Codec1);
                 Codec2VolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Codec2);
             }
             else if (card is Card.Dmps3Aux1Output)
             {
-                MasterVolumeLevel = new DmpsAudioOutputWithMixer(card, eDmpsLevelType.Master, (card as Card.Dmps3Aux1Output).OutputMixer);
+                var output = card as Card.Dmps3Aux1Output;
-                SourceVolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Source);
+                MasterVolumeLevel = new DmpsAudioOutputWithMixerAndEq(card, eDmpsLevelType.Master, output.OutputMixer, output.OutputEqualizer);
-                MicsMasterVolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.MicsMaster);
                 Codec2VolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Codec2);
             }
             else if (card is Card.Dmps3Aux2Output)
             {
-                MasterVolumeLevel = new DmpsAudioOutputWithMixer(card, eDmpsLevelType.Master, (card as Card.Dmps3Aux2Output).OutputMixer);
+                var output = card as Card.Dmps3Aux2Output;
-                SourceVolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Source);
+                MasterVolumeLevel = new DmpsAudioOutputWithMixerAndEq(card, eDmpsLevelType.Master, output.OutputMixer, output.OutputEqualizer);
-                MicsMasterVolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.MicsMaster);
                 Codec1VolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Codec1);
             }
-            else //Digital Outputs
+            else if (card is Card.Dmps3DigitalMixOutput)
             {
-                MasterVolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Master);
+                var output = card as Card.Dmps3DigitalMixOutput;
-                SourceVolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.Source);
+                MasterVolumeLevel = new DmpsAudioOutputWithMixer(card, eDmpsLevelType.Master, output.OutputMixer);
-                MicsMasterVolumeLevel = new DmpsAudioOutput(card, eDmpsLevelType.MicsMaster);
+            }
+            else if (card is Card.Dmps3HdmiOutput)
+            {
+                var output = card as Card.Dmps3HdmiOutput;
+                MasterVolumeLevel = new DmpsAudioOutputWithMixer(card, eDmpsLevelType.Master, output.OutputMixer);
+            }
+            else if (card is Card.Dmps3DmOutput)
+            {
+                var output = card as Card.Dmps3DmOutput;
+                MasterVolumeLevel = new DmpsAudioOutputWithMixer(card, eDmpsLevelType.Master, output.OutputMixer);
             }
         }
 
@@ -185,6 +193,11 @@ namespace PepperDash.Essentials.DM
                 {
                     trilist.SetUShortSigAction(joinMap.MixerPresetRecall.JoinNumber, mixer.RecallPreset);
                 }
+                var eq = MasterVolumeLevel as DmpsAudioOutputWithMixerAndEq;
+                if (eq != null)
+                {
+                    trilist.SetUShortSigAction(joinMap.MixerEqPresetRecall.JoinNumber, eq.RecallEqPreset);
+                }
             }
 
             if (SourceVolumeLevel != null)
@@ -234,11 +247,27 @@ namespace PepperDash.Essentials.DM
         }
     }
 
+    public class DmpsAudioOutputWithMixerAndEq : DmpsAudioOutputWithMixer
+    {
+        private CrestronControlSystem.Dmps3OutputEqualizer Eq;
+        public DmpsAudioOutputWithMixerAndEq(Card.Dmps3OutputBase output, eDmpsLevelType type, CrestronControlSystem.Dmps3OutputMixer mixer, CrestronControlSystem.Dmps3OutputEqualizer eq)
+            : base(output, type, mixer)
+        {
+            Eq = eq;
+        }
+
+        public void RecallEqPreset(ushort preset)
+        {
+            Eq.PresetNumber.UShortValue = preset;
+            Eq.RecallPreset();
+        }
+    }
+
     public class DmpsAudioOutputWithMixer : DmpsAudioOutput
     {
-        CrestronControlSystem.Dmps3OutputMixerWithMonoAndStereo Mixer;
+        IDmps3OutputMixer Mixer;
 
-        public DmpsAudioOutputWithMixer(Card.Dmps3OutputBase output, eDmpsLevelType type, CrestronControlSystem.Dmps3OutputMixerWithMonoAndStereo mixer)
+        public DmpsAudioOutputWithMixer(Card.Dmps3OutputBase output, eDmpsLevelType type, IDmps3OutputMixer mixer)
             : base(output, type)
         {
             Mixer = mixer;
@@ -266,23 +295,47 @@ namespace PepperDash.Essentials.DM
 
         public void RecallPreset(ushort preset)
         {
-            Debug.Console(1, "DMPS Recalling Preset {0}", preset);
+            if (Mixer is CrestronControlSystem.Dmps3OutputMixer)
-            Mixer.PresetNumber.UShortValue = preset;
+            {
-            Mixer.RecallPreset();
+                var presetMixer = Mixer as CrestronControlSystem.Dmps3OutputMixer;
+                Debug.Console(1, "DMPS Recalling Preset {0}", preset);
+                presetMixer.PresetNumber.UShortValue = preset;
+                presetMixer.RecallPreset();
+
+                //Recall startup volume for main volume level as DMPS3(non-4K) presets don't affect the main volume
+                RecallStartupVolume();
+            }
+            else if (Mixer is CrestronControlSystem.Dmps3AttachableOutputMixer)
+            {
+                var presetMixer = Mixer as CrestronControlSystem.Dmps3AttachableOutputMixer;
+                Debug.Console(1, "DMPS Recalling Preset {0}", preset);
+                presetMixer.PresetNumber.UShortValue = preset;
+                presetMixer.RecallPreset();
+            }
+
+        }
+
+        public void RecallStartupVolume()
+        {
+            ushort startupVol = Mixer.StartupVolumeFeedback.UShortValue;
+            //Reset startup vol due to bug on DMPS3 where getting the value from above method clears the startup volume
+            Mixer.StartupVolume.UShortValue = startupVol;
+            Debug.Console(1, "DMPS Recalling {0} Startup Volume {1}", Output.Name, startupVol);
+            SetVolume(startupVol);
+            MuteOff();
         }
     }
 
     public class DmpsAudioOutput : IBasicVolumeWithFeedback
     {
-        Card.Dmps3OutputBase Output;
+        private UShortInputSig Level;
-        eDmpsLevelType Type;
+        protected Card.Dmps3OutputBase Output;
-        UShortInputSig Level;
-
         private bool EnableVolumeSend;
         private ushort VolumeLevelInput;
         protected short MinLevel { get; set; }
         protected short MaxLevel { get; set; }
 
+        public eDmpsLevelType Type { get; private set; }
         public BoolFeedback MuteFeedback { get; private set; }
         public IntFeedback VolumeLevelFeedback { get; private set; }
         public IntFeedback VolumeLevelScaledFeedback { get; private set; }
@@ -411,10 +464,13 @@ namespace PepperDash.Essentials.DM
         public void SetVolumeScaled(ushort level)
         {
             Debug.Console(2, Debug.ErrorLogLevel.None, "Scaling DMPS volume:{0} level:{1} min:{2} max:{3}", Output.Name, level.ToString(), MinLevel.ToString(), MaxLevel.ToString());
-            VolumeLevelInput = (ushort)(level * (MaxLevel - MinLevel) / ushort.MaxValue + MinLevel);
+            if (ushort.MaxValue + MinLevel != 0)
-            if (EnableVolumeSend == true)
             {
-                Level.UShortValue = VolumeLevelInput;
+                VolumeLevelInput = (ushort)(level * (MaxLevel - MinLevel) / ushort.MaxValue + MinLevel);
+                if (EnableVolumeSend == true)
+                {
+                    Level.UShortValue = VolumeLevelInput;
+                }
             }
         }
 
@@ -422,7 +478,13 @@ namespace PepperDash.Essentials.DM
         {
             short signedLevel = (short)level;
             Debug.Console(2, Debug.ErrorLogLevel.None, "Scaling DMPS volume:{0} feedback:{1} min:{2} max:{3}", Output.Name, signedLevel.ToString(), MinLevel.ToString(), MaxLevel.ToString());
-            return (ushort)((signedLevel - MinLevel) * ushort.MaxValue / (MaxLevel - MinLevel));
+
+            if (MaxLevel - MinLevel != 0)
+            {
+                return (ushort)((signedLevel - MinLevel) * ushort.MaxValue / (MaxLevel - MinLevel));
+            }
+            else
+                return (ushort)MinLevel;
         }
 
         public void SendScaledVolume(bool pressRelease)

essentials-framework/Essentials DM/Essentials_DM/Chassis/DmpsRoutingController.cs

@@ -481,69 +481,76 @@ namespace PepperDash.Essentials.DM
         {
             foreach (var card in Dmps.SwitcherOutputs)
             {
-                Debug.Console(1, this, "Output Card Type: {0}", card.CardInputOutputType);
+                try
-
-                var outputCard = card as DMOutput;
-
-                if (outputCard == null)
                 {
-                    Debug.Console(1, this, "Output card {0} is not a DMOutput", card.CardInputOutputType);
+                    Debug.Console(1, this, "Output Card Type: {0}", card.CardInputOutputType);
-                    continue;
-                }
 
-                Debug.Console(1, this, "Adding Output Card Number {0} Type: {1}", outputCard.Number, outputCard.CardInputOutputType.ToString());
+                    var outputCard = card as DMOutput;
-                VideoOutputFeedbacks[outputCard.Number] = new IntFeedback(() =>
+
-                {
+                    if (outputCard == null)
-                    if (outputCard.VideoOutFeedback != null) { return (ushort)outputCard.VideoOutFeedback.Number; }
-                    return 0;
-                    ;
-                });
-                AudioOutputFeedbacks[outputCard.Number] = new IntFeedback(() =>
-                {
-                    try
                     {
-                        if (outputCard.AudioOutFeedback != null)
+                        Debug.Console(1, this, "Output card {0} is not a DMOutput", card.CardInputOutputType);
-                        {
+                        continue;
-                            return (ushort) outputCard.AudioOutFeedback.Number;
+                    }
-                        }
+
+                    Debug.Console(1, this, "Adding Output Card Number {0} Type: {1}", outputCard.Number, outputCard.CardInputOutputType.ToString());
+                    VideoOutputFeedbacks[outputCard.Number] = new IntFeedback(() =>
+                    {
+                        if (outputCard.VideoOutFeedback != null) { return (ushort)outputCard.VideoOutFeedback.Number; }
                         return 0;
-                    }
+                        ;
-                    catch (NotSupportedException)
+                    });
+                    AudioOutputFeedbacks[outputCard.Number] = new IntFeedback(() =>
                     {
-                        return (ushort) outputCard.AudioOutSourceFeedback;
+                        try
-                    }
+                        {
-                });
+                            if (outputCard.AudioOutFeedback != null)
+                            {
+                                return (ushort)outputCard.AudioOutFeedback.Number;
+                            }
+                            return 0;
+                        }
+                        catch (NotSupportedException)
+                        {
+                            return (ushort)outputCard.AudioOutSourceFeedback;
+                        }
+                    });
 
-                OutputNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
+                    OutputNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
+                    {
+                        if (outputCard.NameFeedback != null && outputCard.NameFeedback != CrestronControlSystem.NullStringOutputSig && !string.IsNullOrEmpty(outputCard.NameFeedback.StringValue))
+                        {
+                            Debug.Console(2, this, "Output Card {0} Name: {1}", outputCard.Number, outputCard.NameFeedback.StringValue);
+                            return outputCard.NameFeedback.StringValue;
+                        }
+                        return "";
+                    });
+
+                    OutputVideoRouteNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
+                    {
+                        if (outputCard.VideoOutFeedback != null && outputCard.VideoOutFeedback.NameFeedback != null)
+                        {
+                            return outputCard.VideoOutFeedback.NameFeedback.StringValue;
+                        }
+                        return NoRouteText;
+                    });
+                    OutputAudioRouteNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
+                    {
+                        if (outputCard.AudioOutFeedback != null && outputCard.AudioOutFeedback.NameFeedback != null)
+                        {
+                            return outputCard.AudioOutFeedback.NameFeedback.StringValue;
+                        }
+                        return NoRouteText;
+                    });
+
+                    OutputEndpointOnlineFeedbacks[outputCard.Number] = new BoolFeedback(() => outputCard.EndpointOnlineFeedback);
+
+                    AddOutputCard(outputCard.Number, outputCard);
+                }
+                catch (Exception ex)
                 {
-                    if (outputCard.NameFeedback != null && outputCard.NameFeedback != CrestronControlSystem.NullStringOutputSig && !string.IsNullOrEmpty(outputCard.NameFeedback.StringValue))
+                    Debug.LogError(Debug.ErrorLogLevel.Error, string.Format("DMPS Controller exception creating output card: {0}", ex));
-                    {
+                }
-                        Debug.Console(2, this, "Output Card {0} Name: {1}", outputCard.Number, outputCard.NameFeedback.StringValue);
-                        return outputCard.NameFeedback.StringValue;
-                    }
-                    return "";
-                });
-
-                OutputVideoRouteNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
-                {
-                    if (outputCard.VideoOutFeedback != null && outputCard.VideoOutFeedback.NameFeedback != null)
-                    {
-                        return outputCard.VideoOutFeedback.NameFeedback.StringValue;
-                    }
-                    return NoRouteText;
-                });
-                OutputAudioRouteNameFeedbacks[outputCard.Number] = new StringFeedback(() =>
-                {
-                    if (outputCard.AudioOutFeedback != null && outputCard.AudioOutFeedback.NameFeedback != null)
-                    {
-                        return outputCard.AudioOutFeedback.NameFeedback.StringValue;
-                    }
-                    return NoRouteText;
-                });
-
-                OutputEndpointOnlineFeedbacks[outputCard.Number] = new BoolFeedback(() => outputCard.EndpointOnlineFeedback);
-
-                AddOutputCard(outputCard.Number, outputCard);
             }
         }
 
@@ -697,6 +704,9 @@ namespace PepperDash.Essentials.DM
                 var cecPort = hdmiOutputCard.HdmiOutputPort;
 
                 AddHdmiOutputPort(number, cecPort);
+
+                var audioOutput = new DmpsAudioOutputController(string.Format("processor-digitalAudioOutput{0}", number), string.Format("Hdmi Audio Output {0}", number), outputCard as Card.Dmps3HdmiOutput);
+                DeviceManager.AddDevice(audioOutput);
             }
             else if (outputCard is Card.Dmps3HdmiOutputBackend)
             {
@@ -709,6 +719,9 @@ namespace PepperDash.Essentials.DM
             else if (outputCard is Card.Dmps3DmOutput)
             {
                 AddDmOutputPort(number);
+
+                var audioOutput = new DmpsAudioOutputController(string.Format("processor-digitalAudioOutput{0}", number), string.Format("Dm Audio Output {0}", number), outputCard as Card.Dmps3DmOutput);
+                DeviceManager.AddDevice(audioOutput);
             }
             else if (outputCard is Card.Dmps3DmOutputBackend)
             {
@@ -727,22 +740,22 @@ namespace PepperDash.Essentials.DM
                 switch (outputCard.CardInputOutputType)
                 {
                     case eCardInputOutputType.Dmps3Aux1Output:
-                    {
+                        {
-                        AddAudioOnlyOutputPort(number, "Aux1");
+                            AddAudioOnlyOutputPort(number, "Aux1");
 
-                        var aux1Output = new DmpsAudioOutputController(string.Format("processor-aux1AudioOutput"), "Program Audio Output", outputCard as Card.Dmps3Aux1Output);
+                            var aux1Output = new DmpsAudioOutputController(string.Format("processor-aux1AudioOutput"), "Program Audio Output", outputCard as Card.Dmps3Aux1Output);
 
-                        DeviceManager.AddDevice(aux1Output);
+                            DeviceManager.AddDevice(aux1Output);
-                    }
+                        }
                         break;
                     case eCardInputOutputType.Dmps3Aux2Output:
-                    {
+                        {
-                        AddAudioOnlyOutputPort(number, "Aux2");
+                            AddAudioOnlyOutputPort(number, "Aux2");
 
-                        var aux2Output = new DmpsAudioOutputController(string.Format("processor-aux2AudioOutput"), "Program Audio Output", outputCard as Card.Dmps3Aux2Output);
+                            var aux2Output = new DmpsAudioOutputController(string.Format("processor-aux2AudioOutput"), "Program Audio Output", outputCard as Card.Dmps3Aux2Output);
 
-                        DeviceManager.AddDevice(aux2Output);
+                            DeviceManager.AddDevice(aux2Output);
-                    }
+                        }
                         break;
                 }
             }
@@ -766,6 +779,10 @@ namespace PepperDash.Essentials.DM
             {
                 AddAudioOnlyOutputPort(number, "Dialer");
             }
+            else if (outputCard is Card.Dmps3AecOutput)
+            {
+                AddAudioOnlyOutputPort(number, "Aec");
+            }
             else if (outputCard is Card.Dmps3DigitalMixOutput)
             {
                 if (number == (uint)CrestronControlSystem.eDmps34K250COutputs.Mix1
@@ -776,10 +793,9 @@ namespace PepperDash.Essentials.DM
                     || number == (uint)CrestronControlSystem.eDmps34K300COutputs.Mix2
                     || number == (uint)CrestronControlSystem.eDmps34K350COutputs.Mix2)
                     AddAudioOnlyOutputPort(number, CrestronControlSystem.eDmps34K250COutputs.Mix2.ToString());
-            }
+
-            else if (outputCard is Card.Dmps3AecOutput)
+                var audioOutput = new DmpsAudioOutputController(string.Format("processor-digitalAudioOutput{0}", number % 2 + 1), string.Format("Digital Audio Output {0}", number % 2 + 1), outputCard as Card.Dmps3DigitalMixOutput);
-            {
+                DeviceManager.AddDevice(audioOutput);
-                AddAudioOnlyOutputPort(number, "Aec");
             }
             else
             {