Replaced DateTime.Now with MusicPlayer.Time, removed MultiTrackMMLPla…

…yer.Loop property that should never have been there in the first place
Enichan · Aug 4, 2019 · 4f8911a · 4f8911a
1 parent 6cb1ab1
commit 4f8911a
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 24 deletions.
diff --git a/MidiPlayer/Form1.cs b/MidiPlayer/Form1.cs
@@ -126,7 +126,7 @@ protected override void OnClosed(EventArgs e) {
 
         private void Play() {
             try {
-                TimeSpan now = new TimeSpan(DateTime.Now.Ticks);
+                TimeSpan now = new TimeSpan(MusicPlayer.Time.Ticks);
                 player.Play(now);
 
                 while (player != null && !stopPlaying) {
@@ -145,7 +145,7 @@ private void Play() {
                         }
                     }
                     Thread.Sleep(1);
-                    now = new TimeSpan(DateTime.Now.Ticks);
+                    now = new TimeSpan(MusicPlayer.Time.Ticks);
                 }
 
                 lock (playerLock) {
@@ -271,7 +271,7 @@ private void scrSeek_MouseDown(object sender, MouseEventArgs e) {
                 if (player != null) {
                     double perc = e.X / (double)scrSeek.Width;
                     int seconds = (int)(perc * player.Duration.TotalSeconds);
-                    player.Seek(new TimeSpan(DateTime.Now.Ticks), TimeSpan.FromSeconds(seconds));
+                    player.Seek(new TimeSpan(MusicPlayer.Time.Ticks), TimeSpan.FromSeconds(seconds));
                     SetScrollValue(seconds + 1);
                     SetScrollValue(seconds);
                 }
@@ -283,7 +283,7 @@ private void btnPlay_Click(object sender, EventArgs e) {
                 if (player != null) {
                     if (player.Playing && !player.Paused)
                         player.Stop();
-                    player.Play(new TimeSpan(DateTime.Now.Ticks));
+                    player.Play(new TimeSpan(MusicPlayer.Time.Ticks));
                 }
             }
         }

diff --git a/MidiPlayer/PlayerMML.cs b/MidiPlayer/PlayerMML.cs
@@ -179,7 +179,7 @@ protected override void PlayNote(Note note, int channel, TimeSpan time) {
         /// <summary>
         /// Thread-safe
         /// </summary>
-        public new bool Loop { get { return loop; } set { loop = value; } }
+        public bool Loop { get { return loop; } set { loop = value; } }
         public override TimeSpan Elapsed { get { return elapsed; } }
         public bool Paused { 
             get { 

diff --git a/PitchSample/SoundSource.cs b/PitchSample/SoundSource.cs
@@ -26,6 +26,7 @@
 using System.Linq;
 using System.Text;
 using Cireon.Audio;
+using TextPlayer;
 
 namespace PitchSample {
     class SoundSource {
@@ -41,7 +42,7 @@ public SoundSource(Source source) {
         }
 
         public void Fade() {
-            fadeStart = new TimeSpan(DateTime.Now.Ticks);
+            fadeStart = new TimeSpan(MusicPlayer.Time.Ticks);
             fadeEnd = fadeStart + TimeSpan.FromMilliseconds(100);
         }
 

diff --git a/TextPlayer/IMusicPlayer.cs b/TextPlayer/IMusicPlayer.cs
@@ -44,7 +44,7 @@ interface IMusicPlayer {
         /// <param name="stream">A stream containing the song's code.</param>
         void Load(StreamReader stream);
         /// <summary>
-        /// Plays the song. Uses DateTime.Now as the starting time.
+        /// Plays the song. Uses MusicPlayer.Time as the starting time.
         /// </summary>
         void Play();
         /// <summary>
@@ -57,7 +57,7 @@ interface IMusicPlayer {
         /// </summary>
         void Stop();
         /// <summary>
-        /// Update this music player. Uses DateTime.Now as the current time.
+        /// Update this music player. Uses MusicPlayer.Time as the current time.
         /// </summary>
         void Update();
         /// <summary>
@@ -66,7 +66,7 @@ interface IMusicPlayer {
         /// <param name="currentTime">Current player time.</param>
         void Update(TimeSpan currentTime);
         /// <summary>
-        /// Seeks to position within the song (relative to TimeSpan.Zero). Uses DateTime.Now as the current time.
+        /// Seeks to position within the song (relative to TimeSpan.Zero). Uses MusicPlayer.Time as the current time.
         /// </summary>
         /// <param name="position">Position relative to TimeSpan.Zero to seek to.</param>
         void Seek(TimeSpan position);

diff --git a/TextPlayer/MML/MultiTrackMMLPlayer.cs b/TextPlayer/MML/MultiTrackMMLPlayer.cs
@@ -33,7 +33,6 @@ namespace TextPlayer.MML {
     public abstract class MultiTrackMMLPlayer : IMusicPlayer {
         private List<MMLPlayerTrack> tracks;
         private bool muted;
-        private bool loop;
         private MMLSettings settings;
         private TimeSpan duration;
         protected TimeSpan startTime;
@@ -78,10 +77,10 @@ public virtual void SetTempo(int tempo) {
         }
 
         /// <summary>
-        /// Plays the song. Uses DateTime.Now as the starting time.
+        /// Plays the song. Uses MusicPlayer.Time as the starting time.
         /// </summary>
         public virtual void Play() {
-            Play(new TimeSpan(DateTime.Now.Ticks));
+            Play(MusicPlayer.Time);
         }
 
         /// <summary>
@@ -97,10 +96,10 @@ public virtual void Play(TimeSpan currentTime) {
         }
 
         /// <summary>
-        /// Update this music player. Uses DateTime.Now as the current time.
+        /// Update this music player. Uses MusicPlayer.Time as the current time.
         /// </summary>
         public virtual void Update() {
-            Update(new TimeSpan(DateTime.Now.Ticks));
+            Update(MusicPlayer.Time);
         }
 
         /// <summary>
@@ -163,11 +162,11 @@ public virtual void Stop() {
         }
 
         /// <summary>
-        /// Seeks to position within the song (relative to TimeSpan.Zero). Uses DateTime.Now as the current time.
+        /// Seeks to position within the song (relative to TimeSpan.Zero). Uses MusicPlayer.Time as the current time.
         /// </summary>
         /// <param name="position">Position relative to TimeSpan.Zero to seek to.</param>
         public virtual void Seek(TimeSpan position) {
-            Seek(new TimeSpan(DateTime.Now.Ticks), position);
+            Seek(MusicPlayer.Time, position);
         }
 
         /// <summary>
@@ -413,8 +412,6 @@ public bool Muted {
         /// </summary>
         public TimeSpan Duration { get { return duration; } }
 
-        public bool Loop { get { return loop; } set { loop = value; } }
-
         private TimeSpan nextTick {
             get {
                 long max = 0;

diff --git a/TextPlayer/MusicPlayer.cs b/TextPlayer/MusicPlayer.cs
@@ -25,12 +25,34 @@
 using System.Collections.Generic;
 using System.Text;
 using System.IO;
+using System.Diagnostics;
 
 namespace TextPlayer {
     /// <summary>
     /// Abstract base music playing class.
     /// </summary>
     public abstract class MusicPlayer : IMusicPlayer {
+        #region Static
+        private static Stopwatch time;
+        private static object timeLock = new object();
+
+        static MusicPlayer() {
+            time = new Stopwatch();
+            time.Start();
+        }
+
+        /// <summary>
+        /// Get default time used for timing music players, thread-safe
+        /// </summary>
+        public static TimeSpan Time {
+            get {
+                lock (timeLock) {
+                    return time.Elapsed;
+                }
+            }
+        }
+        #endregion
+
         protected bool playing = false;
         protected TimeSpan lastTime;
         protected TimeSpan startTime;
@@ -73,10 +95,10 @@ public void Load(StreamReader stream) {
         }
 
         /// <summary>
-        /// Plays the song. Uses DateTime.Now as the starting time.
+        /// Plays the song. Uses MusicPlayer.Time as the starting time.
         /// </summary>
         public virtual void Play() {
-            Play(new TimeSpan(DateTime.Now.Ticks));
+            Play(MusicPlayer.Time);
         }
 
         /// <summary>
@@ -102,10 +124,10 @@ public virtual void Stop() {
         }
 
         /// <summary>
-        /// Update this music player. Uses DateTime.Now as the current time.
+        /// Update this music player. Uses MusicPlayer.Time as the current time.
         /// </summary>
         public virtual void Update() {
-            Update(new TimeSpan(DateTime.Now.Ticks));
+            Update(MusicPlayer.Time);
         }
 
         /// <summary>
@@ -119,11 +141,11 @@ public virtual void Update(TimeSpan currentTime) {
         }
 
         /// <summary>
-        /// Seeks to position within the song (relative to TimeSpan.Zero). Uses DateTime.Now as the current time.
+        /// Seeks to position within the song (relative to TimeSpan.Zero). Uses MusicPlayer.Time as the current time.
         /// </summary>
         /// <param name="position">Position relative to TimeSpan.Zero to seek to.</param>
         public virtual void Seek(TimeSpan position) {
-            Seek(new TimeSpan(DateTime.Now.Ticks));
+            Seek(MusicPlayer.Time, position);
         }
 
         /// <summary>