From 9164b2297e661444c8ad7459f66ef6cc0339612b Mon Sep 17 00:00:00 2001
From: "SND\\AstrorEnales_cp"
 <SND\AstrorEnales_cp@7a4bfd9b-e295-4cbd-a51f-ab472bcf69b7>
Date: Sat, 25 Aug 2012 21:22:30 +0000
Subject: [PATCH] Removed the MediaSystem cause it isn't needed any more. Any
 stuff that was planned to go in there, will now be in the other systems

---
 ANX.Framework.sln                             | 28 -------
 ANX.Framework/ANX.Framework.csproj            |  2 +-
 ANX.Framework/Game.cs                         |  4 +-
 ANX.Framework/Media/MediaLibrary.cs           | 63 ++++++++-------
 ANX.Framework/Media/Playlist.cs               | 29 ++++---
 ANX.Framework/NonXNA/AddInSystemFactory.cs    |  1 -
 ANX.Framework/NonXNA/AddInType.cs             |  1 -
 .../NonXNA/MediaSystem/IMediaSystemCreator.cs | 12 ---
 .../PlatformSystem/INativeMediaLibrary.cs     | 26 ++++++
 .../PlatformSystem/IPlatformSystemCreator.cs  |  6 +-
 .../ANX.MediaSystem.PsVita.csproj             | 60 --------------
 .../ANX.MediaSystem.PsVita_PSVita.csproj      | 61 --------------
 .../ANX.MediaSystem.PsVita/Creator.cs         | 44 ----------
 .../Properties/AssemblyInfo.cs                | 36 ---------
 .../SupportedPlatformsImpl.cs                 | 23 ------
 .../ANX.MediaSystem.Windows.OpenAL.csproj     | 74 -----------------
 ...NX.MediaSystem.Windows.OpenAL_Linux.csproj | 74 -----------------
 ...X.MediaSystem.Windows.OpenAL_PSVita.csproj | 75 -----------------
 ...aSystem.Windows.OpenAL_WindowsMetro.csproj | 80 -------------------
 .../ANX.MediaSystem.Windows.OpenAL/Creator.cs | 48 -----------
 .../Properties/AssemblyInfo.cs                | 36 ---------
 .../SupportedPlatformsImpl.cs                 | 28 -------
 .../LinuxPlatformCreator.cs                   | 10 +++
 .../PsVitaPlatformCreator.cs                  | 10 +++
 .../WindowsPlatformCreator.cs                 | 10 +++
 Samples/KeyboardSample/KeyboardSample.csproj  |  4 -
 Samples/Kinect/Kinect.csproj                  |  4 -
 .../ModelSample/ModelSample.csproj            |  4 -
 .../MultiRenderTarget.csproj                  |  4 -
 Samples/Primitives/Primitives.csproj          |  4 -
 .../RecordingSample/RecordingSample.csproj    |  4 -
 Samples/RenderTarget/RenderTarget.csproj      |  4 -
 Samples/SimpleSprite/SimpleSprite.csproj      |  4 -
 Samples/StencilBuffer/StencilBuffer.csproj    |  4 -
 Samples/TextRendering/TextRendering.csproj    |  4 -
 .../VertexIndexBuffer.csproj                  |  4 -
 .../WindowsFormsEditor.csproj                 |  4 -
 Samples/WindowsGame/WindowsGame.csproj        |  4 -
 Samples/WpfEditor/WpfEditor.csproj            |  4 -
 build/ANX.Framework.build                     | 54 -------------
 40 files changed, 114 insertions(+), 837 deletions(-)
 delete mode 100644 ANX.Framework/NonXNA/MediaSystem/IMediaSystemCreator.cs
 create mode 100644 ANX.Framework/NonXNA/PlatformSystem/INativeMediaLibrary.cs
 delete mode 100644 MediaSystems/ANX.MediaSystem.PsVita/ANX.MediaSystem.PsVita.csproj
 delete mode 100644 MediaSystems/ANX.MediaSystem.PsVita/ANX.MediaSystem.PsVita_PSVita.csproj
 delete mode 100644 MediaSystems/ANX.MediaSystem.PsVita/Creator.cs
 delete mode 100644 MediaSystems/ANX.MediaSystem.PsVita/Properties/AssemblyInfo.cs
 delete mode 100644 MediaSystems/ANX.MediaSystem.PsVita/SupportedPlatformsImpl.cs
 delete mode 100644 MediaSystems/ANX.MediaSystem.Windows.OpenAL/ANX.MediaSystem.Windows.OpenAL.csproj
 delete mode 100644 MediaSystems/ANX.MediaSystem.Windows.OpenAL/ANX.MediaSystem.Windows.OpenAL_Linux.csproj
 delete mode 100644 MediaSystems/ANX.MediaSystem.Windows.OpenAL/ANX.MediaSystem.Windows.OpenAL_PSVita.csproj
 delete mode 100644 MediaSystems/ANX.MediaSystem.Windows.OpenAL/ANX.MediaSystem.Windows.OpenAL_WindowsMetro.csproj
 delete mode 100644 MediaSystems/ANX.MediaSystem.Windows.OpenAL/Creator.cs
 delete mode 100644 MediaSystems/ANX.MediaSystem.Windows.OpenAL/Properties/AssemblyInfo.cs
 delete mode 100644 MediaSystems/ANX.MediaSystem.Windows.OpenAL/SupportedPlatformsImpl.cs

diff --git a/ANX.Framework.sln b/ANX.Framework.sln
index bf89b910..a85f78ee 100644
--- a/ANX.Framework.sln
+++ b/ANX.Framework.sln
@@ -133,10 +133,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.Test", "In
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiRenderTarget", "Samples\MultiRenderTarget\MultiRenderTarget.csproj", "{9C9C6245-35C2-4230-8E17-9038A228227F}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MediaSystems", "MediaSystems", "{6EDED295-0F32-4D05-A8EA-02F4BF89CF35}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.MediaSystem.Windows.OpenAL", "MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL.csproj", "{97185A92-077D-4498-8B6A-8BFF04079044}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PlatformSystems", "PlatformSystems", "{1436F7C9-29D3-4FEF-8914-10B45F13D142}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsFormsEditor", "Samples\WindowsFormsEditor\WindowsFormsEditor.csproj", "{441D953C-94C2-42FD-9917-3EB2F6E28173}"
@@ -181,8 +177,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.PsVita", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.SoundSystem.PsVita", "SoundSystems\ANX.SoundSystem.PsVita\ANX.SoundSystem.PsVita.csproj", "{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.MediaSystem.PsVita", "MediaSystems\ANX.MediaSystem.PsVita\ANX.MediaSystem.PsVita.csproj", "{E0BBE717-7549-4CB8-878C-1B91DCEF2829}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -496,16 +490,6 @@ Global
 		{9C9C6245-35C2-4230-8E17-9038A228227F}.Release|Mixed Platforms.Build.0 = Release|x86
 		{9C9C6245-35C2-4230-8E17-9038A228227F}.Release|x86.ActiveCfg = Release|x86
 		{9C9C6245-35C2-4230-8E17-9038A228227F}.Release|x86.Build.0 = Release|x86
