Implemented the MediaPlayer and MediaQueue classes as preparation for native Song playback.

Also added the FrameworkDispatcher calls in the Game class.
Checking for possible fire and forget sound instances to be disposed in the FrameworkDispatcher update chain.

ANX.Framework/ANX.Framework.csproj

@@ -446,6 +446,7 @@
     <Compile Include="NonXNA\RenderSystem\IOcclusionQuery.cs" />
     <Compile Include="NonXNA\RenderSystem\VertexTypeHelper.cs" />
     <Compile Include="NonXNA\SoundSystem\IMicrophone.cs" />
+    <Compile Include="NonXNA\SoundSystem\ISong.cs" />
     <Compile Include="NonXNA\ThreadHelper.cs" />
     <Compile Include="NonXNA\Windows8\AssetsHelper.cs" />
     <Compile Include="NonXNA\Windows8\IServiceProvider.cs" />

ANX.Framework/Audio/AudioEngine.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.IO;
+using System.Linq;
 using ANX.Framework.Audio.XactParser;
 using ANX.Framework.NonXNA;
 using ANX.Framework.NonXNA.Development;
@@ -74,32 +75,29 @@ namespace ANX.Framework.Audio
 		#region GetCategory
 		public AudioCategory GetCategory(string name)
 		{
-			for (int index = 0; index < generalSettings.Categories.Length; index++)
+		    foreach (AudioCategory category in generalSettings.Categories.Where(category => category.Name == name))
-				if (generalSettings.Categories[index].Name == name)
+		        return category;
-					return generalSettings.Categories[index];
 
-			return new AudioCategory(name);
+		    return new AudioCategory(name);
 		}
-		#endregion
+	    #endregion
 
 		#region GetGlobalVariable
 		public float GetGlobalVariable(string name)
-		{
+        {
-			foreach (var variable in generalSettings.Variables)
+            foreach (var variable in generalSettings.Variables.Where(variable => variable.Name == name))
-				if (variable.Name == name)
+                return variable.StartingValue;
-					return variable.StartingValue;
 
 			return 0f;
 		}
 		#endregion
 
 		#region SetGlobalVariable
-		public void SetGlobalVariable(string name, float value)
+        public void SetGlobalVariable(string name, float value)
-		{
+        {
-			foreach (var variable in generalSettings.Variables)
+            foreach (var variable in generalSettings.Variables.Where(variable => variable.Name == name))
-				if (variable.Name == name)
+                variable.StartingValue = MathHelper.Clamp(value, variable.MinValue, variable.MaxValue);
-					variable.StartingValue = MathHelper.Clamp(value, variable.MinValue, variable.MaxValue);
+        }
-		}
 		#endregion
 
 		#region Update (TODO)
@@ -112,14 +110,14 @@ namespace ANX.Framework.Audio
 		#region Dispose
 		protected virtual void Dispose(bool disposing)
 		{
-			if (IsDisposed == false)
+		    if (IsDisposed)
-			{
+		        return;
-				if (Disposing != null)
-					Disposing(this, EventArgs.Empty);
 
-				IsDisposed = true;
+		    if (Disposing != null)
-				generalSettings = null;
+		        Disposing(this, EventArgs.Empty);
-			}
+
+		    IsDisposed = true;
+		    generalSettings = null;
 		}
 
 		public void Dispose()

ANX.Framework/Audio/SoundEffect.cs

@@ -17,61 +17,29 @@ namespace ANX.Framework.Audio
 	public sealed class SoundEffect : IDisposable
 	{
 		#region Static
-		#region DistanceScale
+	    public static float DistanceScale
-		public static float DistanceScale
+	    {
-		{
+	        get { return GetCreator().DistanceScale; }
-			get
+	        set { GetCreator().DistanceScale = value; }
-			{
+	    }
-				return GetCreator().DistanceScale;
-			}
-			set
-			{
-				GetCreator().DistanceScale = value;
-			}
-		}
-		#endregion
 
-		#region DopplerScale
+	    public static float DopplerScale
-		public static float DopplerScale
+	    {
-		{
+	        get { return GetCreator().DopplerScale; }
-			get
+	        set { GetCreator().DopplerScale = value; }
-			{
+	    }
-				return GetCreator().DopplerScale;
-			}
-			set
-			{
-				GetCreator().DopplerScale = value;
-			}
-		}
-		#endregion
 
-		#region MasterVolume
+	    public static float MasterVolume
-		public static float MasterVolume
+	    {
-		{
+	        get { return GetCreator().MasterVolume; }
-			get
+	        set { GetCreator().MasterVolume = value; }
-			{
+	    }
-				return GetCreator().MasterVolume;
-			}
-			set
-			{
-				GetCreator().MasterVolume = value;
-			}
-		}
-		#endregion
 
-		#region SpeedOfSound
+	    public static float SpeedOfSound
-		public static float SpeedOfSound
+	    {
-		{
+	        get { return GetCreator().SpeedOfSound; }
-			get
+	        set { GetCreator().SpeedOfSound = value; }
-			{
+	    }
-				return GetCreator().SpeedOfSound;
-			}
-			set
-			{
-				GetCreator().SpeedOfSound = value;
-			}
-		}
-		#endregion
 		#endregion
 
 		#region Private
@@ -131,11 +99,13 @@ namespace ANX.Framework.Audio
 		{
 		}
 
-		public SoundEffect(byte[] buffer, int offset, int count, int sampleRate, AudioChannels channels, int loopStart, int loopLength)
+		public SoundEffect(byte[] buffer, int offset, int count, int sampleRate, AudioChannels channels, int loopStart,
+            int loopLength)
 			: this()
 		{
 			var creator = GetCreator();
-			NativeSoundEffect = creator.CreateSoundEffect(this, buffer, offset, count, sampleRate, channels, loopStart, loopLength);
+			NativeSoundEffect = creator.CreateSoundEffect(this, buffer, offset, count, sampleRate, channels, loopStart,
+                loopLength);
 		}
 
 		~SoundEffect()
@@ -204,9 +174,7 @@ namespace ANX.Framework.Audio
 				children.Add(new WeakReference(newInstance));
 
 				lock (fireAndForgetInstances)
-				{
 					fireAndForgetInstances.Add(newInstance);
-				}
 
 				newInstance.Play();
 			}
@@ -220,8 +188,27 @@ namespace ANX.Framework.Audio
 		}
 		#endregion
 
