From a8fd2c1afacf84699f37c1a73f072fcd23560ccb Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Fri, 3 Mar 2023 22:08:22 -0800
Subject: [PATCH] Updated Visual Studio projects for new files
---
VisualC-WinRT/SDL_mixer-UWP.vcxproj | 16 ++++---
VisualC-WinRT/SDL_mixer-UWP.vcxproj.filters | 50 ++++++++++++++-------
VisualC/SDL_mixer.vcxproj | 8 +++-
VisualC/SDL_mixer.vcxproj.filters | 42 ++++++++++++-----
src/codecs/load_voc.c | 2 +-
5 files changed, 83 insertions(+), 35 deletions(-)
diff --git a/VisualC-WinRT/SDL_mixer-UWP.vcxproj b/VisualC-WinRT/SDL_mixer-UWP.vcxproj
index f2408420..3e15bfa6 100644
--- a/VisualC-WinRT/SDL_mixer-UWP.vcxproj
+++ b/VisualC-WinRT/SDL_mixer-UWP.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|ARM">
@@ -27,10 +27,6 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="..\src\codecs\music_drflac.c" />
- <ClCompile Include="..\src\codecs\music_drmp3.c" />
- <ClCompile Include="..\src\codecs\music_ogg_stb.c" />
- <ClCompile Include="..\src\codecs\music_xmp.c" />
<ClCompile Include="..\src\utils.c" />
<ClCompile Include="..\src\effects_internal.c" />
<ClCompile Include="..\src\effect_position.c" />
@@ -38,18 +34,25 @@
<ClCompile Include="..\src\mixer.c" />
<ClCompile Include="..\src\music.c" />
<ClCompile Include="..\src\codecs\load_aiff.c" />
+ <ClCompile Include="..\src\codecs\load_sndfile.c" />
<ClCompile Include="..\src\codecs\load_voc.c" />
<ClCompile Include="..\src\codecs\mp3utils.c" />
<ClCompile Include="..\src\codecs\music_cmd.c" />
+ <ClCompile Include="..\src\codecs\music_drflac.c" />
+ <ClCompile Include="..\src\codecs\music_drmp3.c" />
<ClCompile Include="..\src\codecs\music_flac.c" />
<ClCompile Include="..\src\codecs\music_fluidsynth.c" />
+ <ClCompile Include="..\src\codecs\music_gme.c" />
<ClCompile Include="..\src\codecs\music_modplug.c" />
<ClCompile Include="..\src\codecs\music_mpg123.c" />
<ClCompile Include="..\src\codecs\music_nativemidi.c" />
<ClCompile Include="..\src\codecs\music_ogg.c" />
+ <ClCompile Include="..\src\codecs\music_ogg_stb.c" />
<ClCompile Include="..\src\codecs\music_opus.c" />
<ClCompile Include="..\src\codecs\music_timidity.c" />
<ClCompile Include="..\src\codecs\music_wav.c" />
+ <ClCompile Include="..\src\codecs\music_wavpack.c" />
+ <ClCompile Include="..\src\codecs\music_xmp.c" />
<ClCompile Include="..\src\codecs\timidity\common.c" />
<ClCompile Include="..\src\codecs\timidity\instrum.c" />
<ClCompile Include="..\src\codecs\timidity\mix.c" />
@@ -63,6 +66,7 @@
<ItemGroup>
<ClInclude Include="..\include\SDL_mixer.h" />
<ClInclude Include="..\src\codecs\load_aiff.h" />
+ <ClInclude Include="..\src\codecs\load_sndfile.h" />
<ClInclude Include="..\src\codecs\load_voc.h" />
<ClInclude Include="..\src\codecs\mp3utils.h" />
<ClInclude Include="..\src\codecs\music_cmd.h" />
@@ -70,6 +74,7 @@
<ClInclude Include="..\src\codecs\music_drmp3.h" />
<ClInclude Include="..\src\codecs\music_flac.h" />
<ClInclude Include="..\src\codecs\music_fluidsynth.h" />
+ <ClInclude Include="..\src\codecs\music_gme.h" />
<ClInclude Include="..\src\codecs\music_modplug.h" />
<ClInclude Include="..\src\codecs\music_mpg123.h" />
<ClInclude Include="..\src\codecs\music_nativemidi.h" />
@@ -77,6 +82,7 @@
<ClInclude Include="..\src\codecs\music_opus.h" />
<ClInclude Include="..\src\codecs\music_timidity.h" />
<ClInclude Include="..\src\codecs\music_wav.h" />
+ <ClInclude Include="..\src\codecs\music_wavpack.h" />
<ClInclude Include="..\src\codecs\music_xmp.h" />
<ClInclude Include="..\src\utils.h" />
<ClInclude Include="..\src\codecs\timidity\common.h" />
diff --git a/VisualC-WinRT/SDL_mixer-UWP.vcxproj.filters b/VisualC-WinRT/SDL_mixer-UWP.vcxproj.filters
index f8c1806b..c439d894 100644
--- a/VisualC-WinRT/SDL_mixer-UWP.vcxproj.filters
+++ b/VisualC-WinRT/SDL_mixer-UWP.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="..\src\codecs\timidity\common.c">
@@ -37,22 +37,34 @@
<ClCompile Include="..\src\effects_internal.c">
<Filter>Sources</Filter>
</ClCompile>
+ <ClCompile Include="..\src\mixer.c">
+ <Filter>Sources</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\music.c">
+ <Filter>Sources</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\utils.c">
+ <Filter>Sources</Filter>
+ </ClCompile>
<ClCompile Include="..\src\codecs\load_aiff.c">
<Filter>Sources</Filter>
</ClCompile>
- <ClCompile Include="..\src\codecs\load_voc.c">
+ <ClCompile Include="..\src\codecs\load_sndfile.c">
<Filter>Sources</Filter>
</ClCompile>
- <ClCompile Include="..\src\mixer.c">
+ <ClCompile Include="..\src\codecs\load_voc.c">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\codecs\mp3utils.c">
<Filter>Sources</Filter>
</ClCompile>
- <ClCompile Include="..\src\music.c">
+ <ClCompile Include="..\src\codecs\music_cmd.c">
<Filter>Sources</Filter>
</ClCompile>
- <ClCompile Include="..\src\codecs\music_cmd.c">
+ <ClCompile Include="..\src\codecs\music_drflac.c">
+ <Filter>Sources</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\codecs\music_drmp3.c">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\codecs\music_flac.c">
@@ -61,6 +73,9 @@
<ClCompile Include="..\src\codecs\music_fluidsynth.c">
<Filter>Sources</Filter>
</ClCompile>
+ <ClCompile Include="..\src\codecs\music_gme.c">
+ <Filter>Sources</Filter>
+ </ClCompile>
<ClCompile Include="..\src\codecs\music_modplug.c">
<Filter>Sources</Filter>
</ClCompile>
@@ -73,6 +88,9 @@
<ClCompile Include="..\src\codecs\music_ogg.c">
<Filter>Sources</Filter>
</ClCompile>
+ <ClCompile Include="..\src\codecs\music_ogg_stb.c">
+ <Filter>Sources</Filter>
+ </ClCompile>
<ClCompile Include="..\src\codecs\music_opus.c">
<Filter>Sources</Filter>
</ClCompile>
@@ -82,16 +100,7 @@
<ClCompile Include="..\src\codecs\music_wav.c">
<Filter>Sources</Filter>
</ClCompile>
- <ClCompile Include="..\src\utils.c">
- <Filter>Sources</Filter>
- </ClCompile>
- <ClCompile Include="..\src\codecs\music_drflac.c">
- <Filter>Sources</Filter>
- </ClCompile>
- <ClCompile Include="..\src\codecs\music_drmp3.c">
- <Filter>Sources</Filter>
- </ClCompile>
- <ClCompile Include="..\src\codecs\music_ogg_stb.c">
+ <ClCompile Include="..\src\codecs\music_wavpack.c">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\codecs\music_xmp.c">
@@ -138,6 +147,9 @@
<ClInclude Include="..\src\codecs\load_aiff.h">
<Filter>Sources</Filter>
</ClInclude>
+ <ClInclude Include="..\src\codecs\load_sndfile.h">
+ <Filter>Sources</Filter>
+ </ClInclude>
<ClInclude Include="..\src\codecs\load_voc.h">
<Filter>Sources</Filter>
</ClInclude>
@@ -159,6 +171,9 @@
<ClInclude Include="..\src\codecs\music_fluidsynth.h">
<Filter>Sources</Filter>
</ClInclude>
+ <ClInclude Include="..\src\codecs\music_gme.h">
+ <Filter>Sources</Filter>
+ </ClInclude>
<ClInclude Include="..\src\codecs\music_modplug.h">
<Filter>Sources</Filter>
</ClInclude>
@@ -180,6 +195,9 @@
<ClInclude Include="..\src\codecs\music_wav.h">
<Filter>Sources</Filter>
</ClInclude>
+ <ClInclude Include="..\src\codecs\music_wavpack.h">
+ <Filter>Sources</Filter>
+ </ClInclude>
<ClInclude Include="..\src\codecs\music_xmp.h">
<Filter>Sources</Filter>
</ClInclude>
@@ -195,4 +213,4 @@
<UniqueIdentifier>{9c43d0b0-edae-4dea-bb19-5bd7972e58bc}</UniqueIdentifier>
</Filter>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/VisualC/SDL_mixer.vcxproj b/VisualC/SDL_mixer.vcxproj
index 4c24a22a..f00d6992 100644
--- a/VisualC/SDL_mixer.vcxproj
+++ b/VisualC/SDL_mixer.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -216,6 +216,7 @@
<ClInclude Include="..\src\music.h" />
<ClInclude Include="..\src\utils.h" />
<ClInclude Include="..\src\codecs\load_aiff.h" />
+ <ClInclude Include="..\src\codecs\load_sndfile.h" />
<ClInclude Include="..\src\codecs\load_voc.h" />
<ClInclude Include="..\src\codecs\mp3utils.h" />
<ClInclude Include="..\src\codecs\music_cmd.h" />
@@ -223,6 +224,7 @@
<ClInclude Include="..\src\codecs\music_drmp3.h" />
<ClInclude Include="..\src\codecs\music_flac.h" />
<ClInclude Include="..\src\codecs\music_fluidsynth.h" />
+ <ClInclude Include="..\src\codecs\music_gme.h" />
<ClInclude Include="..\src\codecs\music_modplug.h" />
<ClInclude Include="..\src\codecs\music_mpg123.h" />
<ClInclude Include="..\src\codecs\music_nativemidi.h" />
@@ -230,6 +232,7 @@
<ClInclude Include="..\src\codecs\music_opus.h" />
<ClInclude Include="..\src\codecs\music_timidity.h" />
<ClInclude Include="..\src\codecs\music_wav.h" />
+ <ClInclude Include="..\src\codecs\music_wavpack.h" />
<ClInclude Include="..\src\codecs\music_xmp.h" />
</ItemGroup>
<ItemGroup>
@@ -404,6 +407,7 @@
<ClCompile Include="..\src\music.c" />
<ClCompile Include="..\src\utils.c" />
<ClCompile Include="..\src\codecs\load_aiff.c" />
+ <ClCompile Include="..\src\codecs\load_sndfile.c" />
<ClCompile Include="..\src\codecs\load_voc.c" />
<ClCompile Include="..\src\codecs\mp3utils.c" />
<ClCompile Include="..\src\codecs\music_cmd.c" />
@@ -411,6 +415,7 @@
<ClCompile Include="..\src\codecs\music_drmp3.c" />
<ClCompile Include="..\src\codecs\music_flac.c" />
<ClCompile Include="..\src\codecs\music_fluidsynth.c" />
+ <ClCompile Include="..\src\codecs\music_gme.c" />
<ClCompile Include="..\src\codecs\music_modplug.c" />
<ClCompile Include="..\src\codecs\music_mpg123.c" />
<ClCompile Include="..\src\codecs\music_nativemidi.c" />
@@ -419,6 +424,7 @@
<ClCompile Include="..\src\codecs\music_opus.c" />
<ClCompile Include="..\src\codecs\music_timidity.c" />
<ClCompile Include="..\src\codecs\music_wav.c" />
+ <ClCompile Include="..\src\codecs\music_wavpack.c" />
<ClCompile Include="..\src\codecs\music_xmp.c" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/VisualC/SDL_mixer.vcxproj.filters b/VisualC/SDL_mixer.vcxproj.filters
index b78b0fb8..03f3e501 100644
--- a/VisualC/SDL_mixer.vcxproj.filters
+++ b/VisualC/SDL_mixer.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClInclude Include="..\include\SDL_mixer.h">
@@ -19,6 +19,9 @@
<ClInclude Include="..\src\codecs\load_aiff.h">
<Filter>Sources</Filter>
</ClInclude>
+ <ClInclude Include="..\src\codecs\load_sndfile.h">
+ <Filter>Sources</Filter>
+ </ClInclude>
<ClInclude Include="..\src\codecs\load_voc.h">
<Filter>Sources</Filter>
</ClInclude>
@@ -28,12 +31,21 @@
<ClInclude Include="..\src\codecs\music_cmd.h">
<Filter>Sources</Filter>
</ClInclude>
+ <ClInclude Include="..\src\codecs\music_drflac.h">
+ <Filter>Sources</Filter>
+ </ClInclude>
+ <ClInclude Include="..\src\codecs\music_drmp3.h">
+ <Filter>Sources</Filter>
+ </ClInclude>
<ClInclude Include="..\src\codecs\music_flac.h">
<Filter>Sources</Filter>
</ClInclude>
<ClInclude Include="..\src\codecs\music_fluidsynth.h">
<Filter>Sources</Filter>
</ClInclude>
+ <ClInclude Include="..\src\codecs\music_gme.h">
+ <Filter>Sources</Filter>
+ </ClInclude>
<ClInclude Include="..\src\codecs\music_modplug.h">
<Filter>Sources</Filter>
</ClInclude>
@@ -55,10 +67,7 @@
<ClInclude Include="..\src\codecs\music_wav.h">
<Filter>Sources</Filter>
</ClInclude>
- <ClInclude Include="..\src\codecs\music_drflac.h">
- <Filter>Sources</Filter>
- </ClInclude>
- <ClInclude Include="..\src\codecs\music_drmp3.h">
+ <ClInclude Include="..\src\codecs\music_wavpack.h">
<Filter>Sources</Filter>
</ClInclude>
<ClInclude Include="..\src\codecs\music_xmp.h">
@@ -158,6 +167,9 @@
<ClCompile Include="..\src\codecs\load_aiff.c">
<Filter>Sources</Filter>
</ClCompile>
+ <ClCompile Include="..\src\codecs\load_sndfile.c">
+ <Filter>Sources</Filter>
+ </ClCompile>
<ClCompile Include="..\src\codecs\load_voc.c">
<Filter>Sources</Filter>
</ClCompile>
@@ -167,12 +179,21 @@
<ClCompile Include="..\src\codecs\music_cmd.c">
<Filter>Sources</Filter>
</ClCompile>
+ <ClCompile Include="..\src\codecs\music_drflac.c">
+ <Filter>Sources</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\codecs\music_drmp3.c">
+ <Filter>Sources</Filter>
+ </ClCompile>
<ClCompile Include="..\src\codecs\music_flac.c">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\codecs\music_fluidsynth.c">
<Filter>Sources</Filter>
</ClCompile>
+ <ClCompile Include="..\src\codecs\music_gme.c">
+ <Filter>Sources</Filter>
+ </ClCompile>
<ClCompile Include="..\src\codecs\music_modplug.c">
<Filter>Sources</Filter>
</ClCompile>
@@ -185,6 +206,9 @@
<ClCompile Include="..\src\codecs\music_ogg.c">
<Filter>Sources</Filter>
</ClCompile>
+ <ClCompile Include="..\src\codecs\music_ogg_stb.c">
+ <Filter>Sources</Filter>
+ </ClCompile>
<ClCompile Include="..\src\codecs\music_opus.c">
<Filter>Sources</Filter>
</ClCompile>
@@ -194,13 +218,7 @@
<ClCompile Include="..\src\codecs\music_wav.c">
<Filter>Sources</Filter>
</ClCompile>
- <ClCompile Include="..\src\codecs\music_drflac.c">
- <Filter>Sources</Filter>
- </ClCompile>
- <ClCompile Include="..\src\codecs\music_drmp3.c">
- <Filter>Sources</Filter>
- </ClCompile>
- <ClCompile Include="..\src\codecs\music_ogg_stb.c">
+ <ClCompile Include="..\src\codecs\music_wavpack.c">
<Filter>Sources</Filter>
</ClCompile>
<ClCompile Include="..\src\codecs\music_xmp.c">
diff --git a/src/codecs/load_voc.c b/src/codecs/load_voc.c
index ac4e16b0..506d2055 100644
--- a/src/codecs/load_voc.c
+++ b/src/codecs/load_voc.c
@@ -351,7 +351,7 @@ static Uint32 voc_read(SDL_RWops *src, vs_t *v, Uint8 *buf, SDL_AudioSpec *spec)
if (done <= 0)
return 0;
- v->rest -= done;
+ v->rest = (Uint32)(v->rest - done);
if (v->size == ST_SIZE_WORD)
{
#if (SDL_BYTEORDER == SDL_BIG_ENDIAN)