-		{97185A92-077D-4498-8B6A-8BFF04079044}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{97185A92-077D-4498-8B6A-8BFF04079044}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{97185A92-077D-4498-8B6A-8BFF04079044}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{97185A92-077D-4498-8B6A-8BFF04079044}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{97185A92-077D-4498-8B6A-8BFF04079044}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{97185A92-077D-4498-8B6A-8BFF04079044}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{97185A92-077D-4498-8B6A-8BFF04079044}.Release|Any CPU.Build.0 = Release|Any CPU
-		{97185A92-077D-4498-8B6A-8BFF04079044}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{97185A92-077D-4498-8B6A-8BFF04079044}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{97185A92-077D-4498-8B6A-8BFF04079044}.Release|x86.ActiveCfg = Release|Any CPU
 		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Debug|Any CPU.Build.0 = Debug|x86
 		{441D953C-94C2-42FD-9917-3EB2F6E28173}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
@@ -693,16 +677,6 @@ Global
 		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94}.Release|x86.ActiveCfg = Release|Any CPU
-		{E0BBE717-7549-4CB8-878C-1B91DCEF2829}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E0BBE717-7549-4CB8-878C-1B91DCEF2829}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E0BBE717-7549-4CB8-878C-1B91DCEF2829}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E0BBE717-7549-4CB8-878C-1B91DCEF2829}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E0BBE717-7549-4CB8-878C-1B91DCEF2829}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E0BBE717-7549-4CB8-878C-1B91DCEF2829}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E0BBE717-7549-4CB8-878C-1B91DCEF2829}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E0BBE717-7549-4CB8-878C-1B91DCEF2829}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{E0BBE717-7549-4CB8-878C-1B91DCEF2829}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{E0BBE717-7549-4CB8-878C-1B91DCEF2829}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -752,8 +726,6 @@ Global
 		{BD648BB8-EF28-453C-B4F5-EE3C93EB4DAF} = {60824BDB-AC8A-42ED-9B79-111FB44669FF}
 		{6285F3EF-07DB-49C9-8CDE-A9092789FE4F} = {60824BDB-AC8A-42ED-9B79-111FB44669FF}
 		{32B91ACB-CC8A-4E43-A6F1-FC8F8CAA4D22} = {60824BDB-AC8A-42ED-9B79-111FB44669FF}
-		{97185A92-077D-4498-8B6A-8BFF04079044} = {6EDED295-0F32-4D05-A8EA-02F4BF89CF35}
-		{E0BBE717-7549-4CB8-878C-1B91DCEF2829} = {6EDED295-0F32-4D05-A8EA-02F4BF89CF35}
 		{068EB2E9-963C-4E1B-8831-E25011F11FFE} = {1436F7C9-29D3-4FEF-8914-10B45F13D142}
 		{04F6041E-475E-4B2A-A889-6A33EABD718B} = {1436F7C9-29D3-4FEF-8914-10B45F13D142}
 		{2B6D0EFF-7874-495F-9226-873ED9649C60} = {1436F7C9-29D3-4FEF-8914-10B45F13D142}
diff --git a/ANX.Framework/ANX.Framework.csproj b/ANX.Framework/ANX.Framework.csproj
index 5ae4f1eb..ff27ba43 100644
--- a/ANX.Framework/ANX.Framework.csproj
+++ b/ANX.Framework/ANX.Framework.csproj
@@ -430,11 +430,11 @@
     <Compile Include="NonXNA\PlatformSystem\INativeTitleContainer.cs" />
     <Compile Include="NonXNA\PlatformSystem\INativeGameTimer.cs" />
     <Compile Include="NonXNA\PlatformSystem\INativeContentManager.cs" />
+    <Compile Include="NonXNA\PlatformSystem\INativeMediaLibrary.cs" />
     <Compile Include="NonXNA\Reflection\AssemblyLoader.cs" />
     <Compile Include="NonXNA\SoundSystem\IMicrophone.cs" />
     <Compile Include="NonXNA\Windows8\AssetsHelper.cs" />
     <Compile Include="NonXNA\Windows8\IServiceProvider.cs" />
-    <Compile Include="NonXNA\MediaSystem\IMediaSystemCreator.cs" />
     <Compile Include="NonXNA\NoInputDeviceException.cs" />
     <Compile Include="NonXNA\OSInformation.cs" />
     <Compile Include="NonXNA\PlatformSystem\IPlatformSystemCreator.cs" />
diff --git a/ANX.Framework/Game.cs b/ANX.Framework/Game.cs
index a7405c98..27d9b3c6 100644
--- a/ANX.Framework/Game.cs
+++ b/ANX.Framework/Game.cs
@@ -62,7 +62,6 @@ namespace ANX.Framework
 
 			AddSystemCreator<IInputSystemCreator>();
 			AddSystemCreator<ISoundSystemCreator>();
-			AddSystemCreator<IMediaSystemCreator>();
 			AddSystemCreator<IPlatformSystemCreator>();
 			AddSystemCreator<IRenderSystemCreator>();
 
@@ -116,9 +115,8 @@ namespace ANX.Framework
 		{
 			T creator = AddInSystemFactory.Instance.GetDefaultCreator<T>();
 			if (creator != null)
-			{
 				this.gameServices.AddService(typeof(T), creator);
-			}
+
 			return creator;
 		}
 		#endregion
diff --git a/ANX.Framework/Media/MediaLibrary.cs b/ANX.Framework/Media/MediaLibrary.cs
index 136f4e35..41814799 100644
--- a/ANX.Framework/Media/MediaLibrary.cs
+++ b/ANX.Framework/Media/MediaLibrary.cs
@@ -1,5 +1,7 @@
 using System;
 using System.IO;
+using ANX.Framework.NonXNA;
+using ANX.Framework.NonXNA.PlatformSystem;
 
 // This file is part of the ANX.Framework created by the
 // "ANX.Framework developer group" and released under the Ms-PL license.
