From b3c6bea39c5302163a131b8576fa5ffb1d310b17 Mon Sep 17 00:00:00 2001
From: William Pereira <MetalHexx@outlook.com>
Date: Mon, 8 Jul 2024 23:42:39 -0400
Subject: [PATCH] feature: subtune support!

---
 .../PlaySubtune/PlaySubtuneHandler.cs         |  31 +++++
 .../Music/Sid/SidMetadataService.cs           |   5 +-
 .../src/TeensyRom.Core/Music/Sid/SidRecord.cs |   3 +-
 .../TeensyRom.Core/Music/Sid/SidRecordMap.cs  |   2 +-
 .../src/TeensyRom.Core/Serial/TeensyToken.cs  |   1 +
 .../Storage/Entities/SongItem.cs              |   3 +
 .../Controls/PlayToolbar/PlayToolbarView.xaml |  65 ++++++++--
 .../PlayToolbar/PlayToolbarViewModel.cs       | 122 +++++++++++++++---
 .../Features/Discover/DiscoverViewModel.cs    |   3 +-
 .../Discover/State/Player/IPlayerContext.cs   |   1 +
 .../Discover/State/Player/PlayerContext.cs    |   7 +
 .../src/TeensyRom.Ui/TeensyRom.Ui.csproj      |   2 +-
 12 files changed, 209 insertions(+), 36 deletions(-)
 create mode 100644 Source/Windows/TeensyRom.Ui/src/TeensyRom.Core/Commands/PlaySubtune/PlaySubtuneHandler.cs

diff --git a/Source/Windows/TeensyRom.Ui/src/TeensyRom.Core/Commands/PlaySubtune/PlaySubtuneHandler.cs b/Source/Windows/TeensyRom.Ui/src/TeensyRom.Core/Commands/PlaySubtune/PlaySubtuneHandler.cs
new file mode 100644
index 00000000..67a91ea4
--- /dev/null
+++ b/Source/Windows/TeensyRom.Ui/src/TeensyRom.Core/Commands/PlaySubtune/PlaySubtuneHandler.cs
@@ -0,0 +1,31 @@
+using MediatR;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using TeensyRom.Core.Commands.File.LaunchFile;
+using TeensyRom.Core.Serial.State;
+using TeensyRom.Core.Serial;
+
+namespace TeensyRom.Core.Commands.PlaySubtune
+{
+    public class PlaySubtuneCommand (int subtuneIndex) : IRequest<PlaySubtuneResult>
+    {
+        public int SubtuneIndex { get; } = subtuneIndex;
+    }
+
+    public class PlaySubtuneResult : TeensyCommandResult;
+
+    public class PlaySubtuneHandler(ISerialStateContext serialState) : IRequestHandler<PlaySubtuneCommand, PlaySubtuneResult>
+    {
+        public async Task<PlaySubtuneResult> Handle(PlaySubtuneCommand request, CancellationToken cancellationToken)
+        {
+            serialState.ClearBuffers();
+            serialState.SendIntBytes(TeensyToken.PlaySubtune, 2);
+            serialState.SendIntBytes((uint)request.SubtuneIndex - 1, 1);
+            serialState.HandleAck();
+            return new PlaySubtuneResult();
+        }
+    }
+}
diff --git a/Source/Windows/TeensyRom.Ui/src/TeensyRom.Core/Music/Sid/SidMetadataService.cs b/Source/Windows/TeensyRom.Ui/src/TeensyRom.Core/Music/Sid/SidMetadataService.cs
index 7722a6d9..e77b91dd 100644
--- a/Source/Windows/TeensyRom.Ui/src/TeensyRom.Core/Music/Sid/SidMetadataService.cs
+++ b/Source/Windows/TeensyRom.Ui/src/TeensyRom.Core/Music/Sid/SidMetadataService.cs
@@ -91,6 +91,8 @@ private void EnrichWithHsvcMetadata(SongItem song, SidRecord? sidRecord)
             song.Creator = sidRecord.Author;
             song.Title = sidRecord.Title;
             song.PlayLength = sidRecord.SongLengthSpan;
