diff --git a/ANX.Framework.sln b/ANX.Framework.sln index 0f1aec1f..091dd47a 100644 --- a/ANX.Framework.sln +++ b/ANX.Framework.sln @@ -195,8 +195,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.RenderSystem.Windows.DX EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.InputDevices.Windows.ModernUI", "InputSystems\ANX.InputDevices.Windows.ModernUI\ANX.InputDevices.Windows.ModernUI.csproj", "{628AB80A-B1B9-4878-A810-7A58D4840F60}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.SoundSystem.Windows.ModernUI", "SoundSystems\ANX.SoundSystem.Windows.ModernUI\ANX.SoundSystem.Windows.ModernUI.csproj", "{7C764555-14B2-45E9-AB33-0C412C8AC53B}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -982,26 +980,6 @@ Global {628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|x64.Build.0 = Release|x64 {628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|x86.ActiveCfg = Release|x86 {628AB80A-B1B9-4878-A810-7A58D4840F60}.Release|x86.Build.0 = Release|x86 - {7C764555-14B2-45E9-AB33-0C412C8AC53B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7C764555-14B2-45E9-AB33-0C412C8AC53B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7C764555-14B2-45E9-AB33-0C412C8AC53B}.Debug|ARM.ActiveCfg = Debug|ARM - {7C764555-14B2-45E9-AB33-0C412C8AC53B}.Debug|ARM.Build.0 = Debug|ARM - {7C764555-14B2-45E9-AB33-0C412C8AC53B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {7C764555-14B2-45E9-AB33-0C412C8AC53B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {7C764555-14B2-45E9-AB33-0C412C8AC53B}.Debug|x64.ActiveCfg = Debug|x64 - {7C764555-14B2-45E9-AB33-0C412C8AC53B}.Debug|x64.Build.0 = Debug|x64 - {7C764555-14B2-45E9-AB33-0C412C8AC53B}.Debug|x86.ActiveCfg = Debug|x86 - {7C764555-14B2-45E9-AB33-0C412C8AC53B}.Debug|x86.Build.0 = Debug|x86 - {7C764555-14B2-45E9-AB33-0C412C8AC53B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7C764555-14B2-45E9-AB33-0C412C8AC53B}.Release|Any CPU.Build.0 = Release|Any CPU - {7C764555-14B2-45E9-AB33-0C412C8AC53B}.Release|ARM.ActiveCfg = Release|ARM - {7C764555-14B2-45E9-AB33-0C412C8AC53B}.Release|ARM.Build.0 = Release|ARM - {7C764555-14B2-45E9-AB33-0C412C8AC53B}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {7C764555-14B2-45E9-AB33-0C412C8AC53B}.Release|Mixed Platforms.Build.0 = Release|x86 - {7C764555-14B2-45E9-AB33-0C412C8AC53B}.Release|x64.ActiveCfg = Release|x64 - {7C764555-14B2-45E9-AB33-0C412C8AC53B}.Release|x64.Build.0 = Release|x64 - {7C764555-14B2-45E9-AB33-0C412C8AC53B}.Release|x86.ActiveCfg = Release|x86 - {7C764555-14B2-45E9-AB33-0C412C8AC53B}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1051,7 +1029,6 @@ Global {6A582788-C4D2-410C-96CD-177F75712D65} = {5725DA44-4F5C-4E93-A957-AC5C85603EE9} {14EF49AB-6D3F-458D-9D5C-D120B86EDD7A} = {5725DA44-4F5C-4E93-A957-AC5C85603EE9} {E2EE2D12-A98E-4C21-AFFA-35F48D2B2A94} = {5725DA44-4F5C-4E93-A957-AC5C85603EE9} - {7C764555-14B2-45E9-AB33-0C412C8AC53B} = {5725DA44-4F5C-4E93-A957-AC5C85603EE9} {CCB4679D-11AF-4EC6-AAA4-36619FCE70FA} = {60824BDB-AC8A-42ED-9B79-111FB44669FF} {E4FFD875-95FC-48F2-8B6D-8483D0B71666} = {60824BDB-AC8A-42ED-9B79-111FB44669FF} {BD648BB8-EF28-453C-B4F5-EE3C93EB4DAF} = {60824BDB-AC8A-42ED-9B79-111FB44669FF} diff --git a/ANX.Framework/NonXNA/Reflection/AssemblyLoader.cs b/ANX.Framework/NonXNA/Reflection/AssemblyLoader.cs index d9d25b94..6bc4d0a1 100644 --- a/ANX.Framework/NonXNA/Reflection/AssemblyLoader.cs +++ b/ANX.Framework/NonXNA/Reflection/AssemblyLoader.cs @@ -132,7 +132,7 @@ namespace ANX.Framework.NonXNA.Reflection allAssemblyNames.Add("ANX.RenderSystem.Windows.Metro"); allAssemblyNames.Add("ANX.InputSystem.Standard"); allAssemblyNames.Add("ANX.InputDevices.Windows.ModernUI"); - allAssemblyNames.Add("ANX.SoundSystem.Windows.ModernUI"); + allAssemblyNames.Add("ANX.SoundSystem.Windows.XAudio"); #endif foreach (string assemblyName in allAssemblyNames) diff --git a/SoundSystems/ANX.SoundSystem.Windows.ModernUI/ANX.SoundSystem.Windows.ModernUI.csproj b/SoundSystems/ANX.SoundSystem.Windows.ModernUI/ANX.SoundSystem.Windows.ModernUI.csproj deleted file mode 100644 index e9c77b63..00000000 --- a/SoundSystems/ANX.SoundSystem.Windows.ModernUI/ANX.SoundSystem.Windows.ModernUI.csproj +++ /dev/null @@ -1,134 +0,0 @@ - - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {7C764555-14B2-45E9-AB33-0C412C8AC53B} - Library - Properties - ANX.SoundSystem.Windows.ModernUI - ANX.SoundSystem.Windows.ModernUI - de-DE - 512 - {BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - - true - full - false - ..\..\bin\Debug\ - DEBUG;TRACE;NETFX_CORE - prompt - 4 - - - pdbonly - true - ..\..\bin\Release\ - TRACE;NETFX_CORE - prompt - 4 - - - true - bin\ARM\Debug\ - DEBUG;TRACE;NETFX_CORE - ;2008 - full - ARM - false - prompt - true - - - bin\ARM\Release\ - TRACE;NETFX_CORE - true - ;2008 - pdbonly - ARM - false - prompt - true - - - true - bin\x64\Debug\ - DEBUG;TRACE;NETFX_CORE - ;2008 - full - x64 - false - prompt - true - - - bin\x64\Release\ - TRACE;NETFX_CORE - true - ;2008 - pdbonly - x64 - false - prompt - true - - - true - bin\x86\Debug\ - DEBUG;TRACE;NETFX_CORE - ;2008 - full - x86 - false - prompt - true - - - bin\x86\Release\ - TRACE;NETFX_CORE - true - ;2008 - pdbonly - x86 - false - prompt - true - - - - - - - - - ..\..\lib\SharpDX\Bin\Win8Metro\SharpDX.dll - - - ..\..\lib\SharpDX\Bin\Win8Metro\SharpDX.XAudio2.dll - - - ..\..\lib\SharpDX\Bin\Win8Metro\SharpDX.XInput.dll - - - - - {6899F0C9-70B9-4EB0-9DD3-E598D4BE3E35} - ANX.Framework - - - - 11.0 - - - - \ No newline at end of file diff --git a/SoundSystems/ANX.SoundSystem.Windows.ModernUI/Creator.cs b/SoundSystems/ANX.SoundSystem.Windows.ModernUI/Creator.cs deleted file mode 100644 index f432f42e..00000000 --- a/SoundSystems/ANX.SoundSystem.Windows.ModernUI/Creator.cs +++ /dev/null @@ -1,168 +0,0 @@ -using ANX.Framework.Audio; -using ANX.Framework.NonXNA; -using ANX.Framework.NonXNA.SoundSystem; -using System; -using System.Collections.ObjectModel; -using System.IO; - -// 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.SoundSystem.Windows.ModernUI -{ - class Creator : ISoundSystemCreator - { - #region Public - #region Name - public string Name - { - get - { - return "Sound.Windows.ModernUI"; - } - } - #endregion - - #region Priority - public int Priority - { - get - { - return 100; - } - } - #endregion - - #region IsSupported - public bool IsSupported - { - get - { - return OSInformation.GetName() == PlatformName.Windows8; - } - } - #endregion - - #region DistanceScale - public float DistanceScale - { - get - { - throw new NotImplementedException(); - } - set - { - throw new NotImplementedException(); - } - } - #endregion - - #region DopplerScale - public float DopplerScale - { - get - { - throw new NotImplementedException(); - } - set - { - throw new NotImplementedException(); - } - } - #endregion - - #region MasterVolume - public float MasterVolume - { - get - { - throw new NotImplementedException(); - } - set - { - throw new NotImplementedException(); - } - } - #endregion - - #region SpeedOfSound - public float SpeedOfSound - { - get - { - throw new NotImplementedException(); - } - set - { - throw new NotImplementedException(); - } - } - #endregion - #endregion - - #region CreateSoundEffectInstance - public ISoundEffectInstance CreateSoundEffectInstance( - ISoundEffect nativeSoundEffect) - { - AddInSystemFactory.Instance.PreventSystemChange(AddInType.SoundSystem); - throw new NotImplementedException(); - } - #endregion - - #region CreateSoundEffect - public ISoundEffect CreateSoundEffect(SoundEffect parent, Stream stream) - { - AddInSystemFactory.Instance.PreventSystemChange(AddInType.SoundSystem); - throw new NotImplementedException(); - } - #endregion - - #region CreateSoundEffect (TODO) - public ISoundEffect CreateSoundEffect(SoundEffect parent, byte[] buffer, - int offset, int count, int sampleRate, AudioChannels channels, - int loopStart, int loopLength) - { - AddInSystemFactory.Instance.PreventSystemChange(AddInType.SoundSystem); - throw new NotImplementedException(); - } - #endregion - - #region CreateAudioListener - public IAudioListener CreateAudioListener() - { - AddInSystemFactory.Instance.PreventSystemChange(AddInType.SoundSystem); - throw new NotImplementedException(); - } - #endregion - - #region CreateAudioEmitter (TODO) - public IAudioEmitter CreateAudioEmitter() - { - AddInSystemFactory.Instance.PreventSystemChange(AddInType.SoundSystem); - throw new NotImplementedException(); - } - #endregion - - #region CreateMicrophone - public IMicrophone CreateMicrophone(Microphone managedMicrophone) - { - throw new NotImplementedException(); - } - #endregion - - #region GetAllMicrophones - public ReadOnlyCollection GetAllMicrophones() - { - throw new NotImplementedException(); - } - #endregion - - #region GetDefaultMicrophone - public int GetDefaultMicrophone(ReadOnlyCollection allMicrophones) - { - throw new NotImplementedException(); - } - #endregion - } -} diff --git a/SoundSystems/ANX.SoundSystem.Windows.ModernUI/Properties/AssemblyInfo.cs b/SoundSystems/ANX.SoundSystem.Windows.ModernUI/Properties/AssemblyInfo.cs deleted file mode 100644 index 01dc453c..00000000 --- a/SoundSystems/ANX.SoundSystem.Windows.ModernUI/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// Allgemeine Informationen über eine Assembly werden über die folgenden -// Attribute gesteuert. Diese Attributwerte ändern, um die Informationen zu ändern, -// die einer Assembly zugeordnet sind. -[assembly: AssemblyTitle("ANX.SoundSystem.Windows.ModernUI")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ANX.SoundSystem.Windows.ModernUI")] -[assembly: AssemblyCopyright("Copyright © 2012")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: -// -// Hauptversion -// Nebenversion -// Buildnummer -// Revision -// -// Es können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern -// mithilfe von '*' wie unten dargestellt übernommen werden: -// [Assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: ComVisible(false)] \ No newline at end of file diff --git a/SoundSystems/ANX.SoundSystem.Windows.ModernUI/SupportedPlatformsImpl.cs b/SoundSystems/ANX.SoundSystem.Windows.ModernUI/SupportedPlatformsImpl.cs deleted file mode 100644 index d70e0230..00000000 --- a/SoundSystems/ANX.SoundSystem.Windows.ModernUI/SupportedPlatformsImpl.cs +++ /dev/null @@ -1,21 +0,0 @@ -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.SoundSystem.Windows.ModernUI -{ - class SupportedPlatformsImpl : ISupportedPlatforms - { - public PlatformName[] Names - { - get - { - return new PlatformName[] - { - PlatformName.Windows8, - }; - } - } - } -} -