@@ -9,12 +11,20 @@ namespace ANX.Framework.Media
 {
 	public sealed class MediaLibrary : IDisposable
 	{
+		private INativeMediaLibrary nativeLibrary;
+
 		#region Public
+		public MediaSource MediaSource
+		{
+			get;
+			private set;
+		}
+
 		public PictureCollection Pictures
 		{
 			get
 			{
-				throw new NotImplementedException();
+				return nativeLibrary.GetPictures();
 			}
 		}
 		
@@ -22,7 +32,7 @@ namespace ANX.Framework.Media
 		{
 			get
 			{
-				throw new NotImplementedException();
+				return nativeLibrary.GetRootPictureAlbum();
 			}
 		}
 		
@@ -30,15 +40,7 @@ namespace ANX.Framework.Media
 		{
 			get
 			{
-				throw new NotImplementedException();
-			}
-		}
-		
-		public MediaSource MediaSource
-		{
-			get
-			{
-				throw new NotImplementedException();
+				return nativeLibrary.GetSavedPictures();
 			}
 		}
 		
@@ -46,7 +48,7 @@ namespace ANX.Framework.Media
 		{
 			get
 			{
-				throw new NotImplementedException();
+				return nativeLibrary.GetSongs();
 			}
 		}
 		
@@ -54,7 +56,7 @@ namespace ANX.Framework.Media
 		{
 			get
 			{
-				throw new NotImplementedException();
+				return nativeLibrary.GetArtists();
 			}
 		}
 		
@@ -62,7 +64,7 @@ namespace ANX.Framework.Media
 		{
 			get
 			{
-				throw new NotImplementedException();
+				return nativeLibrary.GetAlbums();
 			}
 		}
 		
@@ -70,7 +72,7 @@ namespace ANX.Framework.Media
 		{
 			get
 			{
-				throw new NotImplementedException();
+				return nativeLibrary.GetPlaylists();
 			}
 		}
 		
@@ -78,28 +80,29 @@ namespace ANX.Framework.Media
 		{
 			get
 			{
-				throw new NotImplementedException();
+				return nativeLibrary.GetGenres();
 			}
 		}
-		
+
 		public bool IsDisposed
 		{
-			get
-			{
-				throw new NotImplementedException();
-			}
+			get;
+			private set;
 		}
 		#endregion
 
 		#region Constructor
 		public MediaLibrary()
 		{
-			throw new NotImplementedException();
+			nativeLibrary = AddInSystemFactory.DefaultPlatformCreator.CreateMediaPlayer();
+			// TODO: create usefull mediasource...something like internal mediasource.default or so
+			MediaSource = new MediaSource();
 		}
 
 		public MediaLibrary(MediaSource setSource)
 		{
-			throw new NotImplementedException();
+			nativeLibrary = AddInSystemFactory.DefaultPlatformCreator.CreateMediaPlayer();
+			MediaSource = setSource;
 		}
 
 		~MediaLibrary()
@@ -111,26 +114,32 @@ namespace ANX.Framework.Media
 		#region Dispose
 		public void Dispose()
 		{
-			throw new NotImplementedException();
+			if (IsDisposed == false)
+			{
+				IsDisposed = true;
+
+				nativeLibrary.Dispose();
+				nativeLibrary = null;
+			}
 		}
 		#endregion
 
 		#region SavePicture
 		public Picture SavePicture(string file, byte[] data)
 		{
-			throw new NotImplementedException();
+			return nativeLibrary.SavePicture(file, data);
 		}
 
 		public Picture SavePicture(string file, Stream data)
 		{
-			throw new NotImplementedException();
+			return nativeLibrary.SavePicture(file, data);
 		}
 		#endregion
 
 		#region GetPictureFromToken
 		public Picture GetPictureFromToken(string file)
 		{
-			throw new NotImplementedException();
+			return nativeLibrary.GetPictureFromToken(file);
 		}
 		#endregion
 	}
diff --git a/ANX.Framework/Media/Playlist.cs b/ANX.Framework/Media/Playlist.cs
index 748d37ee..0ae2686b 100644
--- a/ANX.Framework/Media/Playlist.cs
+++ b/ANX.Framework/Media/Playlist.cs
@@ -10,10 +10,8 @@ namespace ANX.Framework.Media
 	{
 		public bool IsDisposed
 		{
-			get
-			{
-				throw new NotImplementedException();
-			}
+			get;
+			private set;
 		}
 
 		public string Name
@@ -40,6 +38,10 @@ namespace ANX.Framework.Media
 			}
 		}
 
+		internal Playlist()
+		{
+		}
+
 		~Playlist()
 		{
 			Dispose();
@@ -52,32 +54,39 @@ namespace ANX.Framework.Media
 
 		public override bool Equals(object obj)
 		{
-			throw new NotImplementedException();
+			if (obj is Playlist)
+				return Equals(obj as Playlist);
+
+			return base.Equals(obj);
 		}
 
 		public void Dispose()
 		{
-			throw new NotImplementedException();
+			if (IsDisposed == false)
+			{
+				IsDisposed = true;
+				throw new NotImplementedException();
+			}
 		}
 
 		public override string ToString()
 		{
-			throw new NotImplementedException();
+			return Name;
 		}
 
 		public override int GetHashCode()
 		{
-			throw new NotImplementedException();
+			return Name.GetHashCode();
 		}
 
 		public static bool operator ==(Playlist first, Playlist second)
 		{
-			throw new NotImplementedException();
+			return first.Equals(second);
 		}
 
 		public static bool operator !=(Playlist first, Playlist second)
 		{
-			throw new NotImplementedException();
+			return first.Equals(second) == false;
 		}
 	}
 }
diff --git a/ANX.Framework/NonXNA/AddInSystemFactory.cs b/ANX.Framework/NonXNA/AddInSystemFactory.cs
index ce87cab8..050d8b90 100644
--- a/ANX.Framework/NonXNA/AddInSystemFactory.cs
+++ b/ANX.Framework/NonXNA/AddInSystemFactory.cs
@@ -18,7 +18,6 @@ namespace ANX.Framework.NonXNA
 				typeof(IInputSystemCreator),
 				typeof(IRenderSystemCreator),
 				typeof(ISoundSystemCreator),
-				typeof(IMediaSystemCreator),
 				typeof(IPlatformSystemCreator),
 			};
 		#endregion
diff --git a/ANX.Framework/NonXNA/AddInType.cs b/ANX.Framework/NonXNA/AddInType.cs
index cbd33a25..d51c6ab7 100644
--- a/ANX.Framework/NonXNA/AddInType.cs
+++ b/ANX.Framework/NonXNA/AddInType.cs
@@ -10,7 +10,6 @@ namespace ANX.Framework.NonXNA
 		RenderSystem,
 		InputSystem,
 		SoundSystem,
-		MediaSystem,
 		PlatformSystem,
 	}
 }
