audio: Port WASAPI to WinRT, remove XAudio2 backend.

XAudio2 doesn't have capture support, so WASAPI was to replace it; the holdout
was WinRT, which still needed it as its primary audio target until the WASAPI
code code be made to work.

The support matrix now looks like:

WinXP: directsound by default, winmm as a fallback for buggy drivers.
Vista+: WASAPI (directsound and winmm as fallbacks for debugging).
WinRT: WASAPI

10 files changed, 50 insertions, 54 deletions

diff --git a/VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj b/VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj
index 841a0b966b..5e18787122 100644
--- a/VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj
+++ b/VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj
@@ -84,8 +84,7 @@
     <ClInclude Include="..\..\src\audio\SDL_audio_c.h" />

     <ClInclude Include="..\..\src\audio\SDL_sysaudio.h" />

     <ClInclude Include="..\..\src\audio\SDL_wave.h" />

-    <ClInclude Include="..\..\src\audio\xaudio2\SDL_xaudio2.h" />

-    <ClInclude Include="..\..\src\audio\xaudio2\SDL_xaudio2_winrthelpers.h" />

+    <ClInclude Include="..\..\src\audio\wasapi\SDL_wasapi.h" />

     <ClInclude Include="..\..\src\core\windows\SDL_directx.h" />

     <ClInclude Include="..\..\src\core\windows\SDL_windows.h" />

     <ClInclude Include="..\..\src\core\windows\SDL_xinput.h" />

@@ -175,8 +174,8 @@
     <ClCompile Include="..\..\src\audio\SDL_audiotypecvt.c" />

     <ClCompile Include="..\..\src\audio\SDL_mixer.c" />

     <ClCompile Include="..\..\src\audio\SDL_wave.c" />

-    <ClCompile Include="..\..\src\audio\xaudio2\SDL_xaudio2.c" />

-    <ClCompile Include="..\..\src\audio\xaudio2\SDL_xaudio2_winrthelpers.cpp">

+    <ClCompile Include="..\..\src\audio\wasapi\SDL_wasapi.c" />

+    <ClCompile Include="..\..\src\audio\wasapi\SDL_wasapi_winrt.cpp">

       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</CompileAsWinRT>

       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</CompileAsWinRT>

       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</CompileAsWinRT>

diff --git a/VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj.filters b/VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj.filters
index 5a20689965..9020a74189 100644
--- a/VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj.filters
+++ b/VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj.filters
@@ -183,9 +183,6 @@
     <ClInclude Include="..\..\src\audio\SDL_wave.h">

       <Filter>Source Files</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\src\audio\xaudio2\SDL_xaudio2_winrthelpers.h">

-      <Filter>Source Files</Filter>

-    </ClInclude>

     <ClInclude Include="..\..\src\core\windows\SDL_directx.h">

       <Filter>Source Files</Filter>

     </ClInclude>

@@ -390,7 +387,7 @@
     <ClInclude Include="..\..\src\video\winrt\SDL_winrtvideo_cpp.h">

       <Filter>Source Files</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\src\audio\xaudio2\SDL_xaudio2.h">

+    <ClInclude Include="..\..\src\audio\wasapi\SDL_wasapi.h">

       <Filter>Source Files</Filter>

     </ClInclude>

     <ClInclude Include="..\..\src\video\winrt\SDL_winrtgamebar_cpp.h">

@@ -449,7 +446,7 @@
     <ClCompile Include="..\..\src\audio\SDL_wave.c">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\src\audio\xaudio2\SDL_xaudio2_winrthelpers.cpp">

+    <ClCompile Include="..\..\src\audio\wasapi\SDL_wasapi_winrt.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

     <ClCompile Include="..\..\src\core\windows\SDL_windows.c">

@@ -722,7 +719,7 @@
     <ClCompile Include="..\..\src\video\winrt\SDL_winrtvideo.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\src\audio\xaudio2\SDL_xaudio2.c">

+    <ClCompile Include="..\..\src\audio\wasapi\SDL_wasapi.c">

       <Filter>Source Files</Filter>

     </ClCompile>

     <ClCompile Include="..\..\src\video\winrt\SDL_winrtgamebar.cpp">

