Make Player implement IDisposable

README.md

@@ -5,6 +5,8 @@
 ## Getting started
 
 ```csharp
-Player player = new Player();
-player.Play("C D E F G A B");
+using(var player = new Player())
+{
+    player.Play("C D E F G A B");
+}
 ```

src/NFugue/Playing/ManagedPlayer.cs

@@ -4,14 +4,15 @@
 
 namespace NFugue.Playing
 {
-    public class ManagedPlayer
+    public class ManagedPlayer : IDisposable
     {
         private static readonly ILogger log = LogManager.GetCurrentClassLogger();
         private readonly Sequencer sequencer = new Sequencer();
-        private OutputDevice outputDevice;
+        private readonly OutputDevice outputDevice;
 
         public ManagedPlayer()
         {
+            outputDevice = new OutputDevice(0);
             sequencer.PlayingCompleted += (s, e) => Finish();
             SubscribeMessageEvents();
         }
@@ -30,10 +31,6 @@ public ManagedPlayer()
 
         public void Start(Sequence sequence)
         {
-            if (outputDevice == null || outputDevice.IsDisposed)
-            {
-                outputDevice = new OutputDevice(0);
-            }
             sequencer.Sequence = sequence;
             log.Trace($"Playing sequence with division {sequence.Division}");
             foreach (var track in sequence)
@@ -82,9 +79,6 @@ public void Reset()
         public void Finish()
         {
             log.Trace("Playing completed. Closing device...");
-            outputDevice?.Close();
-            outputDevice?.Dispose();
-            outputDevice = null;
             Finished?.Invoke(this, EventArgs.Empty);
             IsFinished = true;
         }
@@ -113,6 +107,11 @@ private void SubscribeMessageEvents()
                 outputDevice?.Send(e.Message);
             };
         }
+
+        public void Dispose()
+        {
+            outputDevice.Dispose();
+        }
     }
 
     public class SequenceEventArgs : EventArgs

src/NFugue/Playing/Player.cs

@@ -2,14 +2,15 @@
 using NFugue.Patterns;
 using NFugue.Staccato;
 using Sanford.Multimedia.Midi;
+using System;
 using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
 namespace NFugue.Playing
 {
-    public class Player
+    public class Player : IDisposable
     {
         private readonly ManagedPlayer managedPlayer = new ManagedPlayer();
         private readonly MidiEventManager eventManager = new MidiEventManager();
@@ -134,5 +135,10 @@ private void SubscribeToParserEvents()
                 }
             };
         }
+
+        public void Dispose()
+        {
+            managedPlayer.Dispose();
+        }
     }
 }

tests/NFugue.ManualTests/Tests/RhythmTests.cs

@@ -2,10 +2,11 @@
 using NFugue.Patterns;
 using NFugue.Playing;
 using NFugue.Rhythms;
+using System;
 
 namespace NFugue.ManualTests.Tests
 {
-    public class RhythmTests
+    public class RhythmTests : IDisposable
     {
         private readonly Rhythm rhythm = new Rhythm();
         private readonly Player player = new Player();
@@ -28,5 +29,10 @@ public void TwoToneRhythmTest()
             rhythm.AddLayer("oxoxoxoxoxoxoxoxoxoxoxoxoxoxoxoxoxoxo");
             player.Play(rhythm);
         }
+
+        public void Dispose()
+        {
+            player.Dispose();
+        }
     }
 }

tests/NFugue.ManualTests/Tests/StaccatoTests.cs

@@ -8,7 +8,7 @@
 
 namespace NFugue.ManualTests.Tests
 {
-    public class StaccatoTests
+    public class StaccatoTests : IDisposable
     {
         private readonly Player player = new Player();
 
@@ -120,5 +120,10 @@ public void MicrotonalTest()
             player.Play(microtone);
             player.Play(preprocessor.Preprocess(microtone, null));
         }
+
+        public void Dispose()
+        {
+            player.Dispose();
+        }
     }
 }

tests/NFugue.ManualTests/Utils/ManualTestAttribute.cs

@@ -1,8 +1,8 @@
-using Xunit;
+using System;
 
 namespace NFugue.ManualTests.Utils
 {
-    public class ManualTestAttribute : FactAttribute
+    public class ManualTestAttribute : Attribute
     {
         public ManualTestAttribute(string title, string description = "")
         {

tests/NFugue.ManualTests/Utils/ManualTestsRunner.cs

@@ -46,18 +46,22 @@ public void RunTests()
         private void RunTest(MethodInfo method, int testNumber)
         {
             var type = method.DeclaringType;
-            if (type != null)
-            {
-                var typeInstance = Activator.CreateInstance(type);
-                var attribute = method.GetCustomAttribute<ManualTestAttribute>();
+            if (type == null) return;
+            var typeInstance = Activator.CreateInstance(type);
+            var attribute = method.GetCustomAttribute<ManualTestAttribute>();
 
-                PrintBeforeTest(attribute, testNumber);
+            PrintBeforeTest(attribute, testNumber);
 
-                method.Invoke(typeInstance, null);
+            method.Invoke(typeInstance, null);
 
-                GetTestResult();
-                testsRun++;
+            if (typeof(IDisposable).IsAssignableFrom(type))
+            {
+                var disposeMethod = type.GetMethod("Dispose");
+                disposeMethod.Invoke(typeInstance, null);
             }
+
+            GetTestResult();
+            testsRun++;
         }
 
         private void GetTestResult()

tests/NFugue.Tests/Staccato/UnknownTokenTests.cs

@@ -1,12 +1,12 @@
 using FluentAssertions;
+using NFugue.Parsing;
 using NFugue.Playing;
 using System;
-using NFugue.Parsing;
 using Xunit;
 
 namespace Staccato.Tests
 {
-    public class UnknownTokenTests
+    public class UnknownTokenTests : IDisposable
     {
         private readonly Player player = new Player();
 
@@ -23,5 +23,10 @@ public void Should_throw_exception_if_flag_set()
             Action action = () => player.Play("UNKNOWN");
             action.ShouldThrow<ParserException>();
         }
+
+        public void Dispose()
+        {
+            player.Dispose();
+        }
     }
 }