diff --git a/ANX.Framework/NonXNA/MediaSystem/IMediaSystemCreator.cs b/ANX.Framework/NonXNA/MediaSystem/IMediaSystemCreator.cs
deleted file mode 100644
index 50105827..00000000
--- a/ANX.Framework/NonXNA/MediaSystem/IMediaSystemCreator.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-// 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
-{
-	public interface IMediaSystemCreator : ICreator
-	{
-	}
-}
diff --git a/ANX.Framework/NonXNA/PlatformSystem/INativeMediaLibrary.cs b/ANX.Framework/NonXNA/PlatformSystem/INativeMediaLibrary.cs
new file mode 100644
index 00000000..09b1efef
--- /dev/null
+++ b/ANX.Framework/NonXNA/PlatformSystem/INativeMediaLibrary.cs
@@ -0,0 +1,26 @@
+using System;
+using System.IO;
+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.PlatformSystem
+{
+	public interface INativeMediaLibrary : IDisposable
+	{
+		Picture SavePicture(string file, Stream data);
+		Picture SavePicture(string file, byte[] data);
+		Picture GetPictureFromToken(string file);
+
+		PictureCollection GetPictures();
+		PictureAlbum GetRootPictureAlbum();
+		PictureCollection GetSavedPictures();
+		SongCollection GetSongs();
+		ArtistCollection GetArtists();
+		AlbumCollection GetAlbums();
+		PlaylistCollection GetPlaylists();
+		GenreCollection GetGenres();
+	}
+}
diff --git a/ANX.Framework/NonXNA/PlatformSystem/IPlatformSystemCreator.cs b/ANX.Framework/NonXNA/PlatformSystem/IPlatformSystemCreator.cs
index 58130404..514b7666 100644
--- a/ANX.Framework/NonXNA/PlatformSystem/IPlatformSystemCreator.cs
+++ b/ANX.Framework/NonXNA/PlatformSystem/IPlatformSystemCreator.cs
@@ -10,16 +10,12 @@ namespace ANX.Framework.NonXNA.PlatformSystem
 	public interface IPlatformSystemCreator : ICreator
 	{
 		GameHost CreateGameHost(Game game);
-
 		INativeStorageDevice CreateStorageDevice(StorageDevice device,
 			PlayerIndex player, int sizeInBytes, int directoryCount);
-
 		INativeStorageContainer CreateStorageContainer(StorageContainer container);
-
 		INativeTitleContainer CreateTitleContainer();
-
 		INativeGameTimer CreateGameTimer();
-
 		INativeContentManager CreateContentManager();
+		INativeMediaLibrary CreateMediaPlayer();
 	}
 }