-		#region Dispose
+        #region RecycleStoppedFireAndForgetInstances
-		public void Dispose()
+        internal static void RecycleStoppedFireAndForgetInstances()
+        {
+            lock (fireAndForgetInstances)
+            {
+                var instancesToDispose = new List<SoundEffectInstance>();
+                foreach (SoundEffectInstance current in fireAndForgetInstances)
+                    if (current.State == SoundState.Stopped)
+                        instancesToDispose.Add(current);
+
+                foreach (SoundEffectInstance current in instancesToDispose)
+                {
+                    current.Dispose();
+                    fireAndForgetInstances.Remove(current);
+                }
+            }
+        }
+        #endregion
+
+        #region Dispose
+        public void Dispose()
 		{
 			if (IsDisposed)
 				return;

ANX.Framework/Audio/SoundEffectInstance.cs

@@ -16,13 +16,8 @@ namespace ANX.Framework.Audio
 	{
 		#region Private
 		private ISoundEffectInstance nativeInstance;
-
+	    internal bool IsFireAndForget { get; private set; }
-		internal bool IsFireAndForget
+	    #endregion
-		{
-			get;
-			private set;
-		}
-		#endregion
 
 		#region Public
 	    public bool IsDisposed { get; private set; }

ANX.Framework/Audio/XactParser/XactGeneralSettingsRpcCurve.cs

@@ -10,26 +10,14 @@ namespace ANX.Framework.Audio.XactParser
 	internal class XactGeneralSettingsRpcCurve
 	{
 		// what variable this curve involves
-		public ushort VariableIndex
+	    public ushort VariableIndex { get; private set; }
-		{
-			get;
-			private set;
-		}
 
-		// which parameter the curve affects refer to the above constants
+	    // which parameter the curve affects refer to the above constants
-		public short Parameters
+	    public short Parameters { get; private set; }
-		{
-			get;
-			private set;
-		}
 
-		public XactGeneralSettingsRpcCurvePoint[] Points
+	    public XactGeneralSettingsRpcCurvePoint[] Points { get; private set; }
-		{
-			get;
-			private set;
-		}
 
-		public XactGeneralSettingsRpcCurve(BinaryReader reader)
+	    public XactGeneralSettingsRpcCurve(BinaryReader reader)
 		{
 			VariableIndex = reader.ReadUInt16();
 			byte numberOfCurvePoints = reader.ReadByte();

ANX.Framework/Audio/XactParser/XactGeneralSettingsRpcCurvePoint.cs

@@ -17,29 +17,15 @@ namespace ANX.Framework.Audio.XactParser
 			SinCos = 0x03,
 		}
 
-		public float X
+	    public float X { get; private set; }
-		{
+	    public float Y { get; private set; }
-			get;
+	    public CurveType Type { get; private set; }
-			private set;
-		}
 
-		public float Y
+	    public XactGeneralSettingsRpcCurvePoint(BinaryReader reader)
-		{
-			get;
-			private set;
-		}
-
-		public CurveType Type
-		{
-			get;
-			private set;
-		}
-
-		public XactGeneralSettingsRpcCurvePoint(BinaryReader reader)
 		{
 			X = reader.ReadSingle();
 			Y = reader.ReadSingle();
-			Type = (XactGeneralSettingsRpcCurvePoint.CurveType)reader.ReadByte();
+			Type = (CurveType)reader.ReadByte();
 		}
 	}
 }

ANX.Framework/Audio/XactParser/XactGeneralSettingsVariable.cs

@@ -17,35 +17,15 @@ namespace ANX.Framework.Audio.XactParser
 			Reserved = 0x08,
 		}
 
-		public VariableFlags Flags
+	    public VariableFlags Flags { get; private set; }
-		{
+	    public float StartingValue { get; set; }
-			get;
+	    public float MinValue { get; private set; }
-			private set;
+	    public float MaxValue { get; private set; }
-		}
+	    public string Name;
-
-		public float StartingValue
-		{
-			get;
-			set;
-		}
-
-		public float MinValue
-		{
-			get;
-			private set;
-		}
-
-		public float MaxValue
-		{
-			get;
-			private set;
-		}
-
-		public string Name;
 
 		public XactGeneralSettingsVariable(BinaryReader reader)
 		{
-			Flags = (XactGeneralSettingsVariable.VariableFlags)reader.ReadByte();
+			Flags = (VariableFlags)reader.ReadByte();
 			StartingValue = reader.ReadSingle();
 			MinValue = reader.ReadSingle();
 			MaxValue = reader.ReadSingle();

ANX.Framework/FrameworkDispatcher.cs

@@ -1,4 +1,5 @@
 using System;
+using ANX.Framework.Audio;
 using ANX.Framework.NonXNA.Development;
 
 // This file is part of the ANX.Framework created by the
@@ -18,6 +19,8 @@ namespace ANX.Framework
 		{
 			if (OnUpdate != null)
 				OnUpdate();
+
+            SoundEffect.RecycleStoppedFireAndForgetInstances();
 		}
 	}
 }

ANX.Framework/Game.cs

@@ -6,6 +6,7 @@ using ANX.Framework.Graphics;
 using ANX.Framework.NonXNA;
 using ANX.Framework.NonXNA.Development;
 using ANX.Framework.NonXNA.PlatformSystem;
+using ANX.Framework.NonXNA.SoundSystem;
 
 #endregion // Using Statements
 
@@ -78,6 +79,8 @@ namespace ANX.Framework
 			AddSystemCreator<ISoundSystemCreator>();
 			AddSystemCreator<IRenderSystemCreator>();
 
+            FrameworkDispatcher.Update();
+
 			CreateGameHost();
 
 			Logger.Info("creating ContentManager");
@@ -151,6 +154,8 @@ namespace ANX.Framework
                     updateable.Update(gameTime);
                 }
             }
+
+            FrameworkDispatcher.Update();
 		}
 
 		protected virtual void Draw(GameTime gameTime)

ANX.Framework/Media/MediaPlayer.cs

@@ -1,4 +1,5 @@
 using System;
+using ANX.Framework.NonXNA.Development;
 
 // This file is part of the ANX.Framework created by the
 // "ANX.Framework developer group" and released under the Ms-PL license.