+            song.StartSubtuneNum = sidRecord.StartSong;
+            song.SubtuneLengths = sidRecord.SubTuneSongLengths.Select(s => s).ToList();
             song.ReleaseInfo = sidRecord.Released;            
             song.Meta1 = sidRecord.Clock;
             song.Meta2 = sidRecord.SidModel;            
@@ -194,8 +196,9 @@ private static Dictionary<string, SidRecord> ParseSids(Dictionary<string, SidRec
                     continue;
                 }
                 var songLengths = ParseTimeSegments(sid.Value.SongLength);
-                
+                                
                 sid.Value.SongLengthSpan = songLengths.Any() ? songLengths.First() : MusicConstants.DefaultLength;
+                sid.Value.SubTuneSongLengths = songLengths;
             }
             return sids;
         }
diff --git a/Source/Windows/TeensyRom.Ui/src/TeensyRom.Core/Music/Sid/SidRecord.cs b/Source/Windows/TeensyRom.Ui/src/TeensyRom.Core/Music/Sid/SidRecord.cs
index 5f801d6b..d614038e 100644
--- a/Source/Windows/TeensyRom.Ui/src/TeensyRom.Core/Music/Sid/SidRecord.cs
+++ b/Source/Windows/TeensyRom.Ui/src/TeensyRom.Core/Music/Sid/SidRecord.cs
@@ -12,9 +12,10 @@ public class SidRecord
         public string Author { get; set; } = string.Empty;
         public string Released { get; set; } = string.Empty;
         //public int Songs { get; set; }
-        //public int StartSong { get; set; }
+        public int StartSong { get; set; }
         public string SongLength { get; set; } = string.Empty;
         public TimeSpan SongLengthSpan { get; set; } = TimeSpan.FromMinutes(3);
+        public List<TimeSpan> SubTuneSongLengths = [];
         public int SizeInBytes { get; set; }
         //public string InitAddr { get; set; } = string.Empty;
         //public string PlayAddr { get; set; } = string.Empty;
diff --git a/Source/Windows/TeensyRom.Ui/src/TeensyRom.Core/Music/Sid/SidRecordMap.cs b/Source/Windows/TeensyRom.Ui/src/TeensyRom.Core/Music/Sid/SidRecordMap.cs
index fac5d519..4c611913 100644
--- a/Source/Windows/TeensyRom.Ui/src/TeensyRom.Core/Music/Sid/SidRecordMap.cs
+++ b/Source/Windows/TeensyRom.Ui/src/TeensyRom.Core/Music/Sid/SidRecordMap.cs
@@ -15,7 +15,7 @@ public SidRecordMap()
             Map(m => m.Author).Name("AUTHOR");
             Map(m => m.Released).Name("RELEASED");
             //Map(m => m.Songs).Name("SONGS");
-            //Map(m => m.StartSong).Name("STARTSONG");
+            Map(m => m.StartSong).Name("STARTSONG");
             Map(m => m.SongLength).Name("SONGLEN (per tune)");
             Map(m => m.SizeInBytes).Name("SIZE (in bytes)");
             //Map(m => m.InitAddr).Name("INITADDR");
diff --git a/Source/Windows/TeensyRom.Ui/src/TeensyRom.Core/Serial/TeensyToken.cs b/Source/Windows/TeensyRom.Ui/src/TeensyRom.Core/Serial/TeensyToken.cs
index a1b4e007..60adc2bb 100644
--- a/Source/Windows/TeensyRom.Ui/src/TeensyRom.Core/Serial/TeensyToken.cs
+++ b/Source/Windows/TeensyRom.Ui/src/TeensyRom.Core/Serial/TeensyToken.cs
@@ -9,6 +9,7 @@ public sealed class TeensyToken : SmartEnum<TeensyToken, ushort>
         public static readonly TeensyToken StartDirectoryList = new(0x5A5A, nameof(StartDirectoryList));
         public static readonly TeensyToken EndDirectoryList = new(0xA5A5, nameof(EndDirectoryList));
         public static readonly TeensyToken LaunchFile = new(0x6444, nameof(LaunchFile));
+        public static readonly TeensyToken PlaySubtune = new(0x6488, nameof(PlaySubtune));
         public static readonly TeensyToken SendFile = new(0x64BB, nameof(SendFile));
         public static readonly TeensyToken CopyFile = new(0x64FF, nameof(CopyFile));
         public static readonly TeensyToken GetFile = new(0x64B0, nameof(GetFile));