diff --git a/MediaSystems/ANX.MediaSystem.PsVita/ANX.MediaSystem.PsVita.csproj b/MediaSystems/ANX.MediaSystem.PsVita/ANX.MediaSystem.PsVita.csproj
deleted file mode 100644
index 89307694..00000000
--- a/MediaSystems/ANX.MediaSystem.PsVita/ANX.MediaSystem.PsVita.csproj
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E0BBE717-7549-4CB8-878C-1B91DCEF2829}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ANX.MediaSystem.PsVita</RootNamespace>
-    <AssemblyName>ANX.MediaSystem.PsVita</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="Sce.PlayStation.Core">
-      <HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Psm\v1.0\Sce.PlayStation.Core.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Creator.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SupportedPlatformsImpl.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\ANX.Framework\ANX.Framework.csproj">
-      <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
-      <Name>ANX.Framework</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/MediaSystems/ANX.MediaSystem.PsVita/ANX.MediaSystem.PsVita_PSVita.csproj b/MediaSystems/ANX.MediaSystem.PsVita/ANX.MediaSystem.PsVita_PSVita.csproj
deleted file mode 100644
index 3b51f8ff..00000000
--- a/MediaSystems/ANX.MediaSystem.PsVita/ANX.MediaSystem.PsVita_PSVita.csproj
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E0BBE717-7549-4CB8-878C-1B91DCEF2829}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ANX.MediaSystem.PsVita</RootNamespace>
-    <AssemblyName>ANX.MediaSystem.PsVita</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{69878862-DA7D-4DC6-B0A1-50D8FAB4242F};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;PSVITA;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;PSVITA;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="Sce.PlayStation.Core">
-      <HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Psm\v1.0\Sce.PlayStation.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Core" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Creator.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SupportedPlatformsImpl.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\ANX.Framework\ANX.Framework_PSVita.csproj">
-      <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
-      <Name>ANX.Framework</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Sce\Sce.Psm.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/MediaSystems/ANX.MediaSystem.PsVita/Creator.cs b/MediaSystems/ANX.MediaSystem.PsVita/Creator.cs
deleted file mode 100644
index 73587f12..00000000
--- a/MediaSystems/ANX.MediaSystem.PsVita/Creator.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using ANX.Framework.NonXNA;
-
-// 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.MediaSystem.PsVita
-{
-	public class Creator : IMediaSystemCreator
-	{
-		#region Public
-		#region Name
-		public string Name
-		{
-			get
-			{
-				return "Media.PsVita";
-			}
-		}
-		#endregion
-
-		#region Priority
-		public int Priority
-		{
-			get
-			{
-				return 10;
-			}
-		}
-		#endregion
-
-		#region IsSupported
-		public bool IsSupported
-		{
-			get
-			{
-				return OSInformation.GetName() == PlatformName.PSVita;
-			}
-		}
-		#endregion
-		#endregion
-	}
-}
diff --git a/MediaSystems/ANX.MediaSystem.PsVita/Properties/AssemblyInfo.cs b/MediaSystems/ANX.MediaSystem.PsVita/Properties/AssemblyInfo.cs
deleted file mode 100644
index 30a0c30a..00000000
--- a/MediaSystems/ANX.MediaSystem.PsVita/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// Allgemeine Informationen über eine Assembly werden über die folgenden 
-// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
-// die mit einer Assembly verknüpft sind.
-[assembly: AssemblyTitle("ANX.MediaSystem.PsVita")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("ANX.Framework Team")]
-[assembly: AssemblyProduct("ANX.MediaSystem.PsVita")]
-[assembly: AssemblyCopyright("Copyright © ANX.Framework Team 2012")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar 
-// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von 
-// COM zugreifen müssen, legen Sie das ComVisible-Attribut für diesen Typ auf "true" fest.
-[assembly: ComVisible(false)]
-
-// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
-[assembly: Guid("eaa02827-33a9-40cb-ac5e-9f23f3b3f561")]
-
-// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
-//
-//      Hauptversion
-//      Nebenversion 
-//      Buildnummer
-//      Revision
-//
-// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
-// übernehmen, indem Sie "*" eingeben:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/MediaSystems/ANX.MediaSystem.PsVita/SupportedPlatformsImpl.cs b/MediaSystems/ANX.MediaSystem.PsVita/SupportedPlatformsImpl.cs
deleted file mode 100644
index 4429501f..00000000
--- a/MediaSystems/ANX.MediaSystem.PsVita/SupportedPlatformsImpl.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using System;
-using ANX.Framework.NonXNA;
-
-// 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.MediaSystem.PsVita
-{
-	public class SupportedPlatformsImpl : ISupportedPlatforms
-	{
-		public PlatformName[] Names
-		{
-			get
-			{
-				return new PlatformName[]
-				{
-					PlatformName.PSVita,
-				};
-			}
-		}
-	}
-}
diff --git a/MediaSystems/ANX.MediaSystem.Windows.OpenAL/ANX.MediaSystem.Windows.OpenAL.csproj b/MediaSystems/ANX.MediaSystem.Windows.OpenAL/ANX.MediaSystem.Windows.OpenAL.csproj
deleted file mode 100644
index 85b81327..00000000
--- a/MediaSystems/ANX.MediaSystem.Windows.OpenAL/ANX.MediaSystem.Windows.OpenAL.csproj
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{97185A92-077D-4498-8B6A-8BFF04079044}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ANX.MediaSystem.Windows.OpenAL</RootNamespace>
-    <AssemblyName>ANX.MediaSystem.Windows.OpenAL</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin8|AnyCPU'">
-    <OutputPath>bin\DebugWin8\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin8|AnyCPU'">
-    <OutputPath>bin\ReleaseWin8\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\ANX.MediaSystem.Windows.OpenAL.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Creator.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SupportedPlatformsImpl.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\ANX.Framework\ANX.Framework.csproj">
-      <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
-      <Name>ANX.Framework</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/MediaSystems/ANX.MediaSystem.Windows.OpenAL/ANX.MediaSystem.Windows.OpenAL_Linux.csproj b/MediaSystems/ANX.MediaSystem.Windows.OpenAL/ANX.MediaSystem.Windows.OpenAL_Linux.csproj
deleted file mode 100644
index fc40348e..00000000
--- a/MediaSystems/ANX.MediaSystem.Windows.OpenAL/ANX.MediaSystem.Windows.OpenAL_Linux.csproj
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{97185A92-077D-4498-8B6A-8BFF04079044}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ANX.MediaSystem.Windows.OpenAL</RootNamespace>
-    <AssemblyName>ANX.MediaSystem.Windows.OpenAL</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;LINUX;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;LINUX;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin8|AnyCPU'">
-    <OutputPath>bin\DebugWin8\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin8|AnyCPU'">
-    <OutputPath>bin\ReleaseWin8\</OutputPath>
-    <DefineConstants>TRACE;LINUX;</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\ANX.MediaSystem.Windows.OpenAL.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Creator.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SupportedPlatformsImpl.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\ANX.Framework\ANX.Framework_Linux.csproj">
-      <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
-      <Name>ANX.Framework</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/MediaSystems/ANX.MediaSystem.Windows.OpenAL/ANX.MediaSystem.Windows.OpenAL_PSVita.csproj b/MediaSystems/ANX.MediaSystem.Windows.OpenAL/ANX.MediaSystem.Windows.OpenAL_PSVita.csproj
deleted file mode 100644
index fcf78c31..00000000
--- a/MediaSystems/ANX.MediaSystem.Windows.OpenAL/ANX.MediaSystem.Windows.OpenAL_PSVita.csproj
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>10.0.0</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{97185A92-077D-4498-8B6A-8BFF04079044}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ANX.MediaSystem.Windows.OpenAL</RootNamespace>
-    <AssemblyName>ANX.MediaSystem.Windows.OpenAL</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{69878862-DA7D-4DC6-B0A1-50D8FAB4242F};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;PSVITA;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;PSVITA;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin8|AnyCPU'">
-    <OutputPath>bin\DebugWin8\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin8|AnyCPU'">
-    <OutputPath>bin\ReleaseWin8\</OutputPath>
-    <DefineConstants>TRACE;PSVITA;</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\ANX.MediaSystem.Windows.OpenAL.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Creator.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SupportedPlatformsImpl.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\ANX.Framework\ANX.Framework_PSVita.csproj">
-      <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
-      <Name>ANX.Framework</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Sce\Sce.Psm.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/MediaSystems/ANX.MediaSystem.Windows.OpenAL/ANX.MediaSystem.Windows.OpenAL_WindowsMetro.csproj b/MediaSystems/ANX.MediaSystem.Windows.OpenAL/ANX.MediaSystem.Windows.OpenAL_WindowsMetro.csproj
deleted file mode 100644
index 0cc518c5..00000000
--- a/MediaSystems/ANX.MediaSystem.Windows.OpenAL/ANX.MediaSystem.Windows.OpenAL_WindowsMetro.csproj
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{97185A92-077D-4498-8B6A-8BFF04079044}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ANX.MediaSystem.Windows.OpenAL</RootNamespace>
-    <AssemblyName>ANX.MediaSystem.Windows.OpenAL</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <PackageCertificateKeyFile>Test_TemporaryKey.pfx</PackageCertificateKeyFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;WINDOWSMETRO;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;WINDOWSMETRO;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin8|AnyCPU'">
-    <OutputPath>bin\DebugWin8\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin8|AnyCPU'">
-    <OutputPath>bin\ReleaseWin8\</OutputPath>
-    <DefineConstants>TRACE;WINDOWSMETRO;</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\ANX.MediaSystem.Windows.OpenAL.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Creator.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SupportedPlatformsImpl.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\ANX.Framework\ANX.Framework_WindowsMetro.csproj">
-      <Project>{6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35}</Project>
-      <Name>ANX.Framework</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '11.0' ">
-    <VisualStudioVersion>11.0</VisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-</Project>
\ No newline at end of file
diff --git a/MediaSystems/ANX.MediaSystem.Windows.OpenAL/Creator.cs b/MediaSystems/ANX.MediaSystem.Windows.OpenAL/Creator.cs
deleted file mode 100644
index 02b09a2b..00000000
--- a/MediaSystems/ANX.MediaSystem.Windows.OpenAL/Creator.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using System;
-using ANX.Framework.NonXNA;
-
-// 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.MediaSystem.Windows.OpenAL
-{
-	public class Creator : IMediaSystemCreator
-	{
-		#region Public
-		#region Name
-		public string Name
-		{
-			get
-			{
-				return "Media.OpenAL";
-			}
-		}
-		#endregion
-
-		#region Priority
-		public int Priority
-		{
-			get
-			{
-				return 10;
-			}
-		}
-		#endregion
-
-		#region IsSupported
-		public bool IsSupported
-		{
-			get
-			{
-				//TODO: this is just a very basic version of test for support
-				PlatformName os = OSInformation.GetName();
-				return OSInformation.IsWindows ||
-					os == PlatformName.Linux ||
-					os == PlatformName.MacOSX;
-			}
-		}
-		#endregion
-		#endregion
-	}
-}
diff --git a/MediaSystems/ANX.MediaSystem.Windows.OpenAL/Properties/AssemblyInfo.cs b/MediaSystems/ANX.MediaSystem.Windows.OpenAL/Properties/AssemblyInfo.cs
deleted file mode 100644
index 0f5e9c1c..00000000
--- a/MediaSystems/ANX.MediaSystem.Windows.OpenAL/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// Allgemeine Informationen über eine Assembly werden über die folgenden 
-// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
-// die mit einer Assembly verknüpft sind.
-[assembly: AssemblyTitle("ANX.MediaSystem.Windows.OpenAL")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("ANX.Framework Tea")]
-[assembly: AssemblyProduct("ANX.MediaSystem.Windows.OpenAL")]
-[assembly: AssemblyCopyright("Copyright © ANX.Framework Tea 2012")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar 
-// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von 
-// COM zugreifen müssen, legen Sie das ComVisible-Attribut für diesen Typ auf "true" fest.
-[assembly: ComVisible(false)]
-
-// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
-[assembly: Guid("1395f0f5-84f8-4336-9c40-e9d80a3fef6b")]
-
-// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
-//
-//      Hauptversion
-//      Nebenversion 
-//      Buildnummer
-//      Revision
-//
-// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
-// übernehmen, indem Sie "*" eingeben:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/MediaSystems/ANX.MediaSystem.Windows.OpenAL/SupportedPlatformsImpl.cs b/MediaSystems/ANX.MediaSystem.Windows.OpenAL/SupportedPlatformsImpl.cs
deleted file mode 100644
index 8c49b4f7..00000000
--- a/MediaSystems/ANX.MediaSystem.Windows.OpenAL/SupportedPlatformsImpl.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using System;
-using ANX.Framework.NonXNA;
-
-// 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.MediaSystem.Windows.OpenAL
-{
-	public class SupportedPlatformsImpl : ISupportedPlatforms
-	{
-		public PlatformName[] Names
-		{
-			get
-			{
-				return new PlatformName[]
-				{
-					PlatformName.Linux,
-					PlatformName.MacOSX,
-					PlatformName.WindowsXP,
-					PlatformName.WindowsVista,
-					PlatformName.Windows7,
-					PlatformName.Windows8
-				};
-			}
-		}
-	}
-}
diff --git a/PlatformSystems/ANX.PlatformSystem.Linux/LinuxPlatformCreator.cs b/PlatformSystems/ANX.PlatformSystem.Linux/LinuxPlatformCreator.cs
index 3d6046fd..ae96cd24 100644
--- a/PlatformSystems/ANX.PlatformSystem.Linux/LinuxPlatformCreator.cs
+++ b/PlatformSystems/ANX.PlatformSystem.Linux/LinuxPlatformCreator.cs
@@ -86,5 +86,15 @@ namespace ANX.PlatformSystem.Linux
 			return new LinuxContentManager();
 		}
 		#endregion
+
+		#region IPlatformSystemCreator Member
+
+
+		public INativeMediaLibrary CreateMediaPlayer()
+		{
+			throw new System.NotImplementedException();
+		}
+
+		#endregion
 	}
 }
