Fix audio jumping issue

Author: MattEqualsCoder

MSUScripter/MSUScripter.csproj

@@ -8,7 +8,7 @@
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
         <ApplicationIcon>MSUScripterIcon.ico</ApplicationIcon>
         <PackageIcon>MSUScripterIcon.ico</PackageIcon>
-        <Version>4.0.0-beta.2</Version>
+        <Version>4.0.0-beta.3</Version>
         <RuntimeFrameworkVersion>8.0.0</RuntimeFrameworkVersion>
         <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
         <LangVersion>12</LangVersion>

MSUScripter/Services/ControlServices/AudioControlService.cs

@@ -57,7 +57,11 @@ public void PlayPause()
 
     public void UpdatePosition(double position)
     {
-        audioService.SetPosition(position / 100);
+        if (Math.Abs(position - _model.PreviousPosition) > 0.01)
+        {
+            _model.PreviousPosition = position;
+            audioService.SetPosition(position / 100);
+        }
     }
 
     public void SetSeconds()
@@ -81,6 +85,12 @@ public void UpdateVolume(double volume)
         settingsService.SaveSettings();
     }
 
+    public void ShutdownService()
+    {
+        _timer.Elapsed -= TimerOnElapsed;
+        _timer.Stop();
+    }
+
     private void PlayStopped(object? sender, EventArgs e)
     {
         _model.Icon = MaterialIconKind.Stop;
@@ -120,7 +130,7 @@ private void StopTimer()
 
     private void TimerOnElapsed(object? sender, ElapsedEventArgs e)
     {
-        _model.Position = (audioService.GetCurrentPosition() ?? 0.0) * 100;
+        _model.Position = _model.PreviousPosition = (audioService.GetCurrentPosition() ?? 0.0) * 100;
         var currentTime = TimeSpan.FromSeconds(audioService.GetCurrentPositionSeconds()).ToString(@"mm\:ss");
         var totalTime = TimeSpan.FromSeconds(audioService.GetLengthSeconds()).ToString(@"mm\:ss");
         _model.Timestamp = $"{currentTime}/{totalTime}";

MSUScripter/ViewModels/AudioControlViewModel.cs

@@ -17,6 +17,7 @@ public class AudioControlViewModel : ViewModelBase
     [Reactive] public bool CanPopout { get; set; }
     [Reactive] public bool CanSetTimeSeconds { get; set; }
     [Reactive] public bool CanPressPopoutButton { get; set; } = true;
+    public double PreviousPosition { get; set; }
     public int IconSize => 16;
 
     public override ViewModelBase DesignerExample()

MSUScripter/Views/AudioControl.axaml

@@ -7,6 +7,7 @@
              xmlns:controls="clr-namespace:AvaloniaControls.Controls;assembly=AvaloniaControls"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="40"
              x:Class="MSUScripter.Views.AudioControl"
+             Unloaded="Control_OnUnloaded"
              x:DataType="viewModels:AudioControlViewModel">
     <Grid VerticalAlignment="Center" ColumnDefinitions="Auto,*,Auto,Auto" IsVisible="{Binding CanPlayMusic}">
 

MSUScripter/Views/AudioControl.axaml.cs

@@ -102,4 +102,9 @@ private void VolumeSlider_OnLoaded(object? sender, RoutedEventArgs e)
         if (_service == null || sender is not Slider slider) return;
         slider.Value = _service.GetCurrentVolume();
     }
+
+    private void Control_OnUnloaded(object? sender, RoutedEventArgs e)
+    {
+        _service?.ShutdownService();
+    }
 }