Merge pull request #107 from dan0v/master

Version 2.11.0

Author: dan0v

AmplitudeSoundboard.csproj

@@ -17,7 +17,7 @@
     <RootNamespace>Amplitude</RootNamespace>
     <NeutralLanguage>en</NeutralLanguage>
     <Platforms>AnyCPU;x64</Platforms>
-    <Version>2.10.5</Version>
+    <Version>2.11.0</Version>
     <CopyOutputSymbolsToPublishDirectory>false</CopyOutputSymbolsToPublishDirectory>
     <PublishTrimmed>true</PublishTrimmed>
     <TrimMode>partial</TrimMode>
@@ -35,19 +35,20 @@
     <AvaloniaResource Include="Assets\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.3.0" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.3.0" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.3.0" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.0" />
-    <PackageReference Include="Avalonia.Controls.ColorPicker" Version="11.3.0" />
+    <PackageReference Include="Avalonia" Version="11.3.2" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.3.2" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.3.2" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.2" />
+    <PackageReference Include="Avalonia.Controls.ColorPicker" Version="11.3.2" />
     <PackageReference Include="ManagedBass" Version="3.1.1" />
     <PackageReference Include="ManagedBass.Flac" Version="3.1.1" />
     <PackageReference Include="ManagedBass.Mix" Version="3.1.1" />
     <PackageReference Include="ManagedBass.Opus" Version="3.1.1" />
-    <PackageReference Include="SharpHook" Version="6.1.0" />
+    <PackageReference Include="SharpHook" Version="6.1.2" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Private.Uri" Version="4.3.2" />
     <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
+    <PackageReference Include="System.Threading.Tasks" Version="4.3.0" />
   </ItemGroup>
   <ItemGroup>
     <Compile Update="Localization\Language.Designer.cs">

Converters/IntConverter.cs