@@ -6,189 +7,170 @@ using System;
 
 namespace ANX.Framework.Media
 {
-	public static class MediaPlayer
+    [PercentageComplete(100)]
-	{
+    [TestState(TestStateAttribute.TestState.Untested)]
-		#region Events
+    [Developer("AstrorEnales")]
-		public static event EventHandler<EventArgs> ActiveSongChanged;
+    public static class MediaPlayer
-		public static event EventHandler<EventArgs> MediaStateChanged;
+    {
-		#endregion
+        #region Events
+        public static event EventHandler<EventArgs> ActiveSongChanged;
+        public static event EventHandler<EventArgs> MediaStateChanged;
+        #endregion
 
-		#region Public
+        private static bool isRepeating;
-		#region IsShuffled (TODO)
+        private static float volume;
-		public static bool IsShuffled
+        private static MediaState currentState;
-		{
+        internal static float VolumeToUse
-			get
+        {
-			{
+            get { return IsMuted ? 0f : volume; }
-				throw new NotImplementedException();
+        }
-			}
-			set
-			{
-				throw new NotImplementedException();
-			}
-		}
-		#endregion
 
-		#region IsRepeating (TODO)
+        #region Public
-		public static bool IsRepeating
+        public static bool IsShuffled { get; set; }
-		{
-			get
-			{
-				throw new NotImplementedException();
-			}
-			set
-			{
-				throw new NotImplementedException();
-			}
-		}
-		#endregion
 
-		#region Volume (TODO)
+        public static bool IsRepeating
-		public static float Volume
+        {
-		{
+            get { return isRepeating; }
-			get
+            set { isRepeating = value; }
-			{
+        }
-				throw new NotImplementedException();
-			}
-			set
-			{
-				throw new NotImplementedException();
-			}
-		}
-		#endregion
 
-		#region IsMuted (TODO)
+        public static float Volume
-		public static bool IsMuted
+        {
-		{
+            get { return volume; }
-			get
+            set { volume = MathHelper.Clamp(value, 0f, 1f); }
-			{
+        }
-				throw new NotImplementedException();
-			}
-			set
-			{
-				throw new NotImplementedException();
-			}
-		}
-		#endregion
 
-		#region IsVisualizationEnabled (TODO)
+        public static bool IsVisualizationEnabled { get; set; }
-		public static bool IsVisualizationEnabled
+        public static bool IsMuted { get; set; }
-		{
+        public static MediaQueue Queue { get; private set; }
-			get
+        public static MediaState State
-			{
+        {
-				throw new NotImplementedException();
+            get { return currentState; }
-			}
+            private set
-			set
+            {
-			{
+                if (currentState == value)
-				throw new NotImplementedException();
+                    return;
-			}
-		}
-		#endregion
 
-		public static MediaQueue Queue
+                currentState = value;
-		{
+                MediaStateChanged(null, EventArgs.Empty);
-			get;
+            }
-			private set;
+        }
-		}
 
-		#region State (TODO)
+        public static TimeSpan PlayPosition
-		public static MediaState State
+        {
-		{
+            get
-			get
+            {
-			{
+                return Queue.ActiveSong == null
-				throw new NotImplementedException();
+                    ? TimeSpan.Zero : Queue.ActiveSong.NativeSong.PlayPosition;
-			}
+            }
-		}
+        }
-		#endregion
 
-		#region PlayPosition (TODO)
+        public static bool GameHasControl
-		public static TimeSpan PlayPosition
+        {
-		{
+            get { return true; }
-			get
+        }
-			{
+        #endregion
-				throw new NotImplementedException();
-			}
-		}
-		#endregion
 
-		#region GameHasControl (TODO)
+        #region Constructor
-		public static bool GameHasControl
+        static MediaPlayer()
-		{
+        {
-			get
+            currentState = MediaState.Stopped;
-			{
+            volume = 1f;
-				throw new NotImplementedException();
+            isRepeating = false;
-			}
+            IsMuted = false;
-		}
+            IsVisualizationEnabled = false;
-		#endregion
+            IsShuffled = false;
-		#endregion
+            Queue = new MediaQueue();
+            FrameworkDispatcher.OnUpdate += Tick;
+        }
+        #endregion
 
-		#region Constructor
+        #region Play
-		static MediaPlayer()
+        public static void Play(Song song)
-		{
+        {
-			Queue = new MediaQueue();
+            Queue.Play(song);
-		}
+        }
-		#endregion
 
-		#region Play
+        public static void Play(SongCollection songCollection)
-		public static void Play(Song song)
+        {
-		{
+            Queue.Play(songCollection);
-			Queue.Play(song);
+        }
-		}
-		#endregion
 
-		#region Play
+        public static void Play(SongCollection songCollection, int index)
-		public static void Play(SongCollection songCollection)
+        {
-		{
+            Queue.Play(songCollection, index);
-			Queue.Play(songCollection);
+        }
-		}
+        #endregion
-		#endregion
 
-		#region Play (TODO)
+        #region Pause
-		public static void Play(SongCollection songCollection, int index)
+        public static void Pause()
-		{
+        {
-			throw new NotImplementedException();
+            if (Queue.ActiveSong != null)
-		}
+                Queue.ActiveSong.Pause();
-		#endregion
+        }
+        #endregion
 
-		#region Pause (TODO)
+        #region Resume
-		public static void Pause()
+        public static void Resume()
-		{
+        {
-			throw new NotImplementedException();
+            if (Queue.ActiveSong != null)
-		}
+                Queue.ActiveSong.Resume();
-		#endregion
+        }
+        #endregion
 
-		#region Resume (TODO)
+        #region Stop
-		public static void Resume()
+        public static void Stop()
-		{
+        {
-			throw new NotImplementedException();
+            Queue.Stop();
-		}
+        }
-		#endregion
+        #endregion
 
-		#region Stop (TODO)
+        #region MoveNext
-		public static void Stop()
+        public static void MoveNext()
-		{
+        {
-			throw new NotImplementedException();
+            Queue.MoveNext(false);
-		}
+        }
-		#endregion
+        #endregion
 
-		#region MoveNext
+        #region MovePrevious
-		public static void MoveNext()
+        public static void MovePrevious()
-		{
+        {
-			Queue.MoveNext();
+            Queue.MovePrevious();
-		}
+        }
-		#endregion
+        #endregion
 
-		#region MovePrevious
+        #region Tick
-		public static void MovePrevious()
+        private static void Tick()
-		{
+        {
-			Queue.MovePrevious();
+            if (Queue.ActiveSong == null)
-		}
+            {
-		#endregion
+                State = MediaState.Stopped;
+                return;
+            }
 
-		#region GetVisualizationData (TODO)
+            State = Queue.ActiveSong.State;
-		public static void GetVisualizationData(VisualizationData data)
+            if (Queue.ActiveSong.State != MediaState.Stopped)
-		{
+                return;
-			throw new NotImplementedException();
+
-		}
+            if (Queue.MoveNext(isRepeating))
-		#endregion
+                State = MediaState.Playing;
-	}
+
+            ActiveSongChanged(null, EventArgs.Empty);
+        }
+        #endregion
+
+        #region GetVisualizationData
+        public static void GetVisualizationData(VisualizationData visualizationData)
+        {
+            if (visualizationData == null)
+                throw new ArgumentNullException("visualizationData");
+
+            if (IsVisualizationEnabled == false)
+                return;
+
+            if(Queue.ActiveSong != null)
+                Queue.ActiveSong.NativeSong.GetVisualizationData(visualizationData);
+        }
+        #endregion
+    }
 }

