Update monitor to use output msu type

Author: MattEqualsCoder

MSURandomizer/Services/MsuListService.cs

@@ -62,6 +62,7 @@ public void FilterMSUs(string msuTypeName, MsuFilter msuFilter)
     public void FilterMSUs(MsuType msuType, MsuFilter msuFilter)
     {
         Model.MsuTypeName = msuType.DisplayName;
+        Model.MsuType = msuType;
         var msuTypePath = Model.HardwareMode ? "" :
             userOptions.MsuUserOptions.MsuTypePaths.TryGetValue(msuType, out var path) ? path :
             userOptions.MsuUserOptions.DefaultMsuPath;

MSURandomizer/Services/MsuMonitorWindowService.cs

@@ -36,11 +36,11 @@ public MsuMonitorWindowViewModel InitializeModel()
         return _model;
     }
 
-    public void StartMonitor(Msu? msu = null)
+    public void StartMonitor(Msu? msu = null, MsuType? outputMsuType = null)
     {
         if (msu == null)
         {
-            var outputMsuType = msuTypeService.GetMsuType(msuUserOptionsService.MsuUserOptions.OutputMsuType);
+            outputMsuType ??= msuTypeService.GetMsuType(msuUserOptionsService.MsuUserOptions.OutputMsuType);
 
             if (outputMsuType == null)
             {
@@ -88,12 +88,14 @@ public void StartMonitor(Msu? msu = null)
                 _model.ErrorMessage = "Sorry, that game is not compatible yet with reading the current playing track";
                 return;
             }
+
+            outputMsuType ??= msu.MsuType;
 
             ConnectToSnes();
 
             ITaskService.Run(() =>
             {
-                msuMonitorService.StartMonitor(msu);
+                msuMonitorService.StartMonitor(msu, outputMsuType!);
             });
         }
     }

MSURandomizer/Services/MsuWindowService.cs

@@ -273,6 +273,11 @@ public bool GenerateMsu(out string error, out bool openContinuousWindow, out Msu
 
     public bool ShouldOpenMonitorWindow => userOptions.MsuUserOptions.OpenMonitorWindow;
 
+    public MsuType? GetMsuType(string msuTypeName)
+    {
+        return msuTypeService.GetMsuType(msuTypeName);
+    }
+
     private void MsuTypeServiceOnOnMsuTypeLoadComplete(object? sender, EventArgs e)
     {
         Model.MsusTypes = msuTypeService.MsuTypes.Select(x => x.DisplayName).Order().ToList();

MSURandomizer/ViewModels/HardwareMsuViewModel.cs

@@ -13,4 +13,6 @@ public class HardwareMsuViewModel : ViewModelBase
     public bool Complete { get; set; }
 
     public Msu? SelectedMsu { get; set; }
+    
+    public MsuType? SelectedMsuType { get; set; }
 }

MSURandomizer/ViewModels/MsuListViewModel.cs

@@ -18,6 +18,8 @@ public class MsuListViewModel : ViewModelBase
 
     [Reactive] public string? MsuTypeName { get; set; }
 
+    [Reactive] public MsuType? MsuType { get; set; }
+    
     [Reactive] public bool IsMsuMonitorActive { get; set; }
 
     [Reactive] public bool IsMsuMonitorDisabled { get; set; }

MSURandomizer/Views/HardwareMsuWindow.axaml.cs

@@ -6,6 +6,7 @@
 using AvaloniaControls.Extensions;
 using MSURandomizer.Services;
 using MSURandomizer.ViewModels;
+using MSURandomizerLibrary.Configs;
 
 namespace MSURandomizer.Views;
 
@@ -42,13 +43,14 @@ private void ServiceOnOpenMsuMonitorWindow(object? sender, EventArgs e)
         Dispatcher.UIThread.Invoke(() =>
         {
             var window = new MsuMonitorWindow();
-            window.Show(_model.SelectedMsu);
+            window.Show(_model.SelectedMsu, _model.SelectedMsuType);
             Close();
         });
     }
 
-    public void ShowDialog(Window parentWindow, List<MsuViewModel> msus)
+    public void ShowDialog(Window parentWindow, List<MsuViewModel> msus, MsuType outputMsuType)
     {
+        _model.SelectedMsuType = outputMsuType;
         _model.Msus = msus;
         _service?.Connect();
         ShowDialog(parentWindow);

MSURandomizer/Views/MsuList.axaml.cs

@@ -15,14 +15,15 @@ namespace MSURandomizer.Views;
 public partial class MsuList : UserControl
 {
     private readonly MsuListService? _service;
+    private readonly MsuListViewModel _model;
 
     public MsuList()
     {
         InitializeComponent();
 
         if (Design.IsDesignMode)
         {
-            DataContext = new MsuListViewModel()
+            DataContext = _model = new MsuListViewModel()
             {
                 FilteredMsus = new List<MsuViewModel>()
                 {
@@ -40,7 +41,7 @@ public MsuList()
         else
         {
             _service = this.GetControlService<MsuListService>();
-            DataContext = _service!.InitializeModel();
+            DataContext = _model = _service!.InitializeModel();
         }
     }
 
@@ -182,6 +183,6 @@ private void OpenMonitorWindowMenuItem_OnClick(object? sender, RoutedEventArgs e
         }
 
         var window = new MsuMonitorWindow();
-        window.Show(model.Msu);
+        window.Show(model.Msu, _model.MsuType);
     }
 }

MSURandomizer/Views/MsuMonitorWindow.axaml.cs

@@ -34,9 +34,9 @@ public MsuMonitorWindow()
     protected override int DefaultWidth => 600;
     protected override int DefualtHeight => 400;
 
-    public void Show(Msu? msu, Window? parent = null)
+    public void Show(Msu? msu, MsuType? outputMsuType, Window? parent = null)
     {
-        _service?.StartMonitor(msu);
+        _service?.StartMonitor(msu, outputMsuType);
         if (parent == null)
         {
             Show();

MSURandomizer/Views/MsuWindow.axaml.cs

@@ -121,8 +121,9 @@ private void RandomMsuButton_OnClick(object? sender, RoutedEventArgs e)
 
         if (_model.IsHardwareModeEnabled)
         {
+            var msuType = _service?.GetMsuType(_model.SelectedMsuType) ?? _model.SelectedMsus.First().Msu.MsuType;
             var hardwareMsuWindow = new HardwareMsuWindow();
-            hardwareMsuWindow.ShowDialog(this, _model.SelectedMsus.ToList());
+            hardwareMsuWindow.ShowDialog(this, _model.SelectedMsus.ToList(), msuType!);
         }
         else
         {
@@ -206,8 +207,9 @@ private void GenerateMsu()
 
     private void OpenMsuMonitorWindow(Msu? msu)
     {
+        var msuType = _service?.GetMsuType(_model.SelectedMsuType) ?? msu?.MsuType;
         var window = new MsuMonitorWindow();
-        window.Show(msu);
+        window.Show(msu, msuType!);
     }
 
     private void HardwareButton_OnClick(object? sender, RoutedEventArgs e)

MSURandomizerLibrary/Services/IMsuMonitorService.cs

@@ -39,7 +39,8 @@ public interface IMsuMonitorService : IDisposable
     /// Starts the monitor for a specific MSU to detect when the current song has changed
     /// </summary>
     /// <param name="msu">The MSU to play</param>
-    public void StartMonitor(Msu msu);
+    /// <param name="msuType">The MSU type to use for monitoring</param>
+    public void StartMonitor(Msu msu, MsuType msuType);
 
     /// <summary>
     /// Stops the monitor