diff --git a/PlatformSystems/ANX.PlatformSystem.PsVita/PsVitaPlatformCreator.cs b/PlatformSystems/ANX.PlatformSystem.PsVita/PsVitaPlatformCreator.cs
index 3f753e3c..12d58d24 100644
--- a/PlatformSystems/ANX.PlatformSystem.PsVita/PsVitaPlatformCreator.cs
+++ b/PlatformSystems/ANX.PlatformSystem.PsVita/PsVitaPlatformCreator.cs
@@ -88,5 +88,15 @@ namespace ANX.PlatformSystem.PsVita
 			return new PsVitaContentManager();
 		}
 		#endregion
+
+		#region IPlatformSystemCreator Member
+
+
+		public INativeMediaLibrary CreateMediaPlayer()
+		{
+			throw new System.NotImplementedException();
+		}
+
+		#endregion
 	}
 }
diff --git a/PlatformSystems/ANX.PlatformSystem.Windows/WindowsPlatformCreator.cs b/PlatformSystems/ANX.PlatformSystem.Windows/WindowsPlatformCreator.cs
index a556c783..3f8b59a2 100644
--- a/PlatformSystems/ANX.PlatformSystem.Windows/WindowsPlatformCreator.cs
+++ b/PlatformSystems/ANX.PlatformSystem.Windows/WindowsPlatformCreator.cs
@@ -85,5 +85,15 @@ namespace ANX.PlatformSystem.Windows
 			return new WindowsContentManager();
 		}
 		#endregion
+
+		#region IPlatformSystemCreator Member
+
+
+		public INativeMediaLibrary CreateMediaPlayer()
+		{
+			throw new System.NotImplementedException();
+		}
+
+		#endregion
 	}
 }
diff --git a/Samples/KeyboardSample/KeyboardSample.csproj b/Samples/KeyboardSample/KeyboardSample.csproj
index e118a307..6073d5a5 100644
--- a/Samples/KeyboardSample/KeyboardSample.csproj
+++ b/Samples/KeyboardSample/KeyboardSample.csproj
@@ -111,10 +111,6 @@
       <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL.csproj">
-      <Project>{97185A92-077D-4498-8B6A-8BFF04079044}</Project>
-      <Name>ANX.MediaSystem.Windows.OpenAL</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\PlatformSystems\ANX.PlatformSystem.Windows\ANX.PlatformSystem.Windows.csproj">
       <Project>{068EB2E9-963C-4E1B-8831-E25011F11FFE}</Project>
       <Name>ANX.PlatformSystem.Windows</Name>
diff --git a/Samples/Kinect/Kinect.csproj b/Samples/Kinect/Kinect.csproj
index 63f19a01..d7609b7e 100644
--- a/Samples/Kinect/Kinect.csproj
+++ b/Samples/Kinect/Kinect.csproj
@@ -143,10 +143,6 @@
       <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL.csproj">
-      <Project>{97185A92-077D-4498-8B6A-8BFF04079044}</Project>
-      <Name>ANX.MediaSystem.Windows.OpenAL</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.DX10\ANX.RenderSystem.Windows.DX10.csproj">
       <Project>{5BE49183-2F6F-4527-AC90-D816911FCF90}</Project>
       <Name>ANX.RenderSystem.Windows.DX10</Name>
diff --git a/Samples/ModelSample/ModelSample/ModelSample.csproj b/Samples/ModelSample/ModelSample/ModelSample.csproj
index fdfd73a0..bc2d6b83 100644
--- a/Samples/ModelSample/ModelSample/ModelSample.csproj
+++ b/Samples/ModelSample/ModelSample/ModelSample.csproj
@@ -138,10 +138,6 @@
       <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL.csproj">
