Close selected plugin in mobile interface on preset change if it isn'…

…t in the new preset.
mikeoliphant · Jul 13, 2024 · 579a0b1 · 579a0b1
1 parent 7085da9
commit 579a0b1
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 7 deletions.
diff --git a/StompboxShared/Interface/DAWInterface.cs b/StompboxShared/Interface/DAWInterface.cs
@@ -200,8 +200,8 @@ public void UpdateUI()
 
             topUIStack.Children.Add(new GainPluginInterface(StompboxClient.Instance.MasterVolume));
 
-            tunerWrapper.Child = new TunerInterface(StompboxClient.Instance.PluginFactory.CreatePlugin("Tuner"));
-            audioFilePlayerWrapper.Child = new AudioFilePlayerInterface(StompboxClient.Instance.PluginFactory.CreatePlugin("AudioFilePlayer"));
+            tunerWrapper.Child = new TunerInterface(StompboxClient.Instance.Tuner);
+            audioFilePlayerWrapper.Child = new AudioFilePlayerInterface(StompboxClient.Instance.AudioPlayer);
 
             inputChainDisplay.SetChain(StompboxClient.Instance.InputPlugins);
             fxLoopDisplay.SetChain(StompboxClient.Instance.FxLoopPlugins);

diff --git a/StompboxShared/Interface/MobileInterface.cs b/StompboxShared/Interface/MobileInterface.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using UILayout;
@@ -15,6 +16,7 @@ public class MobileInterface : Dock
         PluginChainDisplay outputChainDisplay;
 
         Dock selectedPluginDock;
+        PluginInterface currentSelectedPlugin;
         UIElementWrapper selectedPluginWrapper;
 
         HorizontalStack topUIStack;
@@ -23,8 +25,6 @@ public class MobileInterface : Dock
         EnumInterface currentProgramInterface;
         TextToggleButton midiToggleButton;
         StringBuilderTextBlock dspLoadText;
-        UIElementWrapper tunerWrapper;
-        UIElementWrapper audioFilePlayerWrapper;
 
         public MobileInterface()
         {
@@ -116,15 +116,15 @@ public MobileInterface()
             {
                 ClickAction = delegate
                 {
-                    SetSelectedPlugin(new TunerInterface(StompboxClient.Instance.PluginFactory.CreatePlugin("Tuner")));
+                    SetSelectedPlugin(new TunerInterface(StompboxClient.Instance.Tuner));
                 }
             });
 
             buttonStack.Children.Add(new TextButton("Player")
             {
                 ClickAction = delegate
                 {
-                    SetSelectedPlugin(new AudioFilePlayerInterface(StompboxClient.Instance.PluginFactory.CreatePlugin("AudioFilePlayer")));
+                    SetSelectedPlugin(new AudioFilePlayerInterface(StompboxClient.Instance.AudioPlayer));
                 }
             });
 
@@ -264,6 +264,14 @@ public void UpdateUI()
             currentProgramInterface.SetEnumValues(StompboxClient.Instance.PresetNames);
             currentProgramInterface.SetSelectedIndex(StompboxClient.Instance.CurrentPresetIndex);
 
+            if (currentSelectedPlugin != null)
+            {
+                if (!StompboxClient.Instance.AllActivePlugins.Where(p => (p.ID == currentSelectedPlugin.Plugin.ID)).Any())
+                {
+                    SetSelectedPlugin(null);
+                }
+            }
+
             UpdateContentLayout();
         }
 
@@ -330,6 +338,7 @@ public void SetSelectedPlugin(PluginInterface pluginInterface)
             if (pluginInterface is TunerInterface)
                 pluginInterface.Plugin.Enabled = true;
 
+            currentSelectedPlugin = pluginInterface;
             selectedPluginWrapper.Child = pluginInterface;
 
             UpdateContentLayout();

diff --git a/StompboxShared/Interface/TunerInterface.cs b/StompboxShared/Interface/TunerInterface.cs
@@ -83,7 +83,6 @@ public TunerInterface(IAudioPlugin plugin)
 
             if (StompboxClient.Instance.InClientMode)
             {
-                plugin.Enabled = true;
                 StompboxClient.Instance.SendCommand("SetParam " + Plugin.ID + " Enabled " + (plugin.Enabled ? "1" : "0"));
             }
         }

diff --git a/StompboxShared/StompboxClient.cs b/StompboxShared/StompboxClient.cs
@@ -42,6 +42,8 @@ public IEnumerable<IAudioPlugin> AllActivePlugins
         {
             get
             {
+                yield return Tuner;
+
                 yield return InputGain;
 
                 if (Amp != null)
@@ -62,14 +64,20 @@ public IEnumerable<IAudioPlugin> AllActivePlugins
                 foreach (IAudioPlugin plugin in OutputPlugins)
                     yield return plugin;
 
+                yield return AudioPlayer;
+
+                yield return AudioRecorder;
+
                 yield return MasterVolume;
             }
         }
+        public IAudioPlugin Tuner { get; private set; }
         public IAudioPlugin InputGain { get; private set; }
         public IAudioPlugin MasterVolume { get; private set; }
         public IAudioPlugin Amp { get; private set; }
         public IAudioPlugin Tonestack { get; private set; }
         public IAudioPlugin Cabinet { get; private set; }
+        public IAudioPlugin AudioPlayer { get; private set; }
         public IAudioPlugin AudioRecorder { get; private set; }
         public float MaxDSPLoad { get; private set; }
         public float MinDSPLoad { get; private set; }
@@ -427,6 +435,8 @@ public void UpdateUI()
         {
             Debug("*** Update UI");
 
+            Tuner = PluginFactory.CreatePlugin("Tuner");
+
             InputGain = PluginFactory.CreatePlugin("Input");
 
             Amp = CreateSlotPlugin("Amp", "NAM");
@@ -437,6 +447,8 @@ public void UpdateUI()
 
             MasterVolume = PluginFactory.CreatePlugin("Master");
 
+            AudioPlayer = PluginFactory.CreatePlugin("AudioFilePlayer");
+
             if (StompboxClient.Instance.InClientMode)
                 AudioRecorder = PluginFactory.CreatePlugin("AudioFileRecorder");
-Original file line number
+Diff line change
@@ Expand Up / @@ -83,7 +83,6 @@ public TunerInterface(IAudioPlugin plugin) @@
                 if (StompboxClient.Instance.InClientMode)
                 {
-                    plugin.Enabled = true;
                     StompboxClient.Instance.SendCommand("SetParam " + Plugin.ID + " Enabled " + (plugin.Enabled ? "1" : "0"));
                 }
             }
@@ Expand Down @@