ANX.Framework/Media/MediaQueue.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using ANX.Framework.NonXNA.Development;
 
 // This file is part of the ANX.Framework created by the
 // "ANX.Framework developer group" and released under the Ms-PL license.
@@ -7,57 +8,53 @@ using System.Collections.Generic;
 
 namespace ANX.Framework.Media
 {
+    [PercentageComplete(100)]
+    [TestState(TestStateAttribute.TestState.Untested)]
+    [Developer("AstrorEnales")]
 	public sealed class MediaQueue
 	{
-		#region Private
+		private readonly List<Song> queue;
-		private List<Song> queue;
-		#endregion
 
 		#region Public
-		public int Count
+	    public int Count
-		{
+	    {
-			get
+	        get { return queue.Count; }
-			{
+	    }
-				return queue.Count;
-			}
-		}
 
-		public int ActiveSongIndex
+	    public int ActiveSongIndex { get; set; }
-		{
-			get;
-			set;
-		}
 
-		public Song ActiveSong
+	    public Song ActiveSong
-		{
+	    {
-			get
+            get { return queue.Count <= 0 ? null : queue[ActiveSongIndex]; }
-			{
+	    }
-				return queue[ActiveSongIndex];
-			}
-		}
 
-		public Song this[int index]
+	    public Song this[int index]
-		{
+	    {
-			get
+	        get { return queue[index]; }
-			{
+	    }
-				return queue[index];
+	    #endregion
-			}
-		}
-		#endregion
 
 		#region Constructor
 		internal MediaQueue()
 		{
 			queue = new List<Song>();
 		}
+
+        ~MediaQueue()
+        {
+            queue.Clear();
+        }
 		#endregion
 
-		internal void Play(Song song)
+        #region Play
+        internal void Play(Song song)
 		{
 			if (song == null)
 				throw new ArgumentNullException("song");
 
+            Clear();
 			queue.Add(song);
+            ActiveSong.Play();
 		}
 
 		internal void Play(SongCollection songCollection)
@@ -65,29 +62,93 @@ namespace ANX.Framework.Media
 			if (songCollection == null)
 				throw new ArgumentNullException("songCollection");
 
-			queue.AddRange(songCollection);
+            Clear();
+            queue.AddRange(songCollection);
+            // TODO: check if the shuffle is calculated after each finished song or like this!
+            if (MediaPlayer.IsShuffled)
+		        Shuffle();
+            ActiveSong.Play();
 		}
 
-		internal void MoveNext()
+        internal void Play(SongCollection songCollection, int index)
-		{
+        {
-			if (Count > 0)
+            if (songCollection == null)
-			{
+                throw new ArgumentNullException("songCollection");
-				if (ActiveSongIndex < Count - 1)
-					ActiveSongIndex++;
-				else
-					ActiveSongIndex = 0;
-			}
-		}
 
-		internal void MovePrevious()
+            Clear();
+            ActiveSongIndex = index;
+            queue.AddRange(songCollection);
+            // TODO: check if the shuffle is calculated after each finished song or like this!
+            if (MediaPlayer.IsShuffled)
+		        Shuffle();
+            ActiveSong.Play();
+        }
+        #endregion
+
+        private void Clear()
+        {
+            Stop();
+            ActiveSongIndex = 0;
+            queue.Clear();
+        }
+        
+        internal void Stop()
+        {
+            if(ActiveSong != null)
+                ActiveSong.Stop();
+        }
+
+        private void Shuffle()
+        {
+            var rand = new Random();
+            int n = queue.Count;
+            while (n > 1)
+            {
+                int k = rand.Next(n);
+                n--;
+                Song value = queue[k];
+                queue[k] = queue[n];
+                queue[n] = value;
+            }
+        }
+
+        #region MoveNext
+        internal bool MoveNext(bool stopIfEnded)
 		{
-			if (Count > 0)
+		    if (Count <= 0)
-			{
+		        return false;
-				if (ActiveSongIndex > 0)
+
-					ActiveSongIndex--;
+            ActiveSong.Stop();
-				else
+
-					ActiveSongIndex = Count - 1;
+            if (ActiveSongIndex < Count - 1)
-			}
+                ActiveSongIndex++;
+            else
+            {
+                ActiveSongIndex = 0;
+                if (stopIfEnded)
+                    return false;
+            }
+
+            ActiveSong.Play();
+            return true;
 		}
+        #endregion
+
+        #region MovePrevious
+        internal void MovePrevious()
+		{
+		    if (Count <= 0)
+		        return;
+
+            ActiveSong.Stop();
+
+		    if (ActiveSongIndex > 0)
+		        ActiveSongIndex--;
+		    else
+                ActiveSongIndex = Count - 1;
+
+            ActiveSong.Play();
+		}
+	    #endregion
 	}
 }

ANX.Framework/Media/Song.cs

@@ -1,4 +1,7 @@
 using System;
+using ANX.Framework.NonXNA;
+using ANX.Framework.NonXNA.SoundSystem;
+using ANX.Framework.NonXNA.Development;
 
 // This file is part of the ANX.Framework created by the
 // "ANX.Framework developer group" and released under the Ms-PL license.