diff --git a/VisualC-WinRT/WinPhone80_VS2012/SDL-WinPhone80.vcxproj b/VisualC-WinRT/WinPhone80_VS2012/SDL-WinPhone80.vcxproj
index 2091df090b..40b0d26da5 100644
--- a/VisualC-WinRT/WinPhone80_VS2012/SDL-WinPhone80.vcxproj
+++ b/VisualC-WinRT/WinPhone80_VS2012/SDL-WinPhone80.vcxproj
@@ -91,7 +91,7 @@
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <AdditionalDependencies>DXGI.lib;d3d11.lib;xaudio2.lib;WindowsPhoneCore.lib;RuntimeObject.lib;PhoneAppModelHost.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>DXGI.lib;d3d11.lib;WindowsPhoneCore.lib;RuntimeObject.lib;PhoneAppModelHost.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

@@ -108,7 +108,7 @@
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <AdditionalDependencies>DXGI.lib;d3d11.lib;xaudio2.lib;WindowsPhoneCore.lib;RuntimeObject.lib;PhoneAppModelHost.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>DXGI.lib;d3d11.lib;WindowsPhoneCore.lib;RuntimeObject.lib;PhoneAppModelHost.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">

@@ -126,7 +126,7 @@
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <AdditionalDependencies>DXGI.lib;d3d11.lib;xaudio2.lib;WindowsPhoneCore.lib;RuntimeObject.lib;PhoneAppModelHost.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>DXGI.lib;d3d11.lib;WindowsPhoneCore.lib;RuntimeObject.lib;PhoneAppModelHost.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">

@@ -143,7 +143,7 @@
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <AdditionalDependencies>DXGI.lib;d3d11.lib;xaudio2.lib;WindowsPhoneCore.lib;RuntimeObject.lib;PhoneAppModelHost.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>DXGI.lib;d3d11.lib;WindowsPhoneCore.lib;RuntimeObject.lib;PhoneAppModelHost.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

@@ -211,7 +211,7 @@
     <ClInclude Include="..\..\src\audio\SDL_audio_c.h" />

     <ClInclude Include="..\..\src\audio\SDL_sysaudio.h" />

     <ClInclude Include="..\..\src\audio\SDL_wave.h" />

-    <ClInclude Include="..\..\src\audio\xaudio2\SDL_xaudio2_winrthelpers.h" />

+    <ClInclude Include="..\..\src\audio\wasapi\SDL_wasapi.h" />

     <ClInclude Include="..\..\src\core\windows\SDL_windows.h" />

     <ClInclude Include="..\..\src\core\winrt\SDL_winrtapp_common.h" />

     <ClInclude Include="..\..\src\core\winrt\SDL_winrtapp_direct3d.h" />

@@ -292,8 +292,8 @@
     <ClCompile Include="..\..\src\audio\SDL_audiotypecvt.c" />

     <ClCompile Include="..\..\src\audio\SDL_mixer.c" />

     <ClCompile Include="..\..\src\audio\SDL_wave.c" />

-    <ClCompile Include="..\..\src\audio\xaudio2\SDL_xaudio2.c" />

-    <ClCompile Include="..\..\src\audio\xaudio2\SDL_xaudio2_winrthelpers.cpp">

+    <ClCompile Include="..\..\src\audio\wasapi\SDL_wasapi.c" />

+    <ClCompile Include="..\..\src\audio\wasapi\SDL_wasapi_winrt.cpp">

       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</CompileAsWinRT>

       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</CompileAsWinRT>

       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</CompileAsWinRT>

diff --git a/VisualC-WinRT/WinPhone80_VS2012/SDL-WinPhone80.vcxproj.filters b/VisualC-WinRT/WinPhone80_VS2012/SDL-WinPhone80.vcxproj.filters
index 9aafdce6cb..64f4baa52e 100644
--- a/VisualC-WinRT/WinPhone80_VS2012/SDL-WinPhone80.vcxproj.filters
+++ b/VisualC-WinRT/WinPhone80_VS2012/SDL-WinPhone80.vcxproj.filters
@@ -168,7 +168,7 @@
     <ClInclude Include="..\..\src\audio\SDL_wave.h">

       <Filter>Source Files</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\src\audio\xaudio2\SDL_xaudio2_winrthelpers.h">

+    <ClInclude Include="..\..\src\audio\wasapi\SDL_wasapi.h">

       <Filter>Source Files</Filter>

     </ClInclude>

     <ClInclude Include="..\..\src\core\windows\SDL_windows.h">

@@ -413,10 +413,10 @@
     <ClCompile Include="..\..\src\audio\SDL_wave.c">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\src\audio\xaudio2\SDL_xaudio2.c">

