Updated to latest patched SDK.

oddbear · Aug 7, 2022 · a7f873e · a7f873e
1 parent 5efe652
commit a7f873e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/WaveLinkPlugin/Adjustments/InputMonitorMixAdjustment.cs b/WaveLinkPlugin/Adjustments/InputMonitorMixAdjustment.cs
@@ -21,24 +21,23 @@ public InputMonitorMixAdjustment()
  protected override bool OnLoad()
  {
  _plugin = (WaveLinkPlugin)base.Plugin;
- _plugin.AllChannelInfoFetched += PluginOnAllChannelInfoFetched;
 
  _client = _plugin.Client;
  _client.InputMixerChanged += InputMixerChanged;
+ _client.ChannelsChanged += ChannelsChanged;
 
  return true;
  }
 
  protected override bool OnUnload()
  {
- _plugin.AllChannelInfoFetched -= PluginOnAllChannelInfoFetched;
-
  _client.InputMixerChanged -= InputMixerChanged;
+ _client.ChannelsChanged -= ChannelsChanged;
 
  return true;
  }
-
- private void PluginOnAllChannelInfoFetched(object sender, IEnumerable<ChannelInfo> channels)
+ 
+ private void ChannelsChanged(object sender, List<ChannelInfo> channels)
  {
  if (channels is null)
  return;

diff --git a/WaveLinkPlugin/Adjustments/InputStreamMixAdjustment.cs b/WaveLinkPlugin/Adjustments/InputStreamMixAdjustment.cs
@@ -21,24 +21,23 @@ public InputStreamMixAdjustment()
  protected override bool OnLoad()
  {
  _plugin = (WaveLinkPlugin)base.Plugin;
- _plugin.AllChannelInfoFetched += PluginOnAllChannelInfoFetched;
 
  _client = _plugin.Client;
  _client.InputMixerChanged += InputMixerChanged;
+ _client.ChannelsChanged += ChannelsChanged;
 
  return true;
  }
 
  protected override bool OnUnload()
  {
- _plugin.AllChannelInfoFetched -= PluginOnAllChannelInfoFetched;
-
  _client.InputMixerChanged -= InputMixerChanged;
+ _client.ChannelsChanged -= ChannelsChanged;
 
  return true;
  }
 
- private void PluginOnAllChannelInfoFetched(object sender, IEnumerable<ChannelInfo> channels)
+ private void ChannelsChanged(object sender, List<ChannelInfo> channels)
  {
  if (channels is null)
  return;
@@ -67,7 +66,7 @@ private void PluginOnAllChannelInfoFetched(object sender, IEnumerable<ChannelInf
  base.AddParameter(channelInfo.MixId, channelInfo.MixerName, "Input Volume (Stream)");
  }
  }
-
+ 
  private void InputMixerChanged(object sender, ChannelInfo channelInfo)
  {
  if (channelInfo?.MixId is null)

diff --git a/WaveLinkPlugin/WaveLinkPlugin.cs b/WaveLinkPlugin/WaveLinkPlugin.cs
@@ -16,7 +16,6 @@ public class WaveLinkPlugin : Plugin
  private CancellationTokenSource _cancellationTokenSource;
 
  public event EventHandler<IEnumerable<MonitorMixList>> LocalMonitorOutputFetched;
- public event EventHandler<IEnumerable<ChannelInfo>> AllChannelInfoFetched;
 
  public WaveLinkPlugin()
  {
@@ -98,8 +97,8 @@ private async Task UpdateStatesAsync()
  LocalMonitorOutputFetched?.Invoke(this, mixOutputList?.MonitorMixList);
  Client.LocalMonitorOutputChanged?.Invoke(this, mixOutputList?.MonitorMix);
 
- var inputMixes = await Client.GetAllChannelInfo();
- AllChannelInfoFetched?.Invoke(this, inputMixes);
+ var channels = await Client.GetAllChannelInfo();
+ Client.ChannelsChanged?.Invoke(this, channels);
  }
  }
 }