-      <Project>{97185A92-077D-4498-8B6A-8BFF04079044}</Project>
-      <Name>ANX.MediaSystem.Windows.OpenAL</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\PlatformSystems\ANX.PlatformSystem.Windows\ANX.PlatformSystem.Windows.csproj">
       <Project>{068EB2E9-963C-4E1B-8831-E25011F11FFE}</Project>
       <Name>ANX.PlatformSystem.Windows</Name>
diff --git a/Samples/MultiRenderTarget/MultiRenderTarget.csproj b/Samples/MultiRenderTarget/MultiRenderTarget.csproj
index 5c7622aa..66b726f0 100644
--- a/Samples/MultiRenderTarget/MultiRenderTarget.csproj
+++ b/Samples/MultiRenderTarget/MultiRenderTarget.csproj
@@ -133,10 +133,6 @@
       <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL.csproj">
-      <Project>{97185A92-077D-4498-8B6A-8BFF04079044}</Project>
-      <Name>ANX.MediaSystem.Windows.OpenAL</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\PlatformSystems\ANX.PlatformSystem.Windows\ANX.PlatformSystem.Windows.csproj">
       <Project>{068EB2E9-963C-4E1B-8831-E25011F11FFE}</Project>
       <Name>ANX.PlatformSystem.Windows</Name>
diff --git a/Samples/Primitives/Primitives.csproj b/Samples/Primitives/Primitives.csproj
index 8962056e..24af6f9d 100644
--- a/Samples/Primitives/Primitives.csproj
+++ b/Samples/Primitives/Primitives.csproj
@@ -112,10 +112,6 @@
       <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL.csproj">
-      <Project>{97185A92-077D-4498-8B6A-8BFF04079044}</Project>
-      <Name>ANX.MediaSystem.Windows.OpenAL</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\PlatformSystems\ANX.PlatformSystem.Windows\ANX.PlatformSystem.Windows.csproj">
       <Project>{068EB2E9-963C-4E1B-8831-E25011F11FFE}</Project>
       <Name>ANX.PlatformSystem.Windows</Name>
diff --git a/Samples/RecordingSample/RecordingSample.csproj b/Samples/RecordingSample/RecordingSample.csproj
index bfcf536c..fbaf8962 100644
--- a/Samples/RecordingSample/RecordingSample.csproj
+++ b/Samples/RecordingSample/RecordingSample.csproj
@@ -113,10 +113,6 @@
       <Project>{DB88DDEB-7281-405D-8FCA-5681B6B2BD7A}</Project>
       <Name>ANX.InputSystem.Recording</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL.csproj">
-      <Project>{97185A92-077D-4498-8B6A-8BFF04079044}</Project>
-      <Name>ANX.MediaSystem.Windows.OpenAL</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\PlatformSystems\ANX.PlatformSystem.Windows\ANX.PlatformSystem.Windows.csproj">
       <Project>{068EB2E9-963C-4E1B-8831-E25011F11FFE}</Project>
       <Name>ANX.PlatformSystem.Windows</Name>
diff --git a/Samples/RenderTarget/RenderTarget.csproj b/Samples/RenderTarget/RenderTarget.csproj
index 33337c93..d6d40ea6 100644
--- a/Samples/RenderTarget/RenderTarget.csproj
+++ b/Samples/RenderTarget/RenderTarget.csproj
@@ -113,10 +113,6 @@
       <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL.csproj">
-      <Project>{97185A92-077D-4498-8B6A-8BFF04079044}</Project>
-      <Name>ANX.MediaSystem.Windows.OpenAL</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\PlatformSystems\ANX.PlatformSystem.Windows\ANX.PlatformSystem.Windows.csproj">
       <Project>{068EB2E9-963C-4E1B-8831-E25011F11FFE}</Project>
       <Name>ANX.PlatformSystem.Windows</Name>
diff --git a/Samples/SimpleSprite/SimpleSprite.csproj b/Samples/SimpleSprite/SimpleSprite.csproj
index 829a31df..2996aa37 100644
--- a/Samples/SimpleSprite/SimpleSprite.csproj
+++ b/Samples/SimpleSprite/SimpleSprite.csproj
@@ -91,10 +91,6 @@
       <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL.csproj">
-      <Project>{97185A92-077D-4498-8B6A-8BFF04079044}</Project>
-      <Name>ANX.MediaSystem.Windows.OpenAL</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\PlatformSystems\ANX.PlatformSystem.Windows\ANX.PlatformSystem.Windows.csproj">
       <Project>{068EB2E9-963C-4E1B-8831-E25011F11FFE}</Project>
       <Name>ANX.PlatformSystem.Windows</Name>
diff --git a/Samples/StencilBuffer/StencilBuffer.csproj b/Samples/StencilBuffer/StencilBuffer.csproj
index b1d9c769..f92da922 100644
--- a/Samples/StencilBuffer/StencilBuffer.csproj
+++ b/Samples/StencilBuffer/StencilBuffer.csproj
@@ -148,10 +148,6 @@
       <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL.csproj">
-      <Project>{97185A92-077D-4498-8B6A-8BFF04079044}</Project>
-      <Name>ANX.MediaSystem.Windows.OpenAL</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\PlatformSystems\ANX.PlatformSystem.Windows\ANX.PlatformSystem.Windows.csproj">
       <Project>{068EB2E9-963C-4E1B-8831-E25011F11FFE}</Project>
       <Name>ANX.PlatformSystem.Windows</Name>
diff --git a/Samples/TextRendering/TextRendering.csproj b/Samples/TextRendering/TextRendering.csproj
index 76e61c22..86365787 100644
--- a/Samples/TextRendering/TextRendering.csproj
+++ b/Samples/TextRendering/TextRendering.csproj
@@ -113,10 +113,6 @@
       <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL.csproj">
-      <Project>{97185A92-077D-4498-8B6A-8BFF04079044}</Project>
-      <Name>ANX.MediaSystem.Windows.OpenAL</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\PlatformSystems\ANX.PlatformSystem.Windows\ANX.PlatformSystem.Windows.csproj">
       <Project>{068EB2E9-963C-4E1B-8831-E25011F11FFE}</Project>
       <Name>ANX.PlatformSystem.Windows</Name>
diff --git a/Samples/VertexIndexBuffer/VertexIndexBuffer.csproj b/Samples/VertexIndexBuffer/VertexIndexBuffer.csproj
index fc1cecd7..d9a5890a 100644
--- a/Samples/VertexIndexBuffer/VertexIndexBuffer.csproj
+++ b/Samples/VertexIndexBuffer/VertexIndexBuffer.csproj
@@ -112,10 +112,6 @@
       <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL.csproj">
