Merge branch 'audioplayer-status'

- Merging progress bar fix branch into main.

Author: markjamesm

src/.editorconfig

@@ -2,3 +2,6 @@
 
 # SA1118: Parameter should not span multiple lines
 dotnet_diagnostic.SA1118.severity = none
+
+# IDE0003: Remove qualification
+dotnet_diagnostic.IDE0003.severity = none

src/Enums/PlayerStatus.cs

@@ -0,0 +1,12 @@
+namespace MusicSharp
+{
+    /// <summary>
+    /// The status of the audio player.
+    /// </summary>
+    public enum PlayerStatus
+    {
+        Playing,
+        Paused,
+        Stopped
+    }
+}

src/model/IPlayer.cs

@@ -12,7 +12,7 @@ public interface IPlayer
         /// <summary>
         /// Gets or sets a value indicating whether the audio player is playing.
         /// </summary>
-        bool IsAudioPlaying { get; set; }
+        PlayerStatus PlayerStatus { get; set; }
 
         /// <summary>
         /// Gets or sets the last file opened by the player.

src/model/WinPlayer.cs

@@ -26,7 +26,7 @@ public WinPlayer()
         }
 
         /// <inheritdoc/>
-        public bool IsAudioPlaying { get; set; } = false;
+        public PlayerStatus PlayerStatus { get; set; } = PlayerStatus.Stopped;
 
         /// <inheritdoc/>
         public string LastFileOpened { get; set; }
@@ -35,7 +35,7 @@ public WinPlayer()
         public void Stop()
         {
             this.outputDevice.Stop();
-            this.IsAudioPlaying = false;
+            this.PlayerStatus = PlayerStatus.Stopped;
         }
 
         /// <summary>
@@ -50,7 +50,7 @@ public void OpenFile(string path)
                 this.audioFileReader = new AudioFileReader(path);
                 this.outputDevice.Init(this.audioFileReader);
                 this.outputDevice.Play();
-                this.IsAudioPlaying = true;
+                this.PlayerStatus = PlayerStatus.Playing;
             }
             else
             {
@@ -63,19 +63,22 @@ public void OpenFile(string path)
         /// </summary>
         public void PlayPause()
         {
-            if (
-                this.outputDevice.PlaybackState == PlaybackState.Paused ||
-                this.outputDevice.PlaybackState == PlaybackState.Stopped)
+            if (this.outputDevice.PlaybackState == PlaybackState.Stopped)
             {
                 this.outputDevice.Play();
-                this.IsAudioPlaying = true;
+                this.PlayerStatus = PlayerStatus.Playing;
                 return;
             }
-
-            if (this.outputDevice.PlaybackState == PlaybackState.Playing)
+            else if (this.outputDevice.PlaybackState == PlaybackState.Paused)
+            {
+                this.outputDevice.Play();
+                this.PlayerStatus = PlayerStatus.Playing;
+                return;
+            }
+            else if (this.outputDevice.PlaybackState == PlaybackState.Playing)
             {
                 this.outputDevice.Pause();
-                this.IsAudioPlaying = false;
+                this.PlayerStatus = PlayerStatus.Paused;
             }
         }
 
@@ -91,7 +94,7 @@ public void PlayFromPlaylist(string path)
                     this.audioFileReader = new AudioFileReader(path);
                     this.outputDevice.Init(this.audioFileReader);
                     this.outputDevice.Play();
-                    this.IsAudioPlaying = true;
+                    this.PlayerStatus = PlayerStatus.Playing;
                 }
                 catch (System.IO.FileNotFoundException)
                 {
@@ -173,7 +176,7 @@ public System.TimeSpan CurrentTime()
         {
             TimeSpan zeroTime = new TimeSpan(0);
 
-            if (this.outputDevice.PlaybackState != PlaybackState.Stopped && this.outputDevice.PlaybackState != PlaybackState.Paused)
+            if (this.outputDevice.PlaybackState != PlaybackState.Stopped)
             {
                 return this.audioFileReader.CurrentTime;
             }

src/view/Tui.cs

@@ -24,15 +24,13 @@ public class Tui
         private static StatusBar statusBar;
 
         private static Label trackName;
-        private static Label trackLength;
 
         /// <summary>
         /// Create a new instance of the audio player engine.
         /// </summary>
         private readonly IPlayer player;
 
         private object mainLoopTimeout = null;
-        private uint mainLooopTimeoutTick = 1000; // ms
 
         private List<string> playlist = new List<string>();
         private PlaylistLoader playlistLoader = new PlaylistLoader();
@@ -108,12 +106,19 @@ public void Start()
             playPauseButton.Clicked += () =>
             {
                 this.PlayPause();
+
+                if (this.player.PlayerStatus != PlayerStatus.Stopped)
+                {
+                    this.UpdateProgressBar();
+                }
             };
 
             var stopButton = new Button(16, 1, "Stop");
             stopButton.Clicked += () =>
             {
                 this.player.Stop();
+                this.AudioProgressBar.Fraction = 0F;
+                this.TimePlayedLabel();
             };
 
             var seekForward = new Button(26, 0, "Seek  5s");
@@ -171,8 +176,7 @@ public void Start()
                 this.player.LastFileOpened = a.Value.ToString();
                 this.player.PlayFromPlaylist(this.player.LastFileOpened);
                 this.NowPlaying(this.player.LastFileOpened);
-                this.TrackLength();
-                this.TimePlayed();
+                this.UpdateProgressBar();
             };
 
             playlistPane.Add(playlistView);
@@ -209,7 +213,11 @@ private void PlayPause()
             try
             {
                 this.player.PlayPause();
-                this.TimePlayed();
+
+                if (this.player.PlayerStatus == PlayerStatus.Playing)
+                {
+                    this.UpdateProgressBar();
+                }
             }
             catch (Exception)
             {
@@ -232,11 +240,12 @@ private void OpenFile()
             {
                 if (File.Exists(d.FilePath.ToString()))
                 {
-                this.player.LastFileOpened = d.FilePath.ToString();
-                this.player.OpenFile(this.player.LastFileOpened);
-                this.NowPlaying(this.player.LastFileOpened);
-                this.TrackLength();
-                this.TimePlayed();
+                    this.player.LastFileOpened = d.FilePath.ToString();
+                    this.player.OpenFile(this.player.LastFileOpened);
+                    this.NowPlaying(this.player.LastFileOpened);
+                    this.AudioProgressBar.Fraction = 0F;
+                    this.UpdateProgressBar();
+                    this.TimePlayedLabel();
                 }
                 else
                 {
@@ -324,46 +333,44 @@ private void NowPlaying(string track)
             nowPlaying.Add(trackName);
         }
 
-        private void TrackLength()
+        private void TimePlayedLabel()
         {
-            trackLength = new Label(this.player.TrackLength().ToString(@"mm\:ss"))
+            if (this.player.PlayerStatus != PlayerStatus.Stopped)
             {
-                X = Pos.Right(this.AudioProgressBar) + 7,
-                Y = 2,
-            };
-
-            nowPlaying.Add(trackLength);
-        }
-
-        private void TimePlayed()
-        {
-            this.AudioProgressBar.Fraction = 0F;
-
-            double counter = Convert.ToInt32(this.player.TrackLength().TotalSeconds);
-
-            this.mainLoopTimeout = Application.MainLoop.AddTimeout(TimeSpan.FromMilliseconds(this.mainLooopTimeoutTick), (loop) =>
+                var timePlayed = this.player.CurrentTime().ToString(@"mm\:ss");
+                var trackLength = this.player.TrackLength().ToString(@"mm\:ss");
+                trackName = new Label($"{timePlayed} / {trackLength}")
                 {
-                    while (counter != 0 && this.player.IsAudioPlaying)
-                    {
-                        this.AudioProgressBar.Fraction += (float)(1 / this.player.TrackLength().TotalSeconds);
-                        this.TimePlayedLabel(this.player.CurrentTime().ToString(@"mm\:ss"));
-                        counter--;
-                        return true;
-                    }
+                    X = Pos.Right(this.AudioProgressBar),
+                    Y = 2,
+                };
+            }
+            else
+            {
+                trackName = new Label($"00:00 / 00:00")
+                {
+                    X = Pos.Right(this.AudioProgressBar),
+                    Y = 2,
+                };
+            }
 
-                    return false;
-                });
+            nowPlaying.Add(trackName);
         }
 
-        private void TimePlayedLabel(string timePlayed)
+        private void UpdateProgressBar()
         {
-            trackName = new Label($"{timePlayed} / ")
+            this.mainLoopTimeout = Application.MainLoop.AddTimeout(TimeSpan.FromSeconds(1), (updateTimer) =>
             {
-                X = Pos.Right(this.AudioProgressBar),
-                Y = 2,
-            };
+                while (this.player.CurrentTime().Seconds < this.player.TrackLength().TotalSeconds && this.player.PlayerStatus is not PlayerStatus.Stopped)
+                {
+                    this.AudioProgressBar.Fraction = (float)(this.player.CurrentTime().Seconds / this.player.TrackLength().TotalSeconds);
+                    this.TimePlayedLabel();
 
-            nowPlaying.Add(trackName);
+                    return true;
+                }
+
+                return false;
+            });
         }
     }
 }