@@ -6,29 +9,23 @@ using System;
 
 namespace ANX.Framework.Media
 {
+    [PercentageComplete(50)]
+    [Developer("AstrorEnales")]
 	public sealed class Song : IEquatable<Song>, IDisposable
 	{
-		public bool IsDisposed
+        internal ISong NativeSong { get; private set; }
-		{
+        internal MediaState State { get { return NativeSong.State; } }
-			get;
-			private set;
-		}
 
-		public string Name
+        #region Public
-		{
+        public bool IsDisposed { get; private set; }
-			get;
+	    public string Name { get; private set; }
-			private set;
-		}
 
-		public bool IsRated
+	    public bool IsRated
-		{
+	    {
-			get
+	        get { return Rating > 0; }
-			{
+	    }
-				return Rating > 0;
-			}
-		}
 
-		public Artist Artist
+	    public Artist Artist
 		{
 			get
 			{
@@ -54,10 +51,7 @@ namespace ANX.Framework.Media
 
 		public TimeSpan Duration
 		{
-			get
+			get { return NativeSong.Duration; }
-			{
-				throw new NotImplementedException();
-			}
 		}
 
 		public int Rating
@@ -90,11 +84,13 @@ namespace ANX.Framework.Media
 			{
 				throw new NotImplementedException();
 			}
-		}
+        }
+        #endregion
 
 		#region Constructor
-		internal Song(string setName)
+		internal Song(string setName, Uri uri)
 		{
+            NativeSong = AddInSystemFactory.Instance.GetDefaultCreator<ISoundSystemCreator>().CreateSong(this, uri);
 			Name = setName;
 			IsDisposed = false;
 		}
@@ -105,9 +101,9 @@ namespace ANX.Framework.Media
 		}
 		#endregion
 
-		public Song FromUri(string name, Uri uri)
+		public static Song FromUri(string name, Uri uri)
 		{
-			throw new NotImplementedException();
+		    return new Song(name, uri);
 		}
 
 		public bool Equals(Song other)
@@ -125,13 +121,36 @@ namespace ANX.Framework.Media
 
 		public void Dispose()
 		{
-			if (IsDisposed == false)
+		    if (IsDisposed)
-			{
+		        return;
-				IsDisposed = true;
+
-				throw new NotImplementedException();
+		    IsDisposed = true;
-			}
+
+            if(NativeSong != null)
+                NativeSong.Dispose();
+		    NativeSong = null;
 		}
 
+        internal void Play()
+        {
+            NativeSong.Play();
+        }
+
+        internal void Stop()
+        {
+            NativeSong.Stop();
+        }
+
+        internal void Pause()
+        {
+            NativeSong.Pause();
+        }
+
+        internal void Resume()
+        {
+            NativeSong.Resume();
+        }
+
 		#region ToString
 		public override string ToString()
 		{
@@ -149,12 +168,12 @@ namespace ANX.Framework.Media
 		#region Operator overloading
 		public static bool operator ==(Song first, Song second)
 		{
-			return first.Equals(second);
+			return first != null && first.Equals(second);
 		}
 
 		public static bool operator !=(Song first, Song second)
 		{
-			return first.Equals(second) == false;
+			return first == null || first.Equals(second) == false;
 		}
 		#endregion
 	}

ANX.Framework/Media/VisualizationData.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.ObjectModel;
 
 // This file is part of the ANX.Framework created by the
@@ -7,22 +6,25 @@ using System.Collections.ObjectModel;
 
 namespace ANX.Framework.Media
 {
-	public class VisualizationData
+    public class VisualizationData
-	{
+    {
-		public ReadOnlyCollection<float> Frequencies
+        internal readonly float[] FrequencyData;
-		{
+        internal readonly float[] SampleData;
-			get
-			{
-				throw new NotImplementedException();
-			}
-		}
 
-		public ReadOnlyCollection<float> Samples
+        public ReadOnlyCollection<float> Frequencies
-		{
+        {
-			get
+            get { return new ReadOnlyCollection<float>(FrequencyData); }
-			{
+        }
-				throw new NotImplementedException();
+
-			}
+        public ReadOnlyCollection<float> Samples
-		}
+        {
-	}
+            get { return new ReadOnlyCollection<float>(SampleData); }
+        }
+
+        public VisualizationData()
+        {
+            FrequencyData = new float[256];
+            SampleData = new float[256];
+        }
+    }
 }

ANX.Framework/NonXNA/AddInSystemFactory.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using ANX.Framework.NonXNA.PlatformSystem;
 using ANX.Framework.NonXNA.Reflection;
+using ANX.Framework.NonXNA.SoundSystem;
 
 // This file is part of the ANX.Framework created by the
 // "ANX.Framework developer group" and released under the Ms-PL license.

ANX.Framework/NonXNA/SoundSystem/ISong.cs

@@ -0,0 +1,19 @@
+using System;
+using ANX.Framework.Media;
+
+namespace ANX.Framework.NonXNA.SoundSystem
+{
+    public interface ISong : IDisposable
+    {
+        TimeSpan Duration { get; }
+        TimeSpan PlayPosition { get; }
+        MediaState State { get; }
+
+        void Play();
+        void Stop();
+        void Pause();
+        void Resume();
+        void Update();
+        void GetVisualizationData(VisualizationData data);
+    }
+}

ANX.Framework/NonXNA/SoundSystem/ISoundSystemCreator.cs

@@ -1,41 +1,23 @@
+using System;
 using System.IO;
 using ANX.Framework.Audio;
-using ANX.Framework.NonXNA.SoundSystem;
 using System.Collections.ObjectModel;
+using ANX.Framework.Media;
 
 // This file is part of the ANX.Framework created by the
 // "ANX.Framework developer group" and released under the Ms-PL license.
 // For details see: http://anxframework.codeplex.com/license
 
-namespace ANX.Framework.NonXNA
+namespace ANX.Framework.NonXNA.SoundSystem
 {
 	public interface ISoundSystemCreator : ICreator
 	{
-		float DistanceScale
+	    float DistanceScale { get; set; }
-		{
+	    float DopplerScale { get; set; }
-			get;
+	    float MasterVolume { get; set; }
-			set;
+	    float SpeedOfSound { get; set; }
-		}
 
-		float DopplerScale
+	    IAudioListener CreateAudioListener();
-		{
-			get;
-			set;
-		}
-
-		float MasterVolume
-		{
-			get;
-			set;
-		}
-
-		float SpeedOfSound
-		{
-			get;
-			set;
-		}
-
-		IAudioListener CreateAudioListener();
 
 		IAudioEmitter CreateAudioEmitter();
 
@@ -52,5 +34,7 @@ namespace ANX.Framework.NonXNA
 		ReadOnlyCollection<Microphone> GetAllMicrophones();
 
 		int GetDefaultMicrophone(ReadOnlyCollection<Microphone> allMicrophones);
+
+        ISong CreateSong(Song parentSong, Uri uri);
 	}
 }

ANX.Framework/Properties/AssemblyInfo.cs

@@ -39,17 +39,17 @@ using System.Runtime.InteropServices;
 [assembly: InternalsVisibleTo("ANX.RenderSystem.Windows.Metro")]
 [assembly: InternalsVisibleTo("ANX.RenderSystem.GL3")]
 [assembly: InternalsVisibleTo("ANX.RenderSystem.Windows.PsVita")]
-[assembly: InternalsVisibleTo("ANX.Framework.Windows.Kinect")]
-[assembly: InternalsVisibleTo("ANX.Framework.Windows.XInput")]
-[assembly: InternalsVisibleTo("ANX.Framework.Windows.XAudio")]
 [assembly: InternalsVisibleTo("ANX.InputSystem.Recording")]
 [assembly: InternalsVisibleTo("ANX.InputDevices.PsVita")]
 [assembly: InternalsVisibleTo("ANX.InputDevices.Test")]
+[assembly: InternalsVisibleTo("ANX.InputDevices.Windows.Kinect")]
 [assembly: InternalsVisibleTo("ANX.InputDevices.Windows.XInput")]
 [assembly: InternalsVisibleTo("ANX.InputDevices.Windows.ModernUI")]
 [assembly: InternalsVisibleTo("ANX.PlatformSystem.Windows")]
 [assembly: InternalsVisibleTo("ANX.PlatformSystem.Linux")]
 [assembly: InternalsVisibleTo("ANX.PlatformSystem.Metro")]
 [assembly: InternalsVisibleTo("ANX.PlatformSystem.PsVita")]
+[assembly: InternalsVisibleTo("ANX.SoundSystem.Windows.XAudio")]
+[assembly: InternalsVisibleTo("ANX.SoundSystem.Windows.OpenAL")]
 [assembly: InternalsVisibleTo("ANX.Tools.XNBInspector")]
 [assembly: InternalsVisibleTo("ANX.Framework.Content.Pipeline")]

RenderSystems/ANX.Framework.GL3/GraphicsDeviceWindowsGL3.cs

@@ -42,25 +42,17 @@ namespace ANX.RenderSystem.GL3
 		{
 			get
 			{
-				return (Current == null || Current.nativeContext == null) ? false : Current.nativeContext.IsCurrent;
+				return (Current != null && Current.nativeContext != null) && Current.nativeContext.IsCurrent;
 			}
 		}
 		#endregion
 
 		#region Public
-		#region VSync
+	    public bool VSync
-		public bool VSync
+	    {
-		{
+	        get { return nativeContext.VSync; }
-			get
+	        set { nativeContext.VSync = value; }
-			{
+	    }
-				return nativeContext.VSync;
-			}
-			set
-			{
-				nativeContext.VSync = value;
-			}
-		}
-		#endregion
 		#endregion
 
 		#region Constructor

Samples/WpfEditor/MainWindow.xaml.cs

@@ -1,10 +1,10 @@
+using System;
+using System.Threading;
 using System.Windows;
+using System.Windows.Threading;
 using ANX.Framework;
 using ANX.Framework.Graphics;
-using System.Windows.Interop;
+using ANX.Framework.NonXNA;
-using System;
-using System.Windows.Threading;
-using System.Threading;
 
 // This file is part of the ANX.Framework created by the
 // "ANX.Framework developer group" and released under the Ms-PL license.
@@ -12,13 +12,18 @@ using System.Threading;
 
 namespace WpfEditor
 {
-	public partial class MainWindow : Window
+	public partial class MainWindow
 	{
 		private GraphicsDevice device;
+	    private readonly ThreadStart emptyThreadStart;
 
 		public MainWindow()
 		{
 			InitializeComponent();
+		    emptyThreadStart = delegate { };
+
+            //AddInSystemFactory.Instance.SetPreferredSystem(AddInType.RenderSystem, "OpenGL3");
+            AddInSystemFactory.Instance.SetPreferredSystem(AddInType.RenderSystem, "DirectX10");
 		}
 
 		protected override void OnActivated(EventArgs e)
@@ -30,10 +35,7 @@ namespace WpfEditor
 			while (IsVisible)
 			{
 				if (Application.Current != null)
-				{
+					Application.Current.Dispatcher.Invoke(DispatcherPriority.Background, emptyThreadStart);
-					Application.Current.Dispatcher.Invoke(
-						DispatcherPriority.Background, new ThreadStart(delegate { }));
-				}
 
 				Tick();
 			}
@@ -41,13 +43,11 @@ namespace WpfEditor
 
 		public void Initialize()
 		{
-			device = new GraphicsDevice(
+			device = new GraphicsDevice(GraphicsAdapter.DefaultAdapter, GraphicsProfile.HiDef,
-				GraphicsAdapter.DefaultAdapter,
-				GraphicsProfile.HiDef,
 				new PresentationParameters
 				{
-					BackBufferWidth = (int)GamePanel.Width,
+					BackBufferWidth = GamePanel.Width,
-					BackBufferHeight = (int)GamePanel.Height,
+					BackBufferHeight = GamePanel.Height,
 					BackBufferFormat = SurfaceFormat.Color,
 					DeviceWindowHandle = GamePanel.Handle,
 					PresentationInterval = PresentInterval.Default,

Samples/WpfEditor/WpfEditor.csproj

@@ -107,6 +107,10 @@
       <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\RenderSystems\ANX.Framework.GL3\ANX.RenderSystem.GL3.csproj">
+      <Project>{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}</Project>
+      <Name>ANX.RenderSystem.GL3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\RenderSystems\ANX.RenderSystem.Windows.DX10\ANX.RenderSystem.Windows.DX10.csproj">
       <Project>{5BE49183-2F6F-4527-AC90-D816911FCF90}</Project>
       <Name>ANX.RenderSystem.Windows.DX10</Name>

SoundSystems/ANX.SoundSystem.OpenAL/Creator.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.ObjectModel;
 using System.IO;
 using ANX.Framework.Audio;
+using ANX.Framework.Media;
 using ANX.Framework.NonXNA;
 using ANX.Framework.NonXNA.SoundSystem;
 using OpenTK;
@@ -15,24 +16,21 @@ namespace ANX.SoundSystem.OpenAL
 {
 	public class Creator : ISoundSystemCreator
 	{
+	    private float currentDistanceScale;
+	    private float currentMasterVolume;
+
 		#region Public
-		public string Name
+	    public string Name
-		{
+	    {
-			get
+	        get { return "OpenAL"; }
-			{
+	    }
-				return "OpenAL";
-			}
-		}
 
-		public int Priority
+	    public int Priority
-		{
+	    {
-			get
+	        get { return 100; }
-			{
+	    }
-				return 100;
-			}
-		}
 
-		public bool IsSupported
+	    public bool IsSupported
 		{
 			get
 			{
@@ -43,80 +41,60 @@ namespace ANX.SoundSystem.OpenAL
 			}
 		}
 
-		public float DistanceScale
+	    public float DistanceScale
-		{
+	    {
-			get
+	        get { return currentDistanceScale; }
-			{
+	        set
-				return 1f;
+	        {
-				//throw new NotImplementedException();
+	            currentDistanceScale = value;
-			}
+	            // TODO: set actual property
-			set
+	        }
-			{
+	    }
-				//throw new NotImplementedException();
-			}
-		}
 
-		public float DopplerScale
+	    public float DopplerScale
-		{
+	    {
-			get
+	        get { return AL.Get(ALGetFloat.DopplerFactor); }
-			{
+	        set { AL.DopplerFactor(value); }
-				return AL.Get(ALGetFloat.DopplerFactor);
+	    }
-			}
-			set
-			{
-				AL.DopplerFactor(value);
-			}
-		}
 
-		public float MasterVolume
+	    public float MasterVolume
-		{
+	    {
-			get
+	        get { return currentMasterVolume; }
-			{
+	        set
-				return 1f;
+	        {
-				//throw new NotImplementedException();
+	            currentMasterVolume = value;
-			}
+	            // TODO: set actual property
-			set
+	        }
-			{
+	    }
-				//throw new NotImplementedException();
-			}
-		}
 
-		public float SpeedOfSound
+	    public float SpeedOfSound
-		{
+	    {
-			get
+	        get { return AL.Get(ALGetFloat.SpeedOfSound); }
-			{
+	        set { AL.SpeedOfSound(value); }
-				return AL.Get(ALGetFloat.SpeedOfSound);
+	    }
-			}
+	    #endregion
-			set
-			{
-				AL.SpeedOfSound(value);
-			}
-		}
-		#endregion
 
 		public Creator()
 		{
+		    currentDistanceScale = 1f;
+		    currentMasterVolume = 1f;
 			Init();
 		}
 
-		private void Init()
+        private static void Init()
-		{
+        {
-			IntPtr deviceHandle;
+            ContextHandle context = Alc.GetCurrentContext();
-			ContextHandle context = Alc.GetCurrentContext();
+            if (context.Handle == IntPtr.Zero)
-			if (context.Handle != IntPtr.Zero)
+            {
-			{
+                string deviceName = Alc.GetString(IntPtr.Zero, AlcGetString.DefaultDeviceSpecifier);
-				deviceHandle = Alc.GetContextsDevice(context);
+                IntPtr deviceHandle = Alc.OpenDevice(deviceName);
-			}
+                context = Alc.CreateContext(deviceHandle, new int[0]);
-			else
+            }
-			{
-				deviceHandle = Alc.OpenDevice(Alc.GetString(IntPtr.Zero, AlcGetString.DefaultDeviceSpecifier));
-				context = Alc.CreateContext(deviceHandle, new int[0]);
-			}
 
-			bool isNowCurrent = Alc.MakeContextCurrent(context);
+            Alc.MakeContextCurrent(context);
-		}
+        }
 
-		#region CreateSoundEffectInstance
+	    #region CreateSoundEffectInstance
 		public ISoundEffectInstance CreateSoundEffectInstance(ISoundEffect nativeSoundEffect)
 		{
 			PreventSystemChange();
@@ -179,9 +157,15 @@ namespace ANX.SoundSystem.OpenAL
 			PreventSystemChange();
 			throw new NotImplementedException();
 		}
-		#endregion
+        #endregion
 
-		private void PreventSystemChange()
+        public ISong CreateSong(Song parentSong, Uri uri)
+        {
+            PreventSystemChange();
+            throw new NotImplementedException();
+        }
+
+		private static void PreventSystemChange()
 		{
 			AddInSystemFactory.Instance.PreventSystemChange(AddInType.SoundSystem);
 		}

SoundSystems/ANX.SoundSystem.OpenAL/OpenALSoundEffectInstance.cs

@@ -12,87 +12,69 @@ namespace ANX.SoundSystem.OpenAL
 	public class OpenALSoundEffectInstance : ISoundEffectInstance
 	{
 		#region Private
-		private OpenALSoundEffect parent;
+		private readonly OpenALSoundEffect parent;
-
+	    private float currentPan;
 		private int handle;
 		#endregion
 
 		#region Public
-		public bool IsLooped
+	    public bool IsLooped
-		{
+	    {
-			get
+	        get
-			{
+	        {
-				bool result;
+	            bool result;
-				AL.GetSource(handle, ALSourceb.Looping, out result);
+	            AL.GetSource(handle, ALSourceb.Looping, out result);
-				return result;
+	            return result;
-			}
+	        }
-			set
+	        set { AL.Source(handle, ALSourceb.Looping, value); }
-			{
+	    }
-				AL.Source(handle, ALSourceb.Looping, value);
-			}
-		}
 
-		public float Pan
+	    public float Pan
-		{
+	    {
-			get
+            get { return currentPan; }
-			{
+	        set
-				return 0f;
+	        {
-				//throw new NotImplementedException();
+	            currentPan = value;
-			}
+                // TODO: set actual parameter
-			set
+	        }
-			{
+	    }
-				//throw new NotImplementedException();
-			}
-		}
 
-		public float Pitch
+	    public float Pitch
-		{
+	    {
-			get
+	        get
-			{
+	        {
-				float result;
+	            float result;
-				AL.GetSource(handle, ALSourcef.Pitch, out result);
+	            AL.GetSource(handle, ALSourcef.Pitch, out result);
-				return result;
+	            return result;
-			}
+	        }
-			set
+	        set { AL.Source(handle, ALSourcef.Pitch, value); }
-			{
+	    }
-				AL.Source(handle, ALSourcef.Pitch, value);
-			}
-		}
 
-		public SoundState State
+	    public SoundState State { get; private set; }
-		{
-			get;
-			private set;
-		}
 
-		public float Volume
+	    public float Volume
-		{
+	    {
-			get
+	        get
-			{
+	        {
-				float result;
+	            float result;
-				AL.GetSource(handle, ALSourcef.Gain, out result);
+	            AL.GetSource(handle, ALSourcef.Gain, out result);
-				return result;
+	            return result;
-			}
+	        }
-			set
+	        set { AL.Source(handle, ALSourcef.Gain, value); }
-			{
+	    }
-				AL.Source(handle, ALSourcef.Gain, value);
+	    #endregion
-			}
-		}
-		#endregion
 
 		#region Constructor
 		internal OpenALSoundEffectInstance(OpenALSoundEffect setParent)
 		{
 			parent = setParent;
-
 			State = SoundState.Stopped;
-
 			handle = AL.GenSource();
 			AL.Source(handle, ALSourcei.Buffer, parent.bufferHandle);
 			IsLooped = false;
 			Pitch = 1f;
 			Volume = 1f;
-			// TODO: Pan = 0f;
+			Pan = 0f;
 
 			ALError error = AL.GetError();
 			if (error != ALError.NoError)
@@ -103,47 +85,44 @@ namespace ANX.SoundSystem.OpenAL
 		#region Play
 		public void Play()
 		{
-			if (State != SoundState.Playing)
+		    if (State == SoundState.Playing)
-			{
+		        return;
-				State = SoundState.Playing;
+
-				AL.SourcePlay(handle);
+		    State = SoundState.Playing;
-			}
+		    AL.SourcePlay(handle);
 		}
 		#endregion
 
 		#region Pause
 		public void Pause()
 		{
-			if (State != SoundState.Paused)
+		    if (State == SoundState.Paused)
-			{
+		        return;
-				State = SoundState.Paused;
+
-				AL.SourcePause(handle);
+		    State = SoundState.Paused;
-			}
+		    AL.SourcePause(handle);
 		}
 		#endregion
 
 		#region Stop
 		public void Stop(bool immediate)
 		{
-			if (State == SoundState.Stopped)
+            if (State == SoundState.Stopped || immediate == false)
 				return;
 
-			if (immediate)
+		    State = SoundState.Stopped;
-			{
+		    AL.SourceStop(handle);
-				State = SoundState.Stopped;
-				AL.SourceStop(handle);
-			}
 		}
 		#endregion
 
 		#region Resume
 		public void Resume()
 		{
-			if (State != SoundState.Playing)
+		    if (State == SoundState.Playing)
-			{
+		        return;
-				State = SoundState.Playing;
+
-				AL.SourcePlay(handle);
+		    State = SoundState.Playing;
-			}
+		    AL.SourcePlay(handle);
 		}
 		#endregion
 

SoundSystems/ANX.SoundSystem.PsVita/Creator.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.ObjectModel;
 using System.IO;
 using ANX.Framework.Audio;
+using ANX.Framework.Media;
 using ANX.Framework.NonXNA;
 using ANX.Framework.NonXNA.SoundSystem;
 
@@ -163,6 +164,12 @@ namespace ANX.SoundSystem.PsVita
 		{
 			throw new NotImplementedException();
 		}
-		#endregion
+        #endregion
+
+        public ISong CreateSong(Song parentSong, Uri uri)
+        {
+            AddInSystemFactory.Instance.PreventSystemChange(AddInType.SoundSystem);
+            throw new NotImplementedException();
+        }
 	}
 }

SoundSystems/ANX.SoundSystem.Windows.XAudio/Creator.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.ObjectModel;
 using System.IO;
 using ANX.Framework.Audio;
+using ANX.Framework.Media;
 using ANX.Framework.NonXNA;
 using ANX.Framework.NonXNA.SoundSystem;
 using SharpDX.XAudio2;
@@ -86,7 +87,10 @@ namespace ANX.SoundSystem.Windows.XAudio
         ~Creator()
         {
             if (MasteringVoice != null)
+            {
+                MasteringVoice.DestroyVoice();
                 MasteringVoice.Dispose();
+            }
 
             if (device != null)
                 device.Dispose();
@@ -149,9 +153,15 @@ namespace ANX.SoundSystem.Windows.XAudio
 			throw new NotImplementedException();
 		}
 
+        public ISong CreateSong(Song parentSong, Uri uri)
+        {
+            PreventSystemChange();
+            throw new NotImplementedException();
+        }
+
 		private static void PreventSystemChange()
 		{
 			AddInSystemFactory.Instance.PreventSystemChange(AddInType.SoundSystem);
 		}
-	}
+    }
 }

SoundSystems/ANX.SoundSystem.Windows.XAudio/XAudioSoundEffectInstance.cs

@@ -74,11 +74,17 @@ namespace ANX.SoundSystem.Windows.XAudio
             currentPan = 0f;
             currentPitch = 1f;
             State = SoundState.Stopped;
-            source = new SourceVoice(device, setParent.WaveFormat);
+            source = new SourceVoice(device, setParent.WaveFormat, true);
             source.SubmitSourceBuffer(setParent.AudioBuffer, setParent.DecodedPacketsInfo);
+            source.StreamEnd += StreamEnd;
         }
         #endregion
 
+        private void StreamEnd()
+        {
+            State = SoundState.Stopped;
+        }
+
         #region Play
         public void Play()
         {
@@ -94,6 +100,7 @@ namespace ANX.SoundSystem.Windows.XAudio
         public void Pause()
         {
             State = SoundState.Paused;
+            throw new NotImplementedException();
         }
         #endregion
 
@@ -115,6 +122,7 @@ namespace ANX.SoundSystem.Windows.XAudio
         public void Resume()
         {
             State = SoundState.Playing;
+            throw new NotImplementedException();
         }
         #endregion
 
@@ -182,7 +190,11 @@ namespace ANX.SoundSystem.Windows.XAudio
         public void Dispose()
         {
             if (source != null)
+            {
+                source.StreamEnd -= StreamEnd;
+                source.DestroyVoice();
                 source.Dispose();
+            }
             source = null;
         }
         #endregion