diff --git a/Source/Windows/TeensyRom.Ui/src/TeensyRom.Core/Storage/Entities/SongItem.cs b/Source/Windows/TeensyRom.Ui/src/TeensyRom.Core/Storage/Entities/SongItem.cs
index 22dfaf1d..162a9e8e 100644
--- a/Source/Windows/TeensyRom.Ui/src/TeensyRom.Core/Storage/Entities/SongItem.cs
+++ b/Source/Windows/TeensyRom.Ui/src/TeensyRom.Core/Storage/Entities/SongItem.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Numerics;
+using System.Text.Json.Serialization;
 using TeensyRom.Core.Common;
 
 namespace TeensyRom.Core.Storage.Entities
@@ -7,6 +8,8 @@ namespace TeensyRom.Core.Storage.Entities
     public class SongItem : FileItem, ILaunchableItem, IViewableItem
     {   
         public TimeSpan PlayLength { get; set; } = TimeSpan.FromMinutes(3);
+        public List<TimeSpan> SubtuneLengths { get; set; } = [];
+        public int StartSubtuneNum { get; set; }
         public List<ViewableItemImage> Images { get; init; } = [];        
 
         public SongItem()
diff --git a/Source/Windows/TeensyRom.Ui/src/TeensyRom.Ui/Controls/PlayToolbar/PlayToolbarView.xaml b/Source/Windows/TeensyRom.Ui/src/TeensyRom.Ui/Controls/PlayToolbar/PlayToolbarView.xaml
index 85213a3d..e5ef69d3 100644
--- a/Source/Windows/TeensyRom.Ui/src/TeensyRom.Ui/Controls/PlayToolbar/PlayToolbarView.xaml
+++ b/Source/Windows/TeensyRom.Ui/src/TeensyRom.Ui/Controls/PlayToolbar/PlayToolbarView.xaml
@@ -21,6 +21,7 @@
 
         <Grid Grid.Row="1" Margin="10 10 0 10">
             <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="Auto"/>
@@ -134,7 +135,48 @@
                 
             </StackPanel>
 
-            <Grid Grid.Column="2"
+            <StackPanel 
+                Visibility="{Binding SubtunesEnabled, Converter={StaticResource BoolToVisibilityConvertor}}"
+                Orientation="Horizontal" Grid.Column="2"
+                Margin="20 0 0 0">
+                <Button 
+                    Command="{Binding PreviousSubtuneCommand}"
+                    IsEnabled="{Binding SubtunePreviousButtonEnabled}"
+                    Style="{StaticResource MaterialDesignIconForegroundButton}"
+                    Foreground="{DynamicResource PrimaryHueLightBrush }"
+                    Height="30" Width="30"
+                    ToolTip="Previous Subtune"
+                    VerticalAlignment="Center"
+                    Margin="0 0 2 0">
+                    <materialDesign:PackIcon Kind="SkipPrevious"/>
+                </Button>
+
+                <ComboBox
+                    x:Name="SubtubeComboBox"
+                    ItemsSource="{Binding SubtuneIndex}"
+                    SelectedItem="{Binding CurrentSubtuneIndex, Mode=TwoWay}"  
+                    materialDesign:TextFieldAssist.UnderlineBrush="{DynamicResource PrimaryHueLightBrush }"
+                    FontFamily="Arial"
+                    Height="30"
+                    materialDesign:TextFieldAssist.PrefixText="Subtune:"
+                    ToolTip="Change to a different subtune."
+                    Margin="0 0 0 0"/>
+
+                <Button 
+                    Command="{Binding NextSubtuneCommand}"
+                    IsEnabled="{Binding SubtuneNextButtonEnabled}"
+                    Style="{StaticResource MaterialDesignIconForegroundButton}"
+                    Foreground="{DynamicResource PrimaryHueLightBrush }"
+                    Height="30" Width="30"
+                    ToolTip="Next Subtune"
+                    VerticalAlignment="Center"
+                    Margin="2 0 10 0">
+                    <materialDesign:PackIcon Kind="SkipNext" />
+                </Button>
+
+            </StackPanel>
+
+            <Grid Grid.Column="3"
                 HorizontalAlignment="Right" VerticalAlignment="Top"
                 Margin="10 0 10 0">
                 <Grid.ColumnDefinitions>
@@ -146,7 +188,7 @@
                     <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
 
-                <ComboBox Grid.Column="0"
+                <ComboBox Grid.Column="1"
                     x:Name="ScopeComboBox"
                     ItemsSource="{Binding ScopeOptions}"
                     SelectedItem="{Binding SelectedScope, Mode=TwoWay}"
@@ -184,6 +226,15 @@
                 </Button>
 
                 <Button Grid.Column="3"
+                    x:Name="ShuffleModeButton"
+                    Command="{Binding ToggleShuffleCommand}"  
+                    ToolTip="Shuffle Mode.  &#x0a;Enabling this will cause the next button to play random file from your collection.  &#x0a;Disabling will play the next file in the current directory. &#x0a;The filter selected will determine the file type that gets picked."
+                    Style="{StaticResource ShuffleModeButtonStyle}"
+                    Margin="10">
+                    <materialDesign:PackIcon Kind="Shuffle"/>
+                </Button>
+
+                <Button Grid.Column="4"
                     x:Name="ShareButton"
                     Command="{Binding ShareCommand}"    
                     Visibility="{Binding ShareVisible, Converter={StaticResource BoolToVisibilityConvertor}, Mode=OneWay}"
@@ -194,16 +245,6 @@
                     <materialDesign:PackIcon Kind="Share" Margin="0 0 0 3"/>
                 </Button>
 
-                <Button Grid.Column="4"
-                    x:Name="ShuffleModeButton"
-                    Command="{Binding ToggleShuffleCommand}"  
-                    ToolTip="Shuffle Mode.  &#x0a;Enabling this will cause the next button to play random file from your collection.  &#x0a;Disabling will play the next file in the current directory. &#x0a;The filter selected will determine the file type that gets picked."
-                    Style="{StaticResource ShuffleModeButtonStyle}"
-                    Margin="10">
-                    <materialDesign:PackIcon Kind="Shuffle"/>
-                </Button>
-
-
                 <Button
                     Grid.Column="5"
                     x:Name="FavoriteButton"
diff --git a/Source/Windows/TeensyRom.Ui/src/TeensyRom.Ui/Controls/PlayToolbar/PlayToolbarViewModel.cs b/Source/Windows/TeensyRom.Ui/src/TeensyRom.Ui/Controls/PlayToolbar/PlayToolbarViewModel.cs
index c39631ac..787829fa 100644
--- a/Source/Windows/TeensyRom.Ui/src/TeensyRom.Ui/Controls/PlayToolbar/PlayToolbarViewModel.cs
+++ b/Source/Windows/TeensyRom.Ui/src/TeensyRom.Ui/Controls/PlayToolbar/PlayToolbarViewModel.cs
@@ -1,33 +1,28 @@
-using MediatR;
-using ReactiveUI;
+using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reactive;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
-using System.Transactions;
 using System.Windows;
-using TeensyRom.Core.Commands.File.LaunchFile;
 using TeensyRom.Core.Common;
 using TeensyRom.Core.Logging;
 using TeensyRom.Core.Storage.Entities;
 using TeensyRom.Core.Storage.Services;
-using TeensyRom.Ui.Features.Common.Models;
 using TeensyRom.Ui.Features.Discover.State;
 using TeensyRom.Ui.Features.Discover.State.Progress;
 
 namespace TeensyRom.Ui.Controls.PlayToolbar
 {
     public class PlayToolbarViewModel : ReactiveObject
-    {   
+    {
         [Reactive] public bool PlayButtonEnabled { get; set; }
         [Reactive] public bool PauseButtonEnabled { get; set; }
         [Reactive] public bool StopButtonEnabled { get; set; }
         [Reactive] public bool TimedPlayEnabled { get; set; }
         [Reactive] public bool TimedPlayButtonEnabled { get; set; }
-        [Reactive] public bool TimedPlayComboBoxEnabled { get; set; }              
+        [Reactive] public bool TimedPlayComboBoxEnabled { get; set; }
         [Reactive] public bool ProgressEnabled { get; set; }
         [Reactive] public string TimerSeconds { get; set; } = "3m";
         [Reactive] public List<string> TimerOptions { get; set; } = ["5s", "10s", "15s", "30s", "1m", "3m", "5m", "10m", "15m", "30m"];
@@ -39,8 +34,12 @@ public class PlayToolbarViewModel : ReactiveObject
             .Cast<StorageScope>().ToList()
             .Select(e => e.ToDescription())
             .ToList();
+        [Reactive] public int CurrentSubtuneIndex { get; set; }
+        [Reactive] public bool SubtuneNextButtonEnabled { get; set; }
+        [Reactive] public bool SubtunePreviousButtonEnabled { get; set; }
+        [ObservableAsProperty] public bool SubtunesEnabled { get; }
+        [ObservableAsProperty] public List<int> SubtuneIndex { get; }
         [ObservableAsProperty] public bool ShowTitleOnly { get; }
-
         [ObservableAsProperty] public string StorageScopePath { get; }
         [ObservableAsProperty] public ILaunchableItem? File { get; }
         [ObservableAsProperty] public TimeProgressViewModel? Progress { get; } = null;
@@ -59,6 +58,8 @@ public class PlayToolbarViewModel : ReactiveObject
         public ReactiveCommand<Unit, Unit> RemoveFavoriteCommand { get; set; }
         public ReactiveCommand<Unit, Unit> ShareCommand { get; set; }
         public ReactiveCommand<Unit, Unit> NavigateToFileDirCommand { get; set; }
+        public ReactiveCommand<Unit, Unit> NextSubtuneCommand { get; set; }
+        public ReactiveCommand<Unit, Unit> PreviousSubtuneCommand { get; set; }
 
         private readonly IAlertService _alert;
         private IProgressTimer? _timer;
@@ -75,10 +76,11 @@ public PlayToolbarViewModel(
             Func<Unit> toggleMode, 
             Func<Task> togglePlay,
             Func<Task> playPrevious, 
-            Func<Task> playNext,             
+            Func<Task> playNext,
+            Func<int, Task> playSubtune,
             Func<ILaunchableItem, Task> saveFav,
             Func<ILaunchableItem, Task> removeFav,
-            Func<string, Task> loadDirectory,
+            Func<string, Task> loadDirectory,            
             Action<StorageScope> setScope,
             IAlertService alert)
         {
@@ -172,9 +174,22 @@ public PlayToolbarViewModel(
                     PauseButtonEnabled = true;
                 });
 
-            var song = currentFile.OfType<SongItem>();
-            var hexItem = currentFile.OfType<HexItem>();
-            var gameOrImage = currentFile.Where(f => f is GameItem or ImageItem);
+            var song = currentFile.OfType<SongItem>().ObserveOn(RxApp.MainThreadScheduler);
+            var hexItem = currentFile.OfType<HexItem>().ObserveOn(RxApp.MainThreadScheduler);
+            var gameOrImage = currentFile.Where(f => f is GameItem or ImageItem).ObserveOn(RxApp.MainThreadScheduler);
+
+            song.Select(s => s.SubtuneLengths.Count > 1)
+                .ToPropertyEx(this, vm => vm.SubtunesEnabled);
+
+            song.Select(s => s.StartSubtuneNum)
+                .Subscribe(startIndex => 
+                {
+                    CurrentSubtuneIndex = startIndex;                    
+                });
+
+            song.Select(s => s.SubtuneLengths.Select((_, i) => i + 1).ToList())
+                .Where(lengths => lengths.Count > 1)
+                .ToPropertyEx(this, vm => vm.SubtuneIndex);
 
             song.Subscribe(item => 
             {
@@ -183,6 +198,7 @@ public PlayToolbarViewModel(
                 ProgressEnabled = true;
                 InitializeProgress(playNext, item);
             });
+            
 
             gameOrImage
                 .Where(_ => TimedPlayEnabled)
@@ -263,31 +279,99 @@ public PlayToolbarViewModel(
             RemoveFavoriteCommand = ReactiveCommand.CreateFromTask(_ => removeFav(File!));
             ShareCommand = ReactiveCommand.Create<Unit, Unit>(_ => HandleShareCommand());
             NavigateToFileDirCommand = ReactiveCommand.CreateFromTask(_ => loadDirectory(File!.Path.GetUnixParentPath()!));
+            
+            PreviousSubtuneCommand = ReactiveCommand.Create<Unit, Unit>(_ => 
+            {
+                var song = File as SongItem;
+
+                if (CurrentSubtuneIndex == 1) 
+                {
+                    SubtunePreviousButtonEnabled = false;
+                    return Unit.Default;
+                }
+                
+                CurrentSubtuneIndex--;
+                return Unit.Default;
+            });
+            NextSubtuneCommand = ReactiveCommand.Create<Unit, Unit>(_ =>
+            {
+                var song = File as SongItem;
+
+                if (song is null || CurrentSubtuneIndex == song.SubtuneLengths.Count) return Unit.Default;
+
+                if (CurrentSubtuneIndex == song.SubtuneLengths.Count);
+                CurrentSubtuneIndex++;
+                return Unit.Default;
+            });
+
+            this.WhenAnyValue(x => x.CurrentSubtuneIndex)                
+                .Skip(2)
+                .Where(_ => File is SongItem item && item.SubtuneLengths.Count > 1)
+                .Subscribe(songAndIndex =>
+                {
+                    InitializeSubtuneProgress(CurrentSubtuneIndex, playNext);
+                    ResetSubtuneButtonState();
+                    playSubtune(CurrentSubtuneIndex);
+                });
+        }
+
+        private void ResetSubtuneButtonState()
+        {
+            var song = File as SongItem;
+
+            if (song is null) return;
+            
+            SubtuneNextButtonEnabled = CurrentSubtuneIndex < song.SubtuneLengths.Count;
+            SubtunePreviousButtonEnabled = CurrentSubtuneIndex > 1;
+        }
+
+        private void InitializeSubtuneProgress(int subtuneIndex, Func<Task> playNext) 
+        {
+            var song = File as SongItem;
+
+            if (song == null || song.SubtuneLengths.Count == 0) return;
+
+            var zeroBasedIndex = subtuneIndex > 0 ? subtuneIndex - 1 : 0;
+
+            var subtuneLength = song.SubtuneLengths[zeroBasedIndex];
+
+            StartTimerObservables(subtuneLength, playNext);
         }
 
         private void InitializeProgress(Func<Task> playNext, ILaunchableItem? item)
         {
-            if (item == null) return;
-            if(_timer == null) return;
+            if (item == null) return;            
 
             TimeSpan playLength;
 
             if(item is SongItem songItem)
             {
                 playLength = songItem.PlayLength;
+                
+                if (songItem.SubtuneLengths.Count > 1) 
+                {
+                    playLength = songItem.SubtuneLengths[songItem.StartSubtuneNum - 1];
+                    ResetSubtuneButtonState();
+                }
             }
             else
             {
                 playLength = ConvertToTimeSpan(TimerSeconds);
             }
+            StartTimerObservables(playLength, playNext);            
+        }
+
+        private void StartTimerObservables(TimeSpan timespan, Func<Task> onNext) 
+        {
+            if (_timer == null) return;
 
             _timerCompleteSubscription?.Dispose();
             _currentTimeSubscription?.Dispose();
 
-            _timer?.StartNewTimer(playLength);
+            _timer?.StartNewTimer(timespan);
 
             _currentTimeSubscription = _timer?.CurrentTime
-                .Select(t => new TimeProgressViewModel(playLength, t))
+                .Select(t => new TimeProgressViewModel(timespan, t))
                 .ObserveOn(RxApp.MainThreadScheduler)
                 .ToPropertyEx(this, vm => vm.Progress);
 
@@ -295,7 +379,7 @@ private void InitializeProgress(Func<Task> playNext, ILaunchableItem? item)
                 .ObserveOn(RxApp.MainThreadScheduler)
                 .Subscribe(_ =>
                 {
-                    playNext();
+                    onNext();
                 });
         }
 
diff --git a/Source/Windows/TeensyRom.Ui/src/TeensyRom.Ui/Features/Discover/DiscoverViewModel.cs b/Source/Windows/TeensyRom.Ui/src/TeensyRom.Ui/Features/Discover/DiscoverViewModel.cs
index 60a77921..68c96607 100644
--- a/Source/Windows/TeensyRom.Ui/src/TeensyRom.Ui/Features/Discover/DiscoverViewModel.cs
+++ b/Source/Windows/TeensyRom.Ui/src/TeensyRom.Ui/Features/Discover/DiscoverViewModel.cs
@@ -91,10 +91,11 @@ public DiscoverViewModel(IPlayerContext player, ISerialStateContext serial, IDia
                 player.TogglePlay,
                 player.PlayPrevious,
                 player.PlayNext,
+                player.PlaySubtune,
                 player.SaveFavorite,
                 player.RemoveFavorite,
                 player.LoadDirectory,
-                player.SetScope,
+                player.SetScope,                
                 alert
             );
 
diff --git a/Source/Windows/TeensyRom.Ui/src/TeensyRom.Ui/Features/Discover/State/Player/IPlayerContext.cs b/Source/Windows/TeensyRom.Ui/src/TeensyRom.Ui/Features/Discover/State/Player/IPlayerContext.cs
index 8ae3c739..a657f74a 100644
--- a/Source/Windows/TeensyRom.Ui/src/TeensyRom.Ui/Features/Discover/State/Player/IPlayerContext.cs
+++ b/Source/Windows/TeensyRom.Ui/src/TeensyRom.Ui/Features/Discover/State/Player/IPlayerContext.cs
@@ -36,6 +36,7 @@ public interface IPlayerContext
         Unit NextPage();
         Task PlayNext();
         Task PlayPrevious();
+        Task PlaySubtune(int subtuneIndex);
         Task<ILaunchableItem?> PlayRandom();
         void UpdateHistory(ILaunchableItem fileToLoad);
         Unit PreviousPage();
diff --git a/Source/Windows/TeensyRom.Ui/src/TeensyRom.Ui/Features/Discover/State/Player/PlayerContext.cs b/Source/Windows/TeensyRom.Ui/src/TeensyRom.Ui/Features/Discover/State/Player/PlayerContext.cs
index b1c28f74..d9a1dbec 100644
--- a/Source/Windows/TeensyRom.Ui/src/TeensyRom.Ui/Features/Discover/State/Player/PlayerContext.cs
+++ b/Source/Windows/TeensyRom.Ui/src/TeensyRom.Ui/Features/Discover/State/Player/PlayerContext.cs
@@ -16,6 +16,7 @@
 using System.Windows.Input;
 using TeensyRom.Core.Commands;
 using TeensyRom.Core.Commands.File.LaunchFile;
+using TeensyRom.Core.Commands.PlaySubtune;
 using TeensyRom.Core.Common;
 using TeensyRom.Core.Logging;
 using TeensyRom.Core.Music.Sid;
@@ -735,5 +736,11 @@ await Application.Current.Dispatcher.Invoke(async () =>
         public void SetScopePath(string path) => _currentScopePath.OnNext(path);
         public StorageScope GetScope() => _currentScope.Value;
         public string GetScopePath() => _currentScopePath.Value;
+
+        public Task PlaySubtune(int subtuneIndex)
+        {
+            if (IsBusy()) return Task.CompletedTask;
+            return _mediator.Send(new PlaySubtuneCommand(subtuneIndex));
+        }
     }
 }
\ No newline at end of file
diff --git a/Source/Windows/TeensyRom.Ui/src/TeensyRom.Ui/TeensyRom.Ui.csproj b/Source/Windows/TeensyRom.Ui/src/TeensyRom.Ui/TeensyRom.Ui.csproj
index 5b5c3ca0..72c5b8aa 100644
--- a/Source/Windows/TeensyRom.Ui/src/TeensyRom.Ui/TeensyRom.Ui.csproj
+++ b/Source/Windows/TeensyRom.Ui/src/TeensyRom.Ui/TeensyRom.Ui.csproj
@@ -8,7 +8,7 @@
     <UseWPF>true</UseWPF>
 	<AssemblyVersion>1.0.0.0</AssemblyVersion>
 	<FileVersion>1.0.0.0</FileVersion>
-	<Version>1.0.0-alpha.54</Version>
+	<Version>1.0.0-alpha.55</Version>
   </PropertyGroup>
 
   <ItemGroup>