+    <ClCompile Include="..\..\src\audio\wasapi\SDL_wasapi.c">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\src\audio\xaudio2\SDL_xaudio2_winrthelpers.cpp">

+    <ClCompile Include="..\..\src\audio\wasapi\SDL_wasapi_winrt.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

     <ClCompile Include="..\..\src\core\windows\SDL_windows.c">

diff --git a/VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.vcxproj b/VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.vcxproj
index f7b887cc63..4a04cc73e6 100644
--- a/VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.vcxproj
+++ b/VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.vcxproj
@@ -76,7 +76,7 @@
     <ClInclude Include="..\..\src\audio\SDL_audio_c.h" />

     <ClInclude Include="..\..\src\audio\SDL_sysaudio.h" />

     <ClInclude Include="..\..\src\audio\SDL_wave.h" />

-    <ClInclude Include="..\..\src\audio\xaudio2\SDL_xaudio2_winrthelpers.h" />

+    <ClInclude Include="..\..\src\audio\wasapi\SDL_wasapi.h" />

     <ClInclude Include="..\..\src\core\windows\SDL_windows.h" />

     <ClInclude Include="..\..\src\core\winrt\SDL_winrtapp_common.h" />

     <ClInclude Include="..\..\src\core\winrt\SDL_winrtapp_direct3d.h" />

@@ -158,8 +158,8 @@
     <ClCompile Include="..\..\src\audio\SDL_audiotypecvt.c" />

     <ClCompile Include="..\..\src\audio\SDL_mixer.c" />

     <ClCompile Include="..\..\src\audio\SDL_wave.c" />

-    <ClCompile Include="..\..\src\audio\xaudio2\SDL_xaudio2.c" />

-    <ClCompile Include="..\..\src\audio\xaudio2\SDL_xaudio2_winrthelpers.cpp">

+    <ClCompile Include="..\..\src\audio\wasapi\SDL_wasapi.c" />

+    <ClCompile Include="..\..\src\audio\wasapi\SDL_wasapi_winrt.cpp">

       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</CompileAsWinRT>

       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</CompileAsWinRT>

       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</CompileAsWinRT>

@@ -407,7 +407,7 @@
       <SubSystem>Console</SubSystem>

       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>

-      <AdditionalDependencies>DXGI.lib;d3d11.lib;xaudio2.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>DXGI.lib;d3d11.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

@@ -421,7 +421,7 @@
       <SubSystem>Console</SubSystem>

       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>

-      <AdditionalDependencies>DXGI.lib;d3d11.lib;xaudio2.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>DXGI.lib;d3d11.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">

@@ -435,7 +435,7 @@
       <SubSystem>Console</SubSystem>

       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>

-      <AdditionalDependencies>DXGI.lib;d3d11.lib;xaudio2.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>DXGI.lib;d3d11.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">

@@ -449,7 +449,7 @@
       <SubSystem>Console</SubSystem>

       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>

-      <AdditionalDependencies>DXGI.lib;d3d11.lib;xaudio2.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>DXGI.lib;d3d11.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.vcxproj.filters b/VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.vcxproj.filters
index 4bfbe83021..cd1af249b2 100644
--- a/VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.vcxproj.filters
+++ b/VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.vcxproj.filters
@@ -183,7 +183,7 @@
     <ClInclude Include="..\..\src\audio\SDL_wave.h">

       <Filter>Source Files</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\src\audio\xaudio2\SDL_xaudio2_winrthelpers.h">

+    <ClInclude Include="..\..\src\audio\wasapi\SDL_wasapi.h">

       <Filter>Source Files</Filter>

     </ClInclude>

     <ClInclude Include="..\..\src\core\windows\SDL_windows.h">

@@ -420,10 +420,10 @@
     <ClCompile Include="..\..\src\audio\SDL_wave.c">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\src\audio\xaudio2\SDL_xaudio2.c">

+    <ClCompile Include="..\..\src\audio\wasapi\SDL_wasapi.c">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\src\audio\xaudio2\SDL_xaudio2_winrthelpers.cpp">

+    <ClCompile Include="..\..\src\audio\wasapi\SDL_wasapi_winrt.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

     <ClCompile Include="..\..\src\core\windows\SDL_windows.c">