@@ -0,0 +1,44 @@
+/*
+    AmplitudeSoundboard
+    Copyright (C) 2021-2025 dan0v
+    https://git.dan0v.com/AmplitudeSoundboard
+
+    This file is part of AmplitudeSoundboard.
+
+    AmplitudeSoundboard is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    AmplitudeSoundboard is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with AmplitudeSoundboard.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+using Avalonia.Data.Converters;
+using System;
+using System.Globalization;
+
+namespace Amplitude.Converters
+{
+    public class IntConverter : IValueConverter
+    {
+        public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            return "" + value;
+        }
+
+        public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            if (value is string value_ && int.TryParse(value_, out int res))
+            {
+                return res;
+            }
+            return 0;
+        }
+    }
+}

Helpers/ISoundEngine.cs

@@ -47,7 +47,7 @@ public interface ISoundEngine : IDisposable
 
         public List<string> OutputDeviceListWithGlobal { get; }
 
-        public void StopPlaying(int bassId);
+        public void StopPlaying(int handle, double remainingMilis, int fadeOutMilis = 0);
 
         public void RemoveFromQueue(SoundClip clip);
 

Helpers/MSoundEngine.cs

@@ -21,6 +21,7 @@ You should have received a copy of the GNU General Public License
 
 using Amplitude.Models;
 using AmplitudeSoundboard;
+using DynamicData;
 using ManagedBass;
 using ManagedBass.Mix;
 using System;
@@ -38,15 +39,16 @@ class MSoundEngine : ISoundEngine
         public static ISoundEngine Instance => _instance ??= new MSoundEngine();
 
         private readonly object currentlyPlayingLock = new();
-
         private ObservableCollection<PlayingClip> _currentlyPlaying = [];
         public ObservableCollection<PlayingClip> CurrentlyPlaying => _currentlyPlaying;
 
         private readonly object queueLock = new();
-
         private ObservableCollection<SoundClip> _queued = [];
         public ObservableCollection<SoundClip> Queued => _queued;
 
+        private readonly object streamsToFreeLock = new();
+        private Collection<StreamToFree> _streamsToFree = [];
+
 
         private const long TIMER_MS = 200;
         private Timer timer = new(TIMER_MS)
@@ -56,30 +58,24 @@ class MSoundEngine : ISoundEngine
 
         private void RefreshPlaybackProgressAndCheckQueue(object? sender, ElapsedEventArgs e)
         {
-            lock (currentlyPlayingLock)
+            foreach (var track in CurrentlyPlaying.ToArray())
             {
-                List<PlayingClip> toRemove = [];
-                foreach (var track in CurrentlyPlaying)
-                {
-                    track.CurrentPos += TIMER_MS * 0.001d;
-                    if (track.ProgressPct == 1)
-                    {
-                        toRemove.Add(track);
-                    }
-                }
+                track.CurrentPos += TIMER_MS * 0.001d;
 
-                foreach (var track in toRemove)
+                if (track.LoopClip)
                 {
-                    if (track.LoopClip)
+                    if (track.ProgressPct == 1)
                     {
                         track.CurrentPos = 0;
                         Bass.ChannelPlay(track.BassStreamId, true);
                     }
-                    else
-                    {
-                        Bass.StreamFree(track.BassStreamId);
-                        CurrentlyPlaying.Remove(track);
-                    }
+                }
+                // might be off by 100ms, but oh well
+                else if (track.CurrentPos + 0.1d >= track.Length - (track.FadeOutMilis * 0.001d))
+                {
+                    var timeRemainingMilis = 1000 * (track.Length - track.CurrentPos - 0.1d);
+                    var fadeOutDuration = timeRemainingMilis < track.FadeOutMilis ? timeRemainingMilis : track.FadeOutMilis;
+                    StopPlaying(track.BassStreamId, track.RemainingMilis, track.FadeOutMilis);
                 }
             }
             lock (queueLock)
@@ -91,11 +87,21 @@ private void RefreshPlaybackProgressAndCheckQueue(object? sender, ElapsedEventAr
                     Queued.RemoveAt(0);
                 }
             }
+            lock (streamsToFreeLock)
+            {
+                var timeNow = DateTimeOffset.Now.ToUnixTimeMilliseconds();
+                var streamsToFreeAndRemove = _streamsToFree.Where(it => timeNow >= it.freeAtUnixTime).ToArray();
+                foreach (StreamToFree stream in streamsToFreeAndRemove)
+                {
+                    StopPlaying(stream.bassStreamId, 0, 0);
+                }
+                _streamsToFree.RemoveMany(streamsToFreeAndRemove);
+            }
         }
 
         public const int SAMPLE_RATE = 44100;
 
-        private readonly object bass_lock = new object();
+        private readonly object bass_lock = new();
 
 
         public List<string> OutputDeviceListWithoutGlobal
@@ -166,20 +172,14 @@ private void StopAndRemoveFromQueue(string id)
         {
             lock (queueLock)
             {
-                var toRemove = Queued.Where(clip => clip.Id == id).ToList();
-                foreach (var clip in toRemove)
+                foreach (var clip in Queued.Where(clip => clip.Id == id).ToArray())
                 {
                     Queued.Remove(clip);
                 }
             }
-            lock (currentlyPlayingLock)
+            foreach (var clip in CurrentlyPlaying.Where(clip => clip.SoundClipId == id).ToArray())
             {
-                var toRemove = CurrentlyPlaying.Where(clip => clip.SoundClipId == id).ToList();
-                foreach (var clip in toRemove)
-                {
-                    Bass.StreamFree(clip.BassStreamId);
-                    CurrentlyPlaying.Remove(clip);
-                }
+                StopPlaying(clip.BassStreamId, clip.RemainingMilis ,clip.FadeOutMilis);
             }
         }
 
@@ -218,11 +218,11 @@ public void Play(SoundClip source, bool fromQueue = false)
 
             foreach (OutputSettings settings in source.OutputSettingsFromProfile)
             {
-                Play(source.AudioFilePath, settings.Volume, source.Volume, settings.DeviceName, source.LoopClip, tempId, source.Name);
+                Play(source.AudioFilePath, settings.Volume, source.Volume, settings.DeviceName, source.LoopClip, tempId, settings.FadeOutMilis, source.Name);
             }
         }
 
-        private void Play(string fileName, int volume, int volumeMultiplier, string playerDeviceName, bool loopClip, string soundClipId, string? name = null)
+        private void Play(string fileName, int volume, int volumeMultiplier, string playerDeviceName, bool loopClip, string soundClipId, int fadeOutMilis, string? name = null)
         {
             double vol = (volume / 100.0) * (volumeMultiplier / 100.0);
 
@@ -257,7 +257,15 @@ private void Play(string fileName, int volume, int volumeMultiplier, string play
                         {
                             var len = Bass.ChannelGetLength(stream, PositionFlags.Bytes);
                             double length = Bass.ChannelBytes2Seconds(stream, len);
-                            PlayingClip track = new(string.IsNullOrEmpty(name) ? Path.GetFileNameWithoutExtension(fileName) ?? "" : name, soundClipId, playerDeviceName, stream, length, loopClip);
+                            PlayingClip track = new(
+                                string.IsNullOrEmpty(name) ? Path.GetFileNameWithoutExtension(fileName) ?? "" : name,
+                                soundClipId,
+                                playerDeviceName,
+                                stream,
+                                length,
+                                loopClip,
+                                fadeOutMilis
+                                );
 
                             lock (currentlyPlayingLock)
                             {
@@ -310,27 +318,33 @@ public void Reset()
             {
                 Queued.Clear();
             }
-            lock (currentlyPlayingLock)
+            foreach (var stream in CurrentlyPlaying.ToArray())
             {
-                foreach (var stream in CurrentlyPlaying)
-                {
-                    Bass.StreamFree(stream.BassStreamId);
-                }
-
-                CurrentlyPlaying.Clear();
+                var timeRemainingMilis = stream.RemainingMilis;
+                var fadeOutDuration = timeRemainingMilis < stream.FadeOutMilis ? timeRemainingMilis : stream.FadeOutMilis;
+                StopPlaying(stream.BassStreamId, timeRemainingMilis, (int)fadeOutDuration);
             }
         }
 
-        public void StopPlaying(int bassId)
+        public void StopPlaying(int handle, double remainingMilis, int fadeOutMilis)
         {
-            lock (currentlyPlayingLock)
+            if (fadeOutMilis == 0)
             {
-                PlayingClip? track = CurrentlyPlaying.FirstOrDefault(c => c.BassStreamId == bassId);
-                if (track != null)
+                Bass.StreamFree(handle);
+                lock (currentlyPlayingLock)
                 {
-                    CurrentlyPlaying.Remove(track);
+                    PlayingClip? track = CurrentlyPlaying.FirstOrDefault(c => c.BassStreamId == handle);
+                    if (track != null)
+                    {
+                        CurrentlyPlaying.Remove(track);
+                    }
                 }
-                Bass.StreamFree(bassId);
+            }
+            else
+            {
+                int remainingFadeOut = (int)(remainingMilis < fadeOutMilis ? remainingMilis : fadeOutMilis); 
+                Bass.ChannelSlideAttribute(handle, ChannelAttribute.Volume, 0, remainingFadeOut);
+                _streamsToFree.Add(new StreamToFree(handle, DateTimeOffset.Now.ToUnixTimeMilliseconds() + remainingFadeOut));
             }
         }
 
@@ -349,5 +363,17 @@ public void Dispose()
             Reset();
             Bass.Free();
         }
-    }
+
+        private class StreamToFree
+        {
+            public int bassStreamId;
+            public long freeAtUnixTime;
+
+            public StreamToFree(int bassStreamId, long freeAtUnixTime)
+            {
+                this.bassStreamId = bassStreamId;
+                this.freeAtUnixTime = freeAtUnixTime;
+            }
+        }
+	}
 }