-      <Project>{97185A92-077D-4498-8B6A-8BFF04079044}</Project>
-      <Name>ANX.MediaSystem.Windows.OpenAL</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\PlatformSystems\ANX.PlatformSystem.Windows\ANX.PlatformSystem.Windows.csproj">
       <Project>{068EB2E9-963C-4E1B-8831-E25011F11FFE}</Project>
       <Name>ANX.PlatformSystem.Windows</Name>
diff --git a/Samples/WindowsFormsEditor/WindowsFormsEditor.csproj b/Samples/WindowsFormsEditor/WindowsFormsEditor.csproj
index d10fb88b..bb5e2b3f 100644
--- a/Samples/WindowsFormsEditor/WindowsFormsEditor.csproj
+++ b/Samples/WindowsFormsEditor/WindowsFormsEditor.csproj
@@ -66,10 +66,6 @@
       <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL.csproj">
-      <Project>{97185A92-077D-4498-8B6A-8BFF04079044}</Project>
-      <Name>ANX.MediaSystem.Windows.OpenAL</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.GL3\ANX.RenderSystem.Windows.GL3.csproj">
       <Project>{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}</Project>
       <Name>ANX.RenderSystem.Windows.GL3</Name>
diff --git a/Samples/WindowsGame/WindowsGame.csproj b/Samples/WindowsGame/WindowsGame.csproj
index d19456df..c329ac0c 100644
--- a/Samples/WindowsGame/WindowsGame.csproj
+++ b/Samples/WindowsGame/WindowsGame.csproj
@@ -141,10 +141,6 @@
       <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL.csproj">
-      <Project>{97185A92-077D-4498-8B6A-8BFF04079044}</Project>
-      <Name>ANX.MediaSystem.Windows.OpenAL</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\PlatformSystems\ANX.PlatformSystem.Windows\ANX.PlatformSystem.Windows.csproj">
       <Project>{068EB2E9-963C-4E1B-8831-E25011F11FFE}</Project>
       <Name>ANX.PlatformSystem.Windows</Name>
diff --git a/Samples/WpfEditor/WpfEditor.csproj b/Samples/WpfEditor/WpfEditor.csproj
index a25e5d3e..c5401f81 100644
--- a/Samples/WpfEditor/WpfEditor.csproj
+++ b/Samples/WpfEditor/WpfEditor.csproj
@@ -107,10 +107,6 @@
       <Project>{49066074-3B7B-4A55-B122-6BD33AB73558}</Project>
       <Name>ANX.InputSystem.Standard</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\MediaSystems\ANX.MediaSystem.Windows.OpenAL\ANX.MediaSystem.Windows.OpenAL.csproj">
-      <Project>{97185A92-077D-4498-8B6A-8BFF04079044}</Project>
-      <Name>ANX.MediaSystem.Windows.OpenAL</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\RenderSystems\ANX.Framework.Windows.GL3\ANX.RenderSystem.Windows.GL3.csproj">
       <Project>{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6}</Project>
       <Name>ANX.RenderSystem.Windows.GL3</Name>
diff --git a/build/ANX.Framework.build b/build/ANX.Framework.build
index 760914c2..547b42cb 100644
--- a/build/ANX.Framework.build
+++ b/build/ANX.Framework.build
@@ -39,7 +39,6 @@
         <include name="${project.anx.path.rendersystem.dx11}/obj/**" />
         <include name="${project.anx.path.rendersystem.gl3}/obj/**" />
         <include name="${project.anx.path.rendersystem.metro}/obj/**" />
-        <include name="${project.anx.path.mediasystem.openal}/obj/**" />
         <include name="${project.anxcontent.path}/obj/**" />
       </fileset>
     </delete>
@@ -105,7 +104,6 @@
     <call target="inputsystem" />
     <call target="soundsystem" />
     <call target="rendersystem" />
-    <call target="mediasystem" />
     <call target="platformsystem" />
   </target>
 
@@ -304,57 +302,6 @@
     </foreach>
   </target>
 
-  <target name="mediasystem" description="Build ANX.Framework MediaSystems">
-    <!-- default windows fileset -->
-    <fileset id="mediasystem_files" basedir="../MediaSystems/">
-      <include name="**/*.csproj" />
-      <exclude name="**/*PSVita*.csproj" />
-      <exclude name="**/*Metro*.csproj" />
-      <exclude name="**/*Linux*.csproj" />
-    </fileset>
-
-    <if test="${project.anx.linux}">
-      <fileset id="mediasystem_files" basedir="../MediaSystems/">
-        <!-- TODO: no mediasystems for linux currently -->
-      </fileset>
-    </if>
-
-    <if test="${project.anx.psvita}">
-      <fileset id="mediasystem_files" basedir="../MediaSystems/">
-        <include name="**/*_PsVita.csproj" />
-        <exclude name="**/*OpenAL*.csproj" />
-      </fileset>
-    </if>
-
-    <if test="${project.anx.metro}">
-      <fileset id="mediasystem_files" basedir="../MediaSystems/">
-        <!-- TODO: no mediasystems for linux currently -->
-      </fileset>
-    </if>
-    
-    <foreach item="File" property="projectFile">
-      <in>
-        <items refid="mediasystem_files" />
-      </in>
-      <do>
-        <echo message="building: ${path::get-file-name-without-extension(projectFile)}" />
-
-        <exec program="msbuild.exe" >
-          <arg value="/t:Build"/>
-          <arg value="/p:Configuration=${build.configuration}"/>
-          <arg value='/p:Platform="${build.platform}"'/>
-          <arg value="/p:OutputPath=${build.dir}/${build.configuration}" />
-          <arg value="/p:AllowUnsafeBlocks=true" />
-          <arg value="/p:SolutionDir=${build.solution_dir}" />
-          <arg value='/p:DefineConstants="${project.anx.directives}"' />
-          <arg value="/clp:ErrorsOnly" />
-          <arg value="/nologo" />
-          <arg value="${projectFile}" />
-        </exec>
-      </do>
-    </foreach>
-  </target>
-
   <target name="platformsystem" description="Build ANX.Framework PlatformSystems">
     <!-- default windows fileset -->
     <fileset id="platformsystem_files" basedir="../PlatformSystems/">
@@ -530,7 +477,6 @@
       <include name="**/${project.anx.name}/*.csproj" />
       <include name="RenderSystems/**/*.csproj" />
       <include name="InputSystems/**/*.csproj" />
-      <include name="MediaSystems/**/*.csproj" />
       <include name="PlatformSystems/**/*.csproj" />
       <include name="SoundSystems/**/*.csproj" />
       <exclude name="**/*_Linux.csproj" />