diff --git a/VisualC-WinRT/WinRT80_VS2012/SDL-WinRT80.vcxproj b/VisualC-WinRT/WinRT80_VS2012/SDL-WinRT80.vcxproj
index 2e1fc8ba6c..b9e8f3c94f 100644
--- a/VisualC-WinRT/WinRT80_VS2012/SDL-WinRT80.vcxproj
+++ b/VisualC-WinRT/WinRT80_VS2012/SDL-WinRT80.vcxproj
@@ -37,8 +37,8 @@
     <ClCompile Include="..\..\src\audio\SDL_audiotypecvt.c" />

     <ClCompile Include="..\..\src\audio\SDL_mixer.c" />

     <ClCompile Include="..\..\src\audio\SDL_wave.c" />

-    <ClCompile Include="..\..\src\audio\xaudio2\SDL_xaudio2.c" />

-    <ClCompile Include="..\..\src\audio\xaudio2\SDL_xaudio2_winrthelpers.cpp">

+    <ClCompile Include="..\..\src\audio\wasapi\SDL_wasapi.c" />

+    <ClCompile Include="..\..\src\audio\wasapi\SDL_wasapi_winrt.cpp">

       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</CompileAsWinRT>

       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</CompileAsWinRT>

       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</CompileAsWinRT>

@@ -293,7 +293,7 @@
     <ClInclude Include="..\..\src\audio\SDL_audio_c.h" />

     <ClInclude Include="..\..\src\audio\SDL_sysaudio.h" />

     <ClInclude Include="..\..\src\audio\SDL_wave.h" />

-    <ClInclude Include="..\..\src\audio\xaudio2\SDL_xaudio2_winrthelpers.h" />

+    <ClInclude Include="..\..\src\audio\wasapi\SDL_wasapi.h" />

     <ClInclude Include="..\..\src\core\windows\SDL_directx.h" />

     <ClInclude Include="..\..\src\core\windows\SDL_windows.h" />

     <ClInclude Include="..\..\src\core\windows\SDL_xinput.h" />

@@ -483,7 +483,7 @@
       <SubSystem>Console</SubSystem>

       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>

-      <AdditionalDependencies>xinput.lib;xaudio2.lib;d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>xinput.lib;d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

@@ -497,7 +497,7 @@
       <SubSystem>Console</SubSystem>

       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>

-      <AdditionalDependencies>xinput.lib;xaudio2.lib;d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>xinput.lib;d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">

@@ -511,7 +511,7 @@
       <SubSystem>Console</SubSystem>

       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>

-      <AdditionalDependencies>xinput.lib;xaudio2.lib;d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>xinput.lib;d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">

@@ -525,7 +525,7 @@
       <SubSystem>Console</SubSystem>

       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>

-      <AdditionalDependencies>xinput.lib;xaudio2.lib;d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>xinput.lib;d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

@@ -539,7 +539,7 @@
       <SubSystem>Console</SubSystem>

       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>

-      <AdditionalDependencies>xinput.lib;xaudio2.lib;d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>xinput.lib;d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

@@ -553,7 +553,7 @@
       <SubSystem>Console</SubSystem>

       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>

-      <AdditionalDependencies>xinput.lib;xaudio2.lib;d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>xinput.lib;d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/VisualC-WinRT/WinRT80_VS2012/SDL-WinRT80.vcxproj.filters b/VisualC-WinRT/WinRT80_VS2012/SDL-WinRT80.vcxproj.filters
index 3e2f4c68ec..a59397241a 100644
--- a/VisualC-WinRT/WinRT80_VS2012/SDL-WinRT80.vcxproj.filters
+++ b/VisualC-WinRT/WinRT80_VS2012/SDL-WinRT80.vcxproj.filters
@@ -214,10 +214,10 @@
     <ClCompile Include="..\..\src\core\windows\SDL_windows.c">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\src\audio\xaudio2\SDL_xaudio2.c">

+    <ClCompile Include="..\..\src\audio\wasapi\SDL_wasapi.c">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\src\audio\xaudio2\SDL_xaudio2_winrthelpers.cpp">

+    <ClCompile Include="..\..\src\audio\wasapi\SDL_wasapi_winrt.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

     <ClCompile Include="..\..\src\render\SDL_yuv_sw.c">

@@ -618,7 +618,7 @@
     <ClInclude Include="..\..\src\core\windows\SDL_windows.h">

       <Filter>Source Files</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\src\audio\xaudio2\SDL_xaudio2_winrthelpers.h">

+    <ClInclude Include="..\..\src\audio\wasapi\SDL_wasapi.h">

       <Filter>Source Files</Filter>

     </ClInclude>

     <ClInclude Include="..\..\src\events\blank_cursor.h">

diff --git a/VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.vcxproj b/VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.vcxproj
index d3f34d7a20..83b57e90cf 100644
--- a/VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.vcxproj
+++ b/VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.vcxproj
@@ -84,7 +84,7 @@
     <ClInclude Include="..\..\src\audio\SDL_audio_c.h" />

     <ClInclude Include="..\..\src\audio\SDL_sysaudio.h" />

     <ClInclude Include="..\..\src\audio\SDL_wave.h" />

-    <ClInclude Include="..\..\src\audio\xaudio2\SDL_xaudio2_winrthelpers.h" />

+    <ClInclude Include="..\..\src\audio\wasapi\SDL_wasapi.h" />

     <ClInclude Include="..\..\src\core\windows\SDL_directx.h" />

     <ClInclude Include="..\..\src\core\windows\SDL_windows.h" />

     <ClInclude Include="..\..\src\core\windows\SDL_xinput.h" />

@@ -172,8 +172,8 @@
     <ClCompile Include="..\..\src\audio\SDL_audiotypecvt.c" />

     <ClCompile Include="..\..\src\audio\SDL_mixer.c" />

     <ClCompile Include="..\..\src\audio\SDL_wave.c" />

-    <ClCompile Include="..\..\src\audio\xaudio2\SDL_xaudio2.c" />

-    <ClCompile Include="..\..\src\audio\xaudio2\SDL_xaudio2_winrthelpers.cpp">

+    <ClCompile Include="..\..\src\audio\wasapi\SDL_wasapi.c" />

+    <ClCompile Include="..\..\src\audio\wasapi\SDL_wasapi_winrt.cpp">

       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</CompileAsWinRT>

       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</CompileAsWinRT>

       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</CompileAsWinRT>

@@ -484,7 +484,7 @@
       <SubSystem>Console</SubSystem>

       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>

-      <AdditionalDependencies>xinput.lib;xaudio2.lib;d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>xinput.lib;d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

@@ -498,7 +498,7 @@
       <SubSystem>Console</SubSystem>

       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>

-      <AdditionalDependencies>xinput.lib;xaudio2.lib;d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>xinput.lib;d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">

@@ -512,7 +512,7 @@
       <SubSystem>Console</SubSystem>

       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>

-      <AdditionalDependencies>xinput.lib;xaudio2.lib;d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>xinput.lib;d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">

@@ -526,7 +526,7 @@
       <SubSystem>Console</SubSystem>

       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>

-      <AdditionalDependencies>xinput.lib;xaudio2.lib;d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>xinput.lib;d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

@@ -540,7 +540,7 @@
       <SubSystem>Console</SubSystem>

       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>

-      <AdditionalDependencies>xinput.lib;xaudio2.lib;d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>xinput.lib;d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

@@ -554,7 +554,7 @@
       <SubSystem>Console</SubSystem>

       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>

-      <AdditionalDependencies>xinput.lib;xaudio2.lib;d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>xinput.lib;d2d1.lib;d3d11.lib;dxgi.lib;ole32.lib;windowscodecs.lib;dwrite.lib;kernel32.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.vcxproj.filters b/VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.vcxproj.filters
index b499c70a8e..dafd707e89 100644
--- a/VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.vcxproj.filters
+++ b/VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.vcxproj.filters
@@ -183,7 +183,7 @@
     <ClInclude Include="..\..\src\audio\SDL_wave.h">

       <Filter>Source Files</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\src\audio\xaudio2\SDL_xaudio2_winrthelpers.h">

+    <ClInclude Include="..\..\src\audio\wasapi\SDL_wasapi.h">

       <Filter>Source Files</Filter>

     </ClInclude>

     <ClInclude Include="..\..\src\core\windows\SDL_windows.h">

@@ -440,10 +440,10 @@
     <ClCompile Include="..\..\src\audio\SDL_wave.c">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\src\audio\xaudio2\SDL_xaudio2.c">

+    <ClCompile Include="..\..\src\audio\wasapi\SDL_wasapi.c">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\src\audio\xaudio2\SDL_xaudio2_winrthelpers.cpp">

+    <ClCompile Include="..\..\src\audio\wasapi\SDL_wasapi_winrt.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

     <ClCompile Include="..\..\src\core\windows\SDL_windows.c">