Rewrote music.c to support any number of decode libraries using a compiled-in plugin interface
authorSam Lantinga <slouken@libsdl.org>
Tue, 17 Oct 2017 02:33:47 -0700
changeset 77792882ef2ab81
parent 776 07b8e286bc03
child 778 05c93f7af403
Rewrote music.c to support any number of decode libraries using a compiled-in plugin interface
Mix_LoadWAV_RW() can now load sound formats that were previously available only as music.

This is still work in progress. Testing and project updates need to happen on other platforms.
Android.mk
Makefile.in
README.txt
SDL_mixer.h
VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.sln
VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj
VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj.filters
VisualC-WinRT/UWP_VS2015/libogg_dynamic-UWP.vcxproj
VisualC-WinRT/UWP_VS2015/libvorbis_dynamic-UWP.vcxproj
VisualC-WinRT/UWP_VS2015/libvorbisfile_dynamic-UWP.vcxproj
VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj
VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj.filters
VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.sln
VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj
VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj.filters
VisualC-WinRT/WinPhone81_VS2013/libogg_dynamic-WinPhone81.vcxproj
VisualC-WinRT/WinPhone81_VS2013/libvorbis_dynamic-WinPhone81.vcxproj
VisualC-WinRT/WinPhone81_VS2013/libvorbisfile_dynamic-WinPhone81.vcxproj
VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.sln
VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.vcxproj
VisualC-WinRT/WinRT80_VS2012/libogg_dynamic-WinRT80.vcxproj
VisualC-WinRT/WinRT80_VS2012/libvorbis_dynamic-WinRT80.vcxproj
VisualC-WinRT/WinRT80_VS2012/libvorbisfile_dynamic-WinRT80.vcxproj
VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.sln
VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj
VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj.filters
VisualC-WinRT/WinRT81_VS2013/libogg_dynamic-WinRT81.vcxproj
VisualC-WinRT/WinRT81_VS2013/libvorbis_dynamic-WinRT81.vcxproj
VisualC-WinRT/WinRT81_VS2013/libvorbisfile_dynamic-WinRT81.vcxproj
VisualC/SDL_mixer.vcxproj
VisualC/SDL_mixer.vcxproj.filters
Xcode-iOS/SDL_mixer.xcodeproj/project.pbxproj
Xcode/SDL_mixer.xcodeproj/project.pbxproj
configure.in
dynamic_flac.c
dynamic_flac.h
dynamic_fluidsynth.c
dynamic_fluidsynth.h
dynamic_mod.c
dynamic_mod.h
dynamic_modplug.c
dynamic_modplug.h
dynamic_mp3.c
dynamic_mp3.h
dynamic_ogg.c
dynamic_ogg.h
effect_position.c
effect_stereoreverse.c
effects_internal.c
effects_internal.h
fluidsynth.c
fluidsynth.h
load_aiff.c
load_aiff.h
load_flac.c
load_flac.h
load_mp3.c
load_mp3.h
load_ogg.c
load_ogg.h
load_voc.c
load_voc.h
mixer.c
mixer.h
music.c
music.h
music_cmd.c
music_cmd.h
music_flac.c
music_flac.h
music_fluidsynth.c
music_fluidsynth.h
music_mad.c
music_mad.h
music_mikmod.c
music_mikmod.h
music_mod.c
music_mod.h
music_modplug.c
music_modplug.h
music_mpg.c
music_mpg.h
music_mpg123.c
music_mpg123.h
music_nativemidi.c
music_nativemidi.h
music_ogg.c
music_ogg.h
music_smpeg.c
music_smpeg.h
music_timidity.c
music_timidity.h
music_wav.c
music_wav.h
native_midi/native_midi.h
playmus.c
playwave.c
wavestream.c
wavestream.h
     1.1 --- a/Android.mk	Mon Oct 16 02:16:47 2017 -0700
     1.2 +++ b/Android.mk	Tue Oct 17 02:33:47 2017 -0700
     1.3 @@ -36,7 +36,7 @@
     1.4  SUPPORT_TIMIDITY ?= true
     1.5  
     1.6  LOCAL_C_INCLUDES := $(LOCAL_PATH) 
     1.7 -LOCAL_CFLAGS := -DWAV_MUSIC 
     1.8 +LOCAL_CFLAGS := -DMUSIC_WAV
     1.9  
    1.10  LOCAL_SRC_FILES := $(notdir $(filter-out %/playmus.c %/playwave.c, $(wildcard $(LOCAL_PATH)/*.c))) \
    1.11  
    1.12 @@ -47,19 +47,19 @@
    1.13  
    1.14  ifeq ($(SUPPORT_TIMIDITY),true)
    1.15  	LOCAL_C_INCLUDES += $(LOCAL_PATH)/timidity
    1.16 -	LOCAL_CFLAGS += -DMID_MUSIC -DUSE_TIMIDITY_MIDI
    1.17 +	LOCAL_CFLAGS += -DMUSIC_MID -DMUSIC_MID_TIMIDITY
    1.18  	LOCAL_SRC_FILES += $(subst $(LOCAL_PATH)/,,$(wildcard $(LOCAL_PATH)/timidity/*.c))
    1.19  endif
    1.20  
    1.21  ifeq ($(SUPPORT_FLAC),true)
    1.22  	LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(FLAC_LIBRARY_PATH)/include
    1.23 -	LOCAL_CFLAGS += -DFLAC_MUSIC
    1.24 +	LOCAL_CFLAGS += -DMUSIC_FLAC
    1.25      LOCAL_SHARED_LIBRARIES += libFLAC
    1.26  endif
    1.27  
    1.28  ifeq ($(SUPPORT_MOD_MODPLUG),true)
    1.29      LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(MODPLUG_LIBRARY_PATH)/src $(LOCAL_PATH)/$(MODPLUG_LIBRARY_PATH)/src/libmodplug
    1.30 -    LOCAL_CFLAGS += -DMODPLUG_MUSIC -DMODPLUG_HEADER="<modplug.h>" -DHAVE_SETENV -DHAVE_SINF
    1.31 +    LOCAL_CFLAGS += -DMUSIC_MOD_MODPLUG -DMODPLUG_HEADER="<modplug.h>" -DHAVE_SETENV -DHAVE_SINF
    1.32      LOCAL_SRC_FILES += \
    1.33          $(MODPLUG_LIBRARY_PATH)/src/fastmix.cpp \
    1.34          $(MODPLUG_LIBRARY_PATH)/src/load_669.cpp \
    1.35 @@ -99,7 +99,7 @@
    1.36  
    1.37  ifeq ($(SUPPORT_MP3_SMPEG),true)
    1.38      LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SMPEG_LIBRARY_PATH)
    1.39 -    LOCAL_CFLAGS += -DMP3_MUSIC
    1.40 +    LOCAL_CFLAGS += -DMUSIC_MP3_SMPEG
    1.41      LOCAL_SHARED_LIBRARIES += smpeg2
    1.42  endif
    1.43  
    1.44 @@ -107,7 +107,7 @@
    1.45      LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(OGG_LIBRARY_PATH)/android \
    1.46                          $(LOCAL_PATH)/$(OGG_LIBRARY_PATH)/include \
    1.47                          $(LOCAL_PATH)/$(VORBIS_LIBRARY_PATH)
    1.48 -    LOCAL_CFLAGS += -DOGG_MUSIC -DOGG_USE_TREMOR -DOGG_HEADER="<ivorbisfile.h>"
    1.49 +    LOCAL_CFLAGS += -DMUSIC_OGG -DOGG_USE_TREMOR -DOGG_HEADER="<ivorbisfile.h>"
    1.50      ifeq ($(TARGET_ARCH_ABI),armeabi)
    1.51  	LOCAL_CFLAGS += -D_ARM_ASSEM_
    1.52      endif
     2.1 --- a/Makefile.in	Mon Oct 16 02:16:47 2017 -0700
     2.2 +++ b/Makefile.in	Tue Oct 17 02:33:47 2017 -0700
     2.3 @@ -39,7 +39,7 @@
     2.4  PLAYWAVE_OBJECTS = @PLAYWAVE_OBJECTS@
     2.5  PLAYMUS_OBJECTS = @PLAYMUS_OBJECTS@
     2.6  
     2.7 -DIST = *.txt Android.mk Makefile.in SDL2_mixer.pc.in SDL_mixer.h SDL2_mixer.spec SDL2_mixer.spec.in debian VisualC Xcode Xcode-iOS acinclude autogen.sh build-scripts configure configure.in dynamic_flac.c dynamic_flac.h dynamic_fluidsynth.c dynamic_fluidsynth.h dynamic_modplug.c dynamic_modplug.h dynamic_mod.c dynamic_mod.h dynamic_mp3.c dynamic_mp3.h dynamic_ogg.c dynamic_ogg.h effect_position.c effect_stereoreverse.c effects_internal.c effects_internal.h fluidsynth.c fluidsynth.h external gcc-fat.sh libmikmod-3.1.12.zip load_aiff.c load_aiff.h load_flac.c load_flac.h load_mp3.c load_mp3.h load_ogg.c load_ogg.h load_voc.c load_voc.h mixer.c mixer.h music.c music_cmd.c music_cmd.h music_flac.c music_flac.h music_mad.c music_mad.h music_mod.c music_mod.h music_modplug.c music_modplug.h music_ogg.c music_ogg.h native_midi playmus.c playwave.c timidity wavestream.c wavestream.h version.rc
     2.8 +DIST = *.txt Android.mk Makefile.in SDL2_mixer.pc.in SDL_mixer.h SDL2_mixer.spec SDL2_mixer.spec.in debian VisualC Xcode Xcode-iOS acinclude autogen.sh build-scripts configure configure.in dynamic_flac.c dynamic_flac.h dynamic_fluidsynth.c dynamic_fluidsynth.h dynamic_modplug.c dynamic_modplug.h dynamic_mikmod.c dynamic_mikmod.h dynamic_smpeg.c dynamic_smpeg.h dynamic_ogg.c dynamic_ogg.h effect_position.c effect_stereoreverse.c effects_internal.c effects_internal.h fluidsynth.c fluidsynth.h external gcc-fat.sh load_aiff.c load_aiff.h load_flac.c load_flac.h load_mp3.c load_mp3.h load_ogg.c load_ogg.h load_voc.c load_voc.h mixer.c mixer.h music.c music_cmd.c music_cmd.h music_flac.c music_flac.h music_mad.c music_mad.h music_mikmod.c music_mikmod.h music_modplug.c music_modplug.h music_ogg.c music_ogg.h native_midi playmus.c playwave.c timidity wavestream.c wavestream.h version.rc
     2.9  
    2.10  LT_AGE      = @LT_AGE@
    2.11  LT_CURRENT  = @LT_CURRENT@
     3.1 --- a/README.txt	Mon Oct 16 02:16:47 2017 -0700
     3.2 +++ b/README.txt	Tue Oct 17 02:33:47 2017 -0700
     3.3 @@ -20,11 +20,11 @@
     3.4  
     3.5  Tremor decoding is disabled by default; you can enable it by passing
     3.6  	--enable-music-ogg-tremor
     3.7 -to configure, or by defining OGG_MUSIC and OGG_USE_TREMOR.
     3.8 +to configure, or by defining MUSIC_OGG and OGG_USE_TREMOR.
     3.9  
    3.10  libmad decoding is disabled by default; you can enable it by passing
    3.11  	--enable-music-mp3-mad
    3.12 -to configure, or by defining MP3_MAD_MUSIC
    3.13 +to configure, or by defining MUSIC_MP3_MAD
    3.14  vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
    3.15  WARNING: The license for libmad is GPL, which means that in order to
    3.16           use it your application must also be GPL!
     4.1 --- a/SDL_mixer.h	Mon Oct 16 02:16:47 2017 -0700
     4.2 +++ b/SDL_mixer.h	Tue Oct 17 02:33:47 2017 -0700
     4.3 @@ -66,12 +66,11 @@
     4.4  
     4.5  typedef enum
     4.6  {
     4.7 -    MIX_INIT_FLAC        = 0x00000001,
     4.8 -    MIX_INIT_MOD         = 0x00000002,
     4.9 -    MIX_INIT_MODPLUG     = 0x00000004,
    4.10 -    MIX_INIT_MP3         = 0x00000008,
    4.11 -    MIX_INIT_OGG         = 0x00000010,
    4.12 -    MIX_INIT_FLUIDSYNTH  = 0x00000020
    4.13 +    MIX_INIT_FLAC   = 0x00000001,
    4.14 +    MIX_INIT_MOD    = 0x00000002,
    4.15 +    MIX_INIT_MP3    = 0x00000008,
    4.16 +    MIX_INIT_OGG    = 0x00000010,
    4.17 +    MIX_INIT_MID    = 0x00000020,
    4.18  } MIX_InitFlags;
    4.19  
    4.20  /* Loads dynamic libraries and prepares them for use.  Flags should be
    4.21 @@ -97,7 +96,7 @@
    4.22  #define MIX_DEFAULT_FORMAT  AUDIO_S16MSB
    4.23  #endif
    4.24  #define MIX_DEFAULT_CHANNELS    2
    4.25 -#define MIX_MAX_VOLUME          128 /* Volume of a chunk */
    4.26 +#define MIX_MAX_VOLUME          SDL_MIX_MAXVOLUME /* Volume of a chunk */
    4.27  
    4.28  /* The internal format for an audio chunk */
    4.29  typedef struct Mix_Chunk {
    4.30 @@ -114,6 +113,7 @@
    4.31      MIX_FADING_IN
    4.32  } Mix_Fading;
    4.33  
    4.34 +/* These are types of music files (not libraries used to load them) */
    4.35  typedef enum {
    4.36      MUS_NONE,
    4.37      MUS_CMD,
    4.38 @@ -122,10 +122,9 @@
    4.39      MUS_MID,
    4.40      MUS_OGG,
    4.41      MUS_MP3,
    4.42 -    MUS_MP3_MAD,
    4.43 -    MUS_MP3_MPG,
    4.44 +    MUS_MP3_MAD_UNUSED,
    4.45      MUS_FLAC,
    4.46 -    MUS_MODPLUG
    4.47 +    MUS_MODPLUG_UNUSED
    4.48  } Mix_MusicType;
    4.49  
    4.50  /* The internal format for a music chunk interpreted via mikmod */
    4.51 @@ -192,8 +191,10 @@
    4.52  */
    4.53  extern DECLSPEC int SDLCALL Mix_GetNumChunkDecoders(void);
    4.54  extern DECLSPEC const char * SDLCALL Mix_GetChunkDecoder(int index);
    4.55 +extern DECLSPEC SDL_bool SDLCALL Mix_HasChunkDecoder(const char *name);
    4.56  extern DECLSPEC int SDLCALL Mix_GetNumMusicDecoders(void);
    4.57  extern DECLSPEC const char * SDLCALL Mix_GetMusicDecoder(int index);
    4.58 +extern DECLSPEC SDL_bool SDLCALL Mix_HasMusicDecoder(const char *name);
    4.59  
    4.60  /* Find out the music format of a mixer music, or the currently playing
    4.61     music, if 'music' is NULL.
    4.62 @@ -625,6 +626,7 @@
    4.63  /* We'll use SDL for reporting errors */
    4.64  #define Mix_SetError    SDL_SetError
    4.65  #define Mix_GetError    SDL_GetError
    4.66 +#define Mix_ClearError  SDL_ClearError
    4.67  
    4.68  /* Ends C function definitions when using C++ */
    4.69  #ifdef __cplusplus
    4.70 @@ -633,3 +635,5 @@
    4.71  #include "close_code.h"
    4.72  
    4.73  #endif /* SDL_MIXER_H_ */
    4.74 +
    4.75 +/* vi: set ts=4 sw=4 expandtab: */
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.sln	Tue Oct 17 02:33:47 2017 -0700
     5.3 @@ -0,0 +1,76 @@
     5.4 +
     5.5 +Microsoft Visual Studio Solution File, Format Version 12.00
     5.6 +# Visual Studio 14
     5.7 +VisualStudioVersion = 14.0.25420.1
     5.8 +MinimumVisualStudioVersion = 10.0.40219.1
     5.9 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2_mixer-UWP", "SDL_mixer-UWP.vcxproj", "{18665277-E558-4484-93F4-E4DC7BB614CB}"
    5.10 +EndProject
    5.11 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg_dynamic-UWP", "libogg_dynamic-UWP.vcxproj", "{B14F8B7F-C9FF-4FD3-B328-7C68AB801E85}"
    5.12 +EndProject
    5.13 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbis_dynamic-UWP", "libvorbis_dynamic-UWP.vcxproj", "{6B6C1F59-6A82-4097-8907-04DF5C95D014}"
    5.14 +EndProject
    5.15 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbisfile_dynamic-UWP", "libvorbisfile_dynamic-UWP.vcxproj", "{70EF3B8F-6AAF-401B-9818-3371E950E73C}"
    5.16 +EndProject
    5.17 +Global
    5.18 +	GlobalSection(SolutionConfigurationPlatforms) = preSolution
    5.19 +		Debug|ARM = Debug|ARM
    5.20 +		Debug|x64 = Debug|x64
    5.21 +		Debug|x86 = Debug|x86
    5.22 +		Release|ARM = Release|ARM
    5.23 +		Release|x64 = Release|x64
    5.24 +		Release|x86 = Release|x86
    5.25 +	EndGlobalSection
    5.26 +	GlobalSection(ProjectConfigurationPlatforms) = postSolution
    5.27 +		{18665277-E558-4484-93F4-E4DC7BB614CB}.Debug|ARM.ActiveCfg = Debug|ARM
    5.28 +		{18665277-E558-4484-93F4-E4DC7BB614CB}.Debug|ARM.Build.0 = Debug|ARM
    5.29 +		{18665277-E558-4484-93F4-E4DC7BB614CB}.Debug|x64.ActiveCfg = Debug|x64
    5.30 +		{18665277-E558-4484-93F4-E4DC7BB614CB}.Debug|x64.Build.0 = Debug|x64
    5.31 +		{18665277-E558-4484-93F4-E4DC7BB614CB}.Debug|x86.ActiveCfg = Debug|Win32
    5.32 +		{18665277-E558-4484-93F4-E4DC7BB614CB}.Debug|x86.Build.0 = Debug|Win32
    5.33 +		{18665277-E558-4484-93F4-E4DC7BB614CB}.Release|ARM.ActiveCfg = Release|ARM
    5.34 +		{18665277-E558-4484-93F4-E4DC7BB614CB}.Release|ARM.Build.0 = Release|ARM
    5.35 +		{18665277-E558-4484-93F4-E4DC7BB614CB}.Release|x64.ActiveCfg = Release|x64
    5.36 +		{18665277-E558-4484-93F4-E4DC7BB614CB}.Release|x64.Build.0 = Release|x64
    5.37 +		{18665277-E558-4484-93F4-E4DC7BB614CB}.Release|x86.ActiveCfg = Release|Win32
    5.38 +		{18665277-E558-4484-93F4-E4DC7BB614CB}.Release|x86.Build.0 = Release|Win32
    5.39 +		{B14F8B7F-C9FF-4FD3-B328-7C68AB801E85}.Debug|ARM.ActiveCfg = Debug|ARM
    5.40 +		{B14F8B7F-C9FF-4FD3-B328-7C68AB801E85}.Debug|ARM.Build.0 = Debug|ARM
    5.41 +		{B14F8B7F-C9FF-4FD3-B328-7C68AB801E85}.Debug|x64.ActiveCfg = Debug|x64
    5.42 +		{B14F8B7F-C9FF-4FD3-B328-7C68AB801E85}.Debug|x64.Build.0 = Debug|x64
    5.43 +		{B14F8B7F-C9FF-4FD3-B328-7C68AB801E85}.Debug|x86.ActiveCfg = Debug|Win32
    5.44 +		{B14F8B7F-C9FF-4FD3-B328-7C68AB801E85}.Debug|x86.Build.0 = Debug|Win32
    5.45 +		{B14F8B7F-C9FF-4FD3-B328-7C68AB801E85}.Release|ARM.ActiveCfg = Release|ARM
    5.46 +		{B14F8B7F-C9FF-4FD3-B328-7C68AB801E85}.Release|ARM.Build.0 = Release|ARM
    5.47 +		{B14F8B7F-C9FF-4FD3-B328-7C68AB801E85}.Release|x64.ActiveCfg = Release|x64
    5.48 +		{B14F8B7F-C9FF-4FD3-B328-7C68AB801E85}.Release|x64.Build.0 = Release|x64
    5.49 +		{B14F8B7F-C9FF-4FD3-B328-7C68AB801E85}.Release|x86.ActiveCfg = Release|Win32
    5.50 +		{B14F8B7F-C9FF-4FD3-B328-7C68AB801E85}.Release|x86.Build.0 = Release|Win32
    5.51 +		{6B6C1F59-6A82-4097-8907-04DF5C95D014}.Debug|ARM.ActiveCfg = Debug|ARM
    5.52 +		{6B6C1F59-6A82-4097-8907-04DF5C95D014}.Debug|ARM.Build.0 = Debug|ARM
    5.53 +		{6B6C1F59-6A82-4097-8907-04DF5C95D014}.Debug|x64.ActiveCfg = Debug|x64
    5.54 +		{6B6C1F59-6A82-4097-8907-04DF5C95D014}.Debug|x64.Build.0 = Debug|x64
    5.55 +		{6B6C1F59-6A82-4097-8907-04DF5C95D014}.Debug|x86.ActiveCfg = Debug|Win32
    5.56 +		{6B6C1F59-6A82-4097-8907-04DF5C95D014}.Debug|x86.Build.0 = Debug|Win32
    5.57 +		{6B6C1F59-6A82-4097-8907-04DF5C95D014}.Release|ARM.ActiveCfg = Release|ARM
    5.58 +		{6B6C1F59-6A82-4097-8907-04DF5C95D014}.Release|ARM.Build.0 = Release|ARM
    5.59 +		{6B6C1F59-6A82-4097-8907-04DF5C95D014}.Release|x64.ActiveCfg = Release|x64
    5.60 +		{6B6C1F59-6A82-4097-8907-04DF5C95D014}.Release|x64.Build.0 = Release|x64
    5.61 +		{6B6C1F59-6A82-4097-8907-04DF5C95D014}.Release|x86.ActiveCfg = Release|Win32
    5.62 +		{6B6C1F59-6A82-4097-8907-04DF5C95D014}.Release|x86.Build.0 = Release|Win32
    5.63 +		{70EF3B8F-6AAF-401B-9818-3371E950E73C}.Debug|ARM.ActiveCfg = Debug|ARM
    5.64 +		{70EF3B8F-6AAF-401B-9818-3371E950E73C}.Debug|ARM.Build.0 = Debug|ARM
    5.65 +		{70EF3B8F-6AAF-401B-9818-3371E950E73C}.Debug|x64.ActiveCfg = Debug|x64
    5.66 +		{70EF3B8F-6AAF-401B-9818-3371E950E73C}.Debug|x64.Build.0 = Debug|x64
    5.67 +		{70EF3B8F-6AAF-401B-9818-3371E950E73C}.Debug|x86.ActiveCfg = Debug|Win32
    5.68 +		{70EF3B8F-6AAF-401B-9818-3371E950E73C}.Debug|x86.Build.0 = Debug|Win32
    5.69 +		{70EF3B8F-6AAF-401B-9818-3371E950E73C}.Release|ARM.ActiveCfg = Release|ARM
    5.70 +		{70EF3B8F-6AAF-401B-9818-3371E950E73C}.Release|ARM.Build.0 = Release|ARM
    5.71 +		{70EF3B8F-6AAF-401B-9818-3371E950E73C}.Release|x64.ActiveCfg = Release|x64
    5.72 +		{70EF3B8F-6AAF-401B-9818-3371E950E73C}.Release|x64.Build.0 = Release|x64
    5.73 +		{70EF3B8F-6AAF-401B-9818-3371E950E73C}.Release|x86.ActiveCfg = Release|Win32
    5.74 +		{70EF3B8F-6AAF-401B-9818-3371E950E73C}.Release|x86.Build.0 = Release|Win32
    5.75 +	EndGlobalSection
    5.76 +	GlobalSection(SolutionProperties) = preSolution
    5.77 +		HideSolutionNode = FALSE
    5.78 +	EndGlobalSection
    5.79 +EndGlobal
     6.1 --- a/VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj	Mon Oct 16 02:16:47 2017 -0700
     6.2 +++ b/VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj	Tue Oct 17 02:33:47 2017 -0700
     6.3 @@ -27,26 +27,25 @@
     6.4      </ProjectConfiguration>
     6.5    </ItemGroup>
     6.6    <ItemGroup>
     6.7 -    <ClCompile Include="..\..\dynamic_flac.c" />
     6.8 -    <ClCompile Include="..\..\dynamic_fluidsynth.c" />
     6.9 -    <ClCompile Include="..\..\dynamic_mod.c" />
    6.10 -    <ClCompile Include="..\..\dynamic_mp3.c" />
    6.11 -    <ClCompile Include="..\..\dynamic_ogg.c" />
    6.12      <ClCompile Include="..\..\effects_internal.c" />
    6.13      <ClCompile Include="..\..\effect_position.c" />
    6.14      <ClCompile Include="..\..\effect_stereoreverse.c" />
    6.15 -    <ClCompile Include="..\..\fluidsynth.c" />
    6.16      <ClCompile Include="..\..\load_aiff.c" />
    6.17 -    <ClCompile Include="..\..\load_flac.c" />
    6.18 -    <ClCompile Include="..\..\load_ogg.c" />
    6.19      <ClCompile Include="..\..\load_voc.c" />
    6.20      <ClCompile Include="..\..\mixer.c" />
    6.21      <ClCompile Include="..\..\music.c" />
    6.22      <ClCompile Include="..\..\music_cmd.c" />
    6.23      <ClCompile Include="..\..\music_flac.c" />
    6.24 +    <ClCompile Include="..\..\music_fluidsynth.c" />
    6.25      <ClCompile Include="..\..\music_mad.c" />
    6.26 -    <ClCompile Include="..\..\music_mod.c" />
    6.27 +    <ClCompile Include="..\..\music_mikmod.c" />
    6.28 +    <ClCompile Include="..\..\music_modplug.c" />
    6.29 +    <ClCompile Include="..\..\music_mpg123.c" />
    6.30 +    <ClCompile Include="..\..\music_nativemidi.c" />
    6.31      <ClCompile Include="..\..\music_ogg.c" />
    6.32 +    <ClCompile Include="..\..\music_smpeg.c" />
    6.33 +    <ClCompile Include="..\..\music_timidity.c" />
    6.34 +    <ClCompile Include="..\..\music_wav.c" />
    6.35      <ClCompile Include="..\..\timidity\common.c" />
    6.36      <ClCompile Include="..\..\timidity\ctrlmode.c" />
    6.37      <ClCompile Include="..\..\timidity\filter.c" />
    6.38 @@ -60,25 +59,8 @@
    6.39      <ClCompile Include="..\..\timidity\sdl_c.c" />
    6.40      <ClCompile Include="..\..\timidity\tables.c" />
    6.41      <ClCompile Include="..\..\timidity\timidity.c" />
    6.42 -    <ClCompile Include="..\..\wavestream.c" />
    6.43    </ItemGroup>
    6.44    <ItemGroup>
    6.45 -    <ClInclude Include="..\..\dynamic_flac.h" />
    6.46 -    <ClInclude Include="..\..\dynamic_fluidsynth.h" />
    6.47 -    <ClInclude Include="..\..\dynamic_mod.h" />
    6.48 -    <ClInclude Include="..\..\dynamic_mp3.h" />
    6.49 -    <ClInclude Include="..\..\dynamic_ogg.h" />
    6.50 -    <ClInclude Include="..\..\effects_internal.h" />
    6.51 -    <ClInclude Include="..\..\fluidsynth.h" />
    6.52 -    <ClInclude Include="..\..\load_aiff.h" />
    6.53 -    <ClInclude Include="..\..\load_flac.h" />
    6.54 -    <ClInclude Include="..\..\load_ogg.h" />
    6.55 -    <ClInclude Include="..\..\load_voc.h" />
    6.56 -    <ClInclude Include="..\..\music_cmd.h" />
    6.57 -    <ClInclude Include="..\..\music_flac.h" />
    6.58 -    <ClInclude Include="..\..\music_mad.h" />
    6.59 -    <ClInclude Include="..\..\music_mod.h" />
    6.60 -    <ClInclude Include="..\..\music_ogg.h" />
    6.61      <ClInclude Include="..\..\SDL_mixer.h" />
    6.62      <ClInclude Include="..\..\timidity\common.h" />
    6.63      <ClInclude Include="..\..\timidity\config.h" />
    6.64 @@ -92,7 +74,6 @@
    6.65      <ClInclude Include="..\..\timidity\resample.h" />
    6.66      <ClInclude Include="..\..\timidity\tables.h" />
    6.67      <ClInclude Include="..\..\timidity\timidity.h" />
    6.68 -    <ClInclude Include="..\..\wavestream.h" />
    6.69    </ItemGroup>
    6.70    <ItemGroup>
    6.71      <ProjectReference Include="..\..\..\SDL\VisualC-WinRT\UWP_VS2015\SDL-UWP.vcxproj">
    6.72 @@ -218,8 +199,8 @@
    6.73      <ClCompile>
    6.74        <PrecompiledHeader>NotUsing</PrecompiledHeader>
    6.75        <CompileAsWinRT>false</CompileAsWinRT>
    6.76 -      <AdditionalIncludeDirectories>..\..\timidity;..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    6.77 -      <PreprocessorDefinitions>getenv=SDL_getenv;MID_MUSIC;USE_TIMIDITY_MIDI;WAV_MUSIC;OGG_MUSIC;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    6.78 +      <AdditionalIncludeDirectories>..\..\timidity;..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    6.79 +      <PreprocessorDefinitions>getenv=SDL_getenv;MUSIC_MID;USE_TIMIDITY_MIDI;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    6.80      </ClCompile>
    6.81      <Link>
    6.82        <SubSystem>Console</SubSystem>
    6.83 @@ -231,8 +212,8 @@
    6.84      <ClCompile>
    6.85        <PrecompiledHeader>NotUsing</PrecompiledHeader>
    6.86        <CompileAsWinRT>false</CompileAsWinRT>
    6.87 -      <AdditionalIncludeDirectories>..\..\timidity;..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    6.88 -      <PreprocessorDefinitions>getenv=SDL_getenv;MID_MUSIC;USE_TIMIDITY_MIDI;WAV_MUSIC;OGG_MUSIC;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    6.89 +      <AdditionalIncludeDirectories>..\..\timidity;..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    6.90 +      <PreprocessorDefinitions>getenv=SDL_getenv;MUSIC_MID;USE_TIMIDITY_MIDI;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    6.91      </ClCompile>
    6.92      <Link>
    6.93        <SubSystem>Console</SubSystem>
    6.94 @@ -244,8 +225,8 @@
    6.95      <ClCompile>
    6.96        <PrecompiledHeader>NotUsing</PrecompiledHeader>
    6.97        <CompileAsWinRT>false</CompileAsWinRT>
    6.98 -      <AdditionalIncludeDirectories>..\..\timidity;..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    6.99 -      <PreprocessorDefinitions>getenv=SDL_getenv;MID_MUSIC;USE_TIMIDITY_MIDI;WAV_MUSIC;OGG_MUSIC;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   6.100 +      <AdditionalIncludeDirectories>..\..\timidity;..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   6.101 +      <PreprocessorDefinitions>getenv=SDL_getenv;MUSIC_MID;USE_TIMIDITY_MIDI;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   6.102      </ClCompile>
   6.103      <Link>
   6.104        <SubSystem>Console</SubSystem>
   6.105 @@ -257,8 +238,8 @@
   6.106      <ClCompile>
   6.107        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   6.108        <CompileAsWinRT>false</CompileAsWinRT>
   6.109 -      <AdditionalIncludeDirectories>..\..\timidity;..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   6.110 -      <PreprocessorDefinitions>getenv=SDL_getenv;MID_MUSIC;USE_TIMIDITY_MIDI;WAV_MUSIC;OGG_MUSIC;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   6.111 +      <AdditionalIncludeDirectories>..\..\timidity;..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   6.112 +      <PreprocessorDefinitions>getenv=SDL_getenv;MUSIC_MID;USE_TIMIDITY_MIDI;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   6.113      </ClCompile>
   6.114      <Link>
   6.115        <SubSystem>Console</SubSystem>
   6.116 @@ -270,8 +251,8 @@
   6.117      <ClCompile>
   6.118        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   6.119        <CompileAsWinRT>false</CompileAsWinRT>
   6.120 -      <AdditionalIncludeDirectories>..\..\timidity;..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   6.121 -      <PreprocessorDefinitions>getenv=SDL_getenv;MID_MUSIC;USE_TIMIDITY_MIDI;WAV_MUSIC;OGG_MUSIC;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   6.122 +      <AdditionalIncludeDirectories>..\..\timidity;..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   6.123 +      <PreprocessorDefinitions>getenv=SDL_getenv;MUSIC_MID;USE_TIMIDITY_MIDI;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   6.124      </ClCompile>
   6.125      <Link>
   6.126        <SubSystem>Console</SubSystem>
   6.127 @@ -283,8 +264,8 @@
   6.128      <ClCompile>
   6.129        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   6.130        <CompileAsWinRT>false</CompileAsWinRT>
   6.131 -      <AdditionalIncludeDirectories>..\..\timidity;..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   6.132 -      <PreprocessorDefinitions>getenv=SDL_getenv;MID_MUSIC;USE_TIMIDITY_MIDI;WAV_MUSIC;OGG_MUSIC;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   6.133 +      <AdditionalIncludeDirectories>..\..\timidity;..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   6.134 +      <PreprocessorDefinitions>getenv=SDL_getenv;MUSIC_MID;USE_TIMIDITY_MIDI;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   6.135      </ClCompile>
   6.136      <Link>
   6.137        <SubSystem>Console</SubSystem>
   6.138 @@ -295,4 +276,4 @@
   6.139    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   6.140    <ImportGroup Label="ExtensionTargets">
   6.141    </ImportGroup>
   6.142 -</Project>
   6.143 \ No newline at end of file
   6.144 +</Project>
     7.1 --- a/VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj.filters	Mon Oct 16 02:16:47 2017 -0700
     7.2 +++ b/VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj.filters	Tue Oct 17 02:33:47 2017 -0700
     7.3 @@ -1,27 +1,6 @@
     7.4  <?xml version="1.0" encoding="utf-8"?>
     7.5  <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     7.6    <ItemGroup>
     7.7 -    <ClCompile Include="..\..\dynamic_flac.c" />
     7.8 -    <ClCompile Include="..\..\dynamic_fluidsynth.c" />
     7.9 -    <ClCompile Include="..\..\dynamic_mod.c" />
    7.10 -    <ClCompile Include="..\..\dynamic_mp3.c" />
    7.11 -    <ClCompile Include="..\..\dynamic_ogg.c" />
    7.12 -    <ClCompile Include="..\..\effect_position.c" />
    7.13 -    <ClCompile Include="..\..\effect_stereoreverse.c" />
    7.14 -    <ClCompile Include="..\..\effects_internal.c" />
    7.15 -    <ClCompile Include="..\..\fluidsynth.c" />
    7.16 -    <ClCompile Include="..\..\load_aiff.c" />
    7.17 -    <ClCompile Include="..\..\load_flac.c" />
    7.18 -    <ClCompile Include="..\..\load_ogg.c" />
    7.19 -    <ClCompile Include="..\..\load_voc.c" />
    7.20 -    <ClCompile Include="..\..\mixer.c" />
    7.21 -    <ClCompile Include="..\..\music.c" />
    7.22 -    <ClCompile Include="..\..\music_cmd.c" />
    7.23 -    <ClCompile Include="..\..\music_flac.c" />
    7.24 -    <ClCompile Include="..\..\music_mad.c" />
    7.25 -    <ClCompile Include="..\..\music_mod.c" />
    7.26 -    <ClCompile Include="..\..\music_ogg.c" />
    7.27 -    <ClCompile Include="..\..\wavestream.c" />
    7.28      <ClCompile Include="..\..\timidity\common.c">
    7.29        <Filter>Timidity</Filter>
    7.30      </ClCompile>
    7.31 @@ -61,26 +40,28 @@
    7.32      <ClCompile Include="..\..\timidity\timidity.c">
    7.33        <Filter>Timidity</Filter>
    7.34      </ClCompile>
    7.35 +    <ClCompile Include="..\..\effect_position.c" />
    7.36 +    <ClCompile Include="..\..\effect_stereoreverse.c" />
    7.37 +    <ClCompile Include="..\..\effects_internal.c" />
    7.38 +    <ClCompile Include="..\..\load_aiff.c" />
    7.39 +    <ClCompile Include="..\..\load_voc.c" />
    7.40 +    <ClCompile Include="..\..\mixer.c" />
    7.41 +    <ClCompile Include="..\..\music.c" />
    7.42 +    <ClCompile Include="..\..\music_cmd.c" />
    7.43 +    <ClCompile Include="..\..\music_flac.c" />
    7.44 +    <ClCompile Include="..\..\music_fluidsynth.c" />
    7.45 +    <ClCompile Include="..\..\music_mad.c" />
    7.46 +    <ClCompile Include="..\..\music_mikmod.c" />
    7.47 +    <ClCompile Include="..\..\music_modplug.c" />
    7.48 +    <ClCompile Include="..\..\music_mpg123.c" />
    7.49 +    <ClCompile Include="..\..\music_nativemidi.c" />
    7.50 +    <ClCompile Include="..\..\music_ogg.c" />
    7.51 +    <ClCompile Include="..\..\music_smpeg.c" />
    7.52 +    <ClCompile Include="..\..\music_timidity.c" />
    7.53 +    <ClCompile Include="..\..\music_wav.c" />
    7.54    </ItemGroup>
    7.55    <ItemGroup>
    7.56 -    <ClInclude Include="..\..\dynamic_flac.h" />
    7.57 -    <ClInclude Include="..\..\dynamic_fluidsynth.h" />
    7.58 -    <ClInclude Include="..\..\dynamic_mod.h" />
    7.59 -    <ClInclude Include="..\..\dynamic_mp3.h" />
    7.60 -    <ClInclude Include="..\..\dynamic_ogg.h" />
    7.61 -    <ClInclude Include="..\..\effects_internal.h" />
    7.62 -    <ClInclude Include="..\..\fluidsynth.h" />
    7.63 -    <ClInclude Include="..\..\load_aiff.h" />
    7.64 -    <ClInclude Include="..\..\load_flac.h" />
    7.65 -    <ClInclude Include="..\..\load_ogg.h" />
    7.66 -    <ClInclude Include="..\..\load_voc.h" />
    7.67 -    <ClInclude Include="..\..\music_cmd.h" />
    7.68 -    <ClInclude Include="..\..\music_flac.h" />
    7.69 -    <ClInclude Include="..\..\music_mad.h" />
    7.70 -    <ClInclude Include="..\..\music_mod.h" />
    7.71 -    <ClInclude Include="..\..\music_ogg.h" />
    7.72      <ClInclude Include="..\..\SDL_mixer.h" />
    7.73 -    <ClInclude Include="..\..\wavestream.h" />
    7.74      <ClInclude Include="..\..\timidity\common.h">
    7.75        <Filter>Timidity</Filter>
    7.76      </ClInclude>
    7.77 @@ -123,4 +104,4 @@
    7.78        <UniqueIdentifier>{660dbe57-4c07-417e-9609-12b312726942}</UniqueIdentifier>
    7.79      </Filter>
    7.80    </ItemGroup>
    7.81 -</Project>
    7.82 \ No newline at end of file
    7.83 +</Project>
     8.1 --- a/VisualC-WinRT/UWP_VS2015/libogg_dynamic-UWP.vcxproj	Mon Oct 16 02:16:47 2017 -0700
     8.2 +++ b/VisualC-WinRT/UWP_VS2015/libogg_dynamic-UWP.vcxproj	Tue Oct 17 02:33:47 2017 -0700
     8.3 @@ -27,15 +27,15 @@
     8.4      </ProjectConfiguration>
     8.5    </ItemGroup>
     8.6    <ItemGroup>
     8.7 -    <ClCompile Include="..\..\external\libogg-1.3.1\src\bitwise.c" />
     8.8 -    <ClCompile Include="..\..\external\libogg-1.3.1\src\framing.c" />
     8.9 +    <ClCompile Include="..\..\external\libogg-1.3.2\src\bitwise.c" />
    8.10 +    <ClCompile Include="..\..\external\libogg-1.3.2\src\framing.c" />
    8.11    </ItemGroup>
    8.12    <ItemGroup>
    8.13 -    <None Include="..\..\external\libogg-1.3.1\win32\ogg.def" />
    8.14 +    <None Include="..\..\external\libogg-1.3.2\win32\ogg.def" />
    8.15    </ItemGroup>
    8.16    <ItemGroup>
    8.17 -    <ClInclude Include="..\..\external\libogg-1.3.1\include\ogg\ogg.h" />
    8.18 -    <ClInclude Include="..\..\external\libogg-1.3.1\include\ogg\os_types.h" />
    8.19 +    <ClInclude Include="..\..\external\libogg-1.3.2\include\ogg\ogg.h" />
    8.20 +    <ClInclude Include="..\..\external\libogg-1.3.2\include\ogg\os_types.h" />
    8.21    </ItemGroup>
    8.22    <PropertyGroup Label="Globals">
    8.23      <ProjectGuid>{b14f8b7f-c9ff-4fd3-b328-7c68ab801e85}</ProjectGuid>
    8.24 @@ -147,7 +147,7 @@
    8.25      <ClCompile>
    8.26        <PrecompiledHeader>NotUsing</PrecompiledHeader>
    8.27        <CompileAsWinRT>false</CompileAsWinRT>
    8.28 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    8.29 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    8.30        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    8.31        <DisableSpecificWarnings>4244</DisableSpecificWarnings>
    8.32      </ClCompile>
    8.33 @@ -155,14 +155,14 @@
    8.34        <SubSystem>Console</SubSystem>
    8.35        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
    8.36        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
    8.37 -      <ModuleDefinitionFile>..\..\external\libogg-1.3.1\win32\ogg.def</ModuleDefinitionFile>
    8.38 +      <ModuleDefinitionFile>..\..\external\libogg-1.3.2\win32\ogg.def</ModuleDefinitionFile>
    8.39      </Link>
    8.40    </ItemDefinitionGroup>
    8.41    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    8.42      <ClCompile>
    8.43        <PrecompiledHeader>NotUsing</PrecompiledHeader>
    8.44        <CompileAsWinRT>false</CompileAsWinRT>
    8.45 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    8.46 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    8.47        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    8.48        <DisableSpecificWarnings>4244</DisableSpecificWarnings>
    8.49      </ClCompile>
    8.50 @@ -170,14 +170,14 @@
    8.51        <SubSystem>Console</SubSystem>
    8.52        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
    8.53        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
    8.54 -      <ModuleDefinitionFile>..\..\external\libogg-1.3.1\win32\ogg.def</ModuleDefinitionFile>
    8.55 +      <ModuleDefinitionFile>..\..\external\libogg-1.3.2\win32\ogg.def</ModuleDefinitionFile>
    8.56      </Link>
    8.57    </ItemDefinitionGroup>
    8.58    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
    8.59      <ClCompile>
    8.60        <PrecompiledHeader>NotUsing</PrecompiledHeader>
    8.61        <CompileAsWinRT>false</CompileAsWinRT>
    8.62 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    8.63 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    8.64        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    8.65        <DisableSpecificWarnings>4244</DisableSpecificWarnings>
    8.66      </ClCompile>
    8.67 @@ -185,14 +185,14 @@
    8.68        <SubSystem>Console</SubSystem>
    8.69        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
    8.70        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
    8.71 -      <ModuleDefinitionFile>..\..\external\libogg-1.3.1\win32\ogg.def</ModuleDefinitionFile>
    8.72 +      <ModuleDefinitionFile>..\..\external\libogg-1.3.2\win32\ogg.def</ModuleDefinitionFile>
    8.73      </Link>
    8.74    </ItemDefinitionGroup>
    8.75    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
    8.76      <ClCompile>
    8.77        <PrecompiledHeader>NotUsing</PrecompiledHeader>
    8.78        <CompileAsWinRT>false</CompileAsWinRT>
    8.79 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    8.80 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    8.81        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    8.82        <DisableSpecificWarnings>4244</DisableSpecificWarnings>
    8.83      </ClCompile>
    8.84 @@ -200,14 +200,14 @@
    8.85        <SubSystem>Console</SubSystem>
    8.86        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
    8.87        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
    8.88 -      <ModuleDefinitionFile>..\..\external\libogg-1.3.1\win32\ogg.def</ModuleDefinitionFile>
    8.89 +      <ModuleDefinitionFile>..\..\external\libogg-1.3.2\win32\ogg.def</ModuleDefinitionFile>
    8.90      </Link>
    8.91    </ItemDefinitionGroup>
    8.92    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    8.93      <ClCompile>
    8.94        <PrecompiledHeader>NotUsing</PrecompiledHeader>
    8.95        <CompileAsWinRT>false</CompileAsWinRT>
    8.96 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    8.97 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    8.98        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    8.99        <DisableSpecificWarnings>4244</DisableSpecificWarnings>
   8.100      </ClCompile>
   8.101 @@ -215,14 +215,14 @@
   8.102        <SubSystem>Console</SubSystem>
   8.103        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
   8.104        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
   8.105 -      <ModuleDefinitionFile>..\..\external\libogg-1.3.1\win32\ogg.def</ModuleDefinitionFile>
   8.106 +      <ModuleDefinitionFile>..\..\external\libogg-1.3.2\win32\ogg.def</ModuleDefinitionFile>
   8.107      </Link>
   8.108    </ItemDefinitionGroup>
   8.109    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
   8.110      <ClCompile>
   8.111        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   8.112        <CompileAsWinRT>false</CompileAsWinRT>
   8.113 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   8.114 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   8.115        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   8.116        <DisableSpecificWarnings>4244</DisableSpecificWarnings>
   8.117      </ClCompile>
   8.118 @@ -230,10 +230,10 @@
   8.119        <SubSystem>Console</SubSystem>
   8.120        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
   8.121        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
   8.122 -      <ModuleDefinitionFile>..\..\external\libogg-1.3.1\win32\ogg.def</ModuleDefinitionFile>
   8.123 +      <ModuleDefinitionFile>..\..\external\libogg-1.3.2\win32\ogg.def</ModuleDefinitionFile>
   8.124      </Link>
   8.125    </ItemDefinitionGroup>
   8.126    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   8.127    <ImportGroup Label="ExtensionTargets">
   8.128    </ImportGroup>
   8.129 -</Project>
   8.130 \ No newline at end of file
   8.131 +</Project>
     9.1 --- a/VisualC-WinRT/UWP_VS2015/libvorbis_dynamic-UWP.vcxproj	Mon Oct 16 02:16:47 2017 -0700
     9.2 +++ b/VisualC-WinRT/UWP_VS2015/libvorbis_dynamic-UWP.vcxproj	Tue Oct 17 02:33:47 2017 -0700
     9.3 @@ -27,74 +27,74 @@
     9.4      </ProjectConfiguration>
     9.5    </ItemGroup>
     9.6    <ItemGroup>
     9.7 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\analysis.c" />
     9.8 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\bitrate.c" />
     9.9 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\block.c" />
    9.10 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\codebook.c" />
    9.11 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\envelope.c" />
    9.12 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\floor0.c" />
    9.13 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\floor1.c" />
    9.14 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\info.c" />
    9.15 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\lookup.c" />
    9.16 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\lpc.c" />
    9.17 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\lsp.c" />
    9.18 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\mapping0.c" />
    9.19 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\mdct.c" />
    9.20 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\psy.c" />
    9.21 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\registry.c" />
    9.22 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\res0.c" />
    9.23 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\sharedbook.c" />
    9.24 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\smallft.c" />
    9.25 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\synthesis.c" />
    9.26 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\vorbisenc.c" />
    9.27 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\window.c" />
    9.28 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\analysis.c" />
    9.29 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\bitrate.c" />
    9.30 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\block.c" />
    9.31 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\codebook.c" />
    9.32 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\envelope.c" />
    9.33 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\floor0.c" />
    9.34 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\floor1.c" />
    9.35 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\info.c" />
    9.36 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\lookup.c" />
    9.37 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\lpc.c" />
    9.38 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\lsp.c" />
    9.39 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\mapping0.c" />
    9.40 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\mdct.c" />
    9.41 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\psy.c" />
    9.42 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\registry.c" />
    9.43 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\res0.c" />
    9.44 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\sharedbook.c" />
    9.45 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\smallft.c" />
    9.46 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\synthesis.c" />
    9.47 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\vorbisenc.c" />
    9.48 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\window.c" />
    9.49    </ItemGroup>
    9.50    <ItemGroup>
    9.51 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\include\vorbis\codec.h" />
    9.52 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\include\vorbis\vorbisenc.h" />
    9.53 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\include\vorbis\vorbisfile.h" />
    9.54 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\backends.h" />
    9.55 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\bitrate.h" />
    9.56 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\books\coupled\res_books_stereo.h" />
    9.57 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\books\floor\floor_books.h" />
    9.58 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\books\uncoupled\res_books_uncoupled.h" />
    9.59 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\codebook.h" />
    9.60 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\codec_internal.h" />
    9.61 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\envelope.h" />
    9.62 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\highlevel.h" />
    9.63 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\lookup.h" />
    9.64 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\lookup_data.h" />
    9.65 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\lpc.h" />
    9.66 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\lsp.h" />
    9.67 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\masking.h" />
    9.68 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\mdct.h" />
    9.69 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\misc.h" />
    9.70 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\floor_all.h" />
    9.71 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\psych_11.h" />
    9.72 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\psych_16.h" />
    9.73 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\psych_44.h" />
    9.74 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\psych_8.h" />
    9.75 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\residue_16.h" />
    9.76 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\residue_44.h" />
    9.77 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\residue_44u.h" />
    9.78 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\residue_8.h" />
    9.79 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_11.h" />
    9.80 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_16.h" />
    9.81 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_22.h" />
    9.82 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_32.h" />
    9.83 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_44.h" />
    9.84 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_44u.h" />
    9.85 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_8.h" />
    9.86 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_X.h" />
    9.87 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\os.h" />
    9.88 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\psy.h" />
    9.89 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\registry.h" />
    9.90 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\scales.h" />
    9.91 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\smallft.h" />
    9.92 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\window.h" />
    9.93 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\include\vorbis\codec.h" />
    9.94 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\include\vorbis\vorbisenc.h" />
    9.95 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\include\vorbis\vorbisfile.h" />
    9.96 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\backends.h" />
    9.97 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\bitrate.h" />
    9.98 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\books\coupled\res_books_stereo.h" />
    9.99 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\books\floor\floor_books.h" />
   9.100 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\books\uncoupled\res_books_uncoupled.h" />
   9.101 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\codebook.h" />
   9.102 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\codec_internal.h" />
   9.103 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\envelope.h" />
   9.104 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\highlevel.h" />
   9.105 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\lookup.h" />
   9.106 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\lookup_data.h" />
   9.107 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\lpc.h" />
   9.108 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\lsp.h" />
   9.109 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\masking.h" />
   9.110 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\mdct.h" />
   9.111 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\misc.h" />
   9.112 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\floor_all.h" />
   9.113 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\psych_11.h" />
   9.114 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\psych_16.h" />
   9.115 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\psych_44.h" />
   9.116 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\psych_8.h" />
   9.117 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\residue_16.h" />
   9.118 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\residue_44.h" />
   9.119 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\residue_44u.h" />
   9.120 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\residue_8.h" />
   9.121 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_11.h" />
   9.122 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_16.h" />
   9.123 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_22.h" />
   9.124 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_32.h" />
   9.125 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_44.h" />
   9.126 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_44u.h" />
   9.127 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_8.h" />
   9.128 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_X.h" />
   9.129 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\os.h" />
   9.130 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\psy.h" />
   9.131 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\registry.h" />
   9.132 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\scales.h" />
   9.133 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\smallft.h" />
   9.134 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\window.h" />
   9.135    </ItemGroup>
   9.136    <ItemGroup>
   9.137 -    <None Include="..\..\external\libvorbis-1.3.3\win32\vorbis.def" />
   9.138 +    <None Include="..\..\external\libvorbis-1.3.5\win32\vorbis.def" />
   9.139    </ItemGroup>
   9.140    <ItemGroup>
   9.141      <ProjectReference Include="libogg_dynamic-UWP.vcxproj">
   9.142 @@ -211,7 +211,7 @@
   9.143      <ClCompile>
   9.144        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   9.145        <CompileAsWinRT>false</CompileAsWinRT>
   9.146 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   9.147 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   9.148        <PreprocessorDefinitions>LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   9.149        <DisableSpecificWarnings>4244;4100;4267;4189;4305;4127;4706</DisableSpecificWarnings>
   9.150      </ClCompile>
   9.151 @@ -219,14 +219,14 @@
   9.152        <SubSystem>Console</SubSystem>
   9.153        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
   9.154        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
   9.155 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbis.def</ModuleDefinitionFile>
   9.156 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbis.def</ModuleDefinitionFile>
   9.157      </Link>
   9.158    </ItemDefinitionGroup>
   9.159    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   9.160      <ClCompile>
   9.161        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   9.162        <CompileAsWinRT>false</CompileAsWinRT>
   9.163 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   9.164 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   9.165        <PreprocessorDefinitions>LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   9.166        <DisableSpecificWarnings>4244;4100;4267;4189;4305;4127;4706</DisableSpecificWarnings>
   9.167      </ClCompile>
   9.168 @@ -234,14 +234,14 @@
   9.169        <SubSystem>Console</SubSystem>
   9.170        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
   9.171        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
   9.172 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbis.def</ModuleDefinitionFile>
   9.173 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbis.def</ModuleDefinitionFile>
   9.174      </Link>
   9.175    </ItemDefinitionGroup>
   9.176    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
   9.177      <ClCompile>
   9.178        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   9.179        <CompileAsWinRT>false</CompileAsWinRT>
   9.180 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   9.181 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   9.182        <PreprocessorDefinitions>LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WIN32_WCE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   9.183        <DisableSpecificWarnings>4244;4100;4267;4189;4305;4127;4706</DisableSpecificWarnings>
   9.184      </ClCompile>
   9.185 @@ -249,14 +249,14 @@
   9.186        <SubSystem>Console</SubSystem>
   9.187        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
   9.188        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
   9.189 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbis.def</ModuleDefinitionFile>
   9.190 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbis.def</ModuleDefinitionFile>
   9.191      </Link>
   9.192    </ItemDefinitionGroup>
   9.193    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
   9.194      <ClCompile>
   9.195        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   9.196        <CompileAsWinRT>false</CompileAsWinRT>
   9.197 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   9.198 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   9.199        <PreprocessorDefinitions>LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WIN32_WCE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   9.200        <DisableSpecificWarnings>4244;4100;4267;4189;4305;4127;4706</DisableSpecificWarnings>
   9.201      </ClCompile>
   9.202 @@ -264,14 +264,14 @@
   9.203        <SubSystem>Console</SubSystem>
   9.204        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
   9.205        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
   9.206 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbis.def</ModuleDefinitionFile>
   9.207 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbis.def</ModuleDefinitionFile>
   9.208      </Link>
   9.209    </ItemDefinitionGroup>
   9.210    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
   9.211      <ClCompile>
   9.212        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   9.213        <CompileAsWinRT>false</CompileAsWinRT>
   9.214 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   9.215 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   9.216        <PreprocessorDefinitions>LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   9.217        <DisableSpecificWarnings>4244;4100;4267;4189;4305;4127;4706</DisableSpecificWarnings>
   9.218      </ClCompile>
   9.219 @@ -279,14 +279,14 @@
   9.220        <SubSystem>Console</SubSystem>
   9.221        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
   9.222        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
   9.223 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbis.def</ModuleDefinitionFile>
   9.224 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbis.def</ModuleDefinitionFile>
   9.225      </Link>
   9.226    </ItemDefinitionGroup>
   9.227    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
   9.228      <ClCompile>
   9.229        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   9.230        <CompileAsWinRT>false</CompileAsWinRT>
   9.231 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   9.232 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   9.233        <PreprocessorDefinitions>LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   9.234        <DisableSpecificWarnings>4244;4100;4267;4189;4305;4127;4706</DisableSpecificWarnings>
   9.235      </ClCompile>
   9.236 @@ -294,10 +294,10 @@
   9.237        <SubSystem>Console</SubSystem>
   9.238        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
   9.239        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
   9.240 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbis.def</ModuleDefinitionFile>
   9.241 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbis.def</ModuleDefinitionFile>
   9.242      </Link>
   9.243    </ItemDefinitionGroup>
   9.244    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   9.245    <ImportGroup Label="ExtensionTargets">
   9.246    </ImportGroup>
   9.247 -</Project>
   9.248 \ No newline at end of file
   9.249 +</Project>
    10.1 --- a/VisualC-WinRT/UWP_VS2015/libvorbisfile_dynamic-UWP.vcxproj	Mon Oct 16 02:16:47 2017 -0700
    10.2 +++ b/VisualC-WinRT/UWP_VS2015/libvorbisfile_dynamic-UWP.vcxproj	Tue Oct 17 02:33:47 2017 -0700
    10.3 @@ -27,10 +27,10 @@
    10.4      </ProjectConfiguration>
    10.5    </ItemGroup>
    10.6    <ItemGroup>
    10.7 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\vorbisfile.c" />
    10.8 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\vorbisfile.c" />
    10.9    </ItemGroup>
   10.10    <ItemGroup>
   10.11 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\include\vorbis\vorbisfile.h" />
   10.12 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\include\vorbis\vorbisfile.h" />
   10.13    </ItemGroup>
   10.14    <ItemGroup>
   10.15      <ProjectReference Include="libogg_dynamic-UWP.vcxproj">
   10.16 @@ -150,7 +150,7 @@
   10.17      <ClCompile>
   10.18        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   10.19        <CompileAsWinRT>false</CompileAsWinRT>
   10.20 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   10.21 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   10.22        <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   10.23        <DisableSpecificWarnings>4244;4101</DisableSpecificWarnings>
   10.24      </ClCompile>
   10.25 @@ -158,14 +158,14 @@
   10.26        <SubSystem>Console</SubSystem>
   10.27        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
   10.28        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
   10.29 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbisfile.def</ModuleDefinitionFile>
   10.30 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbisfile.def</ModuleDefinitionFile>
   10.31      </Link>
   10.32    </ItemDefinitionGroup>
   10.33    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   10.34      <ClCompile>
   10.35        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   10.36        <CompileAsWinRT>false</CompileAsWinRT>
   10.37 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   10.38 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   10.39        <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   10.40        <DisableSpecificWarnings>4244;4101</DisableSpecificWarnings>
   10.41      </ClCompile>
   10.42 @@ -173,14 +173,14 @@
   10.43        <SubSystem>Console</SubSystem>
   10.44        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
   10.45        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
   10.46 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbisfile.def</ModuleDefinitionFile>
   10.47 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbisfile.def</ModuleDefinitionFile>
   10.48      </Link>
   10.49    </ItemDefinitionGroup>
   10.50    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
   10.51      <ClCompile>
   10.52        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   10.53        <CompileAsWinRT>false</CompileAsWinRT>
   10.54 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   10.55 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   10.56        <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WIN32_WCE;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   10.57        <DisableSpecificWarnings>4244;4101</DisableSpecificWarnings>
   10.58      </ClCompile>
   10.59 @@ -188,14 +188,14 @@
   10.60        <SubSystem>Console</SubSystem>
   10.61        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
   10.62        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
   10.63 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbisfile.def</ModuleDefinitionFile>
   10.64 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbisfile.def</ModuleDefinitionFile>
   10.65      </Link>
   10.66    </ItemDefinitionGroup>
   10.67    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
   10.68      <ClCompile>
   10.69        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   10.70        <CompileAsWinRT>false</CompileAsWinRT>
   10.71 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   10.72 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   10.73        <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WIN32_WCE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   10.74        <DisableSpecificWarnings>4244;4101</DisableSpecificWarnings>
   10.75      </ClCompile>
   10.76 @@ -203,14 +203,14 @@
   10.77        <SubSystem>Console</SubSystem>
   10.78        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
   10.79        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
   10.80 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbisfile.def</ModuleDefinitionFile>
   10.81 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbisfile.def</ModuleDefinitionFile>
   10.82      </Link>
   10.83    </ItemDefinitionGroup>
   10.84    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
   10.85      <ClCompile>
   10.86        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   10.87        <CompileAsWinRT>false</CompileAsWinRT>
   10.88 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   10.89 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   10.90        <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   10.91        <DisableSpecificWarnings>4244;4101</DisableSpecificWarnings>
   10.92      </ClCompile>
   10.93 @@ -218,14 +218,14 @@
   10.94        <SubSystem>Console</SubSystem>
   10.95        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
   10.96        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
   10.97 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbisfile.def</ModuleDefinitionFile>
   10.98 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbisfile.def</ModuleDefinitionFile>
   10.99      </Link>
  10.100    </ItemDefinitionGroup>
  10.101    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
  10.102      <ClCompile>
  10.103        <PrecompiledHeader>NotUsing</PrecompiledHeader>
  10.104        <CompileAsWinRT>false</CompileAsWinRT>
  10.105 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  10.106 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  10.107        <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  10.108        <DisableSpecificWarnings>4244;4101</DisableSpecificWarnings>
  10.109      </ClCompile>
  10.110 @@ -233,10 +233,10 @@
  10.111        <SubSystem>Console</SubSystem>
  10.112        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
  10.113        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
  10.114 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbisfile.def</ModuleDefinitionFile>
  10.115 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbisfile.def</ModuleDefinitionFile>
  10.116      </Link>
  10.117    </ItemDefinitionGroup>
  10.118    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  10.119    <ImportGroup Label="ExtensionTargets">
  10.120    </ImportGroup>
  10.121 -</Project>
  10.122 \ No newline at end of file
  10.123 +</Project>
    11.1 --- a/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj	Mon Oct 16 02:16:47 2017 -0700
    11.2 +++ b/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj	Tue Oct 17 02:33:47 2017 -0700
    11.3 @@ -78,7 +78,7 @@
    11.4    </PropertyGroup>
    11.5    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    11.6      <ClCompile>
    11.7 -      <PreprocessorDefinitions>_USRDLL;WAV_MUSIC;OGG_MUSIC;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    11.8 +      <PreprocessorDefinitions>_USRDLL;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    11.9        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   11.10        <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
   11.11        <CompileAsWinRT>false</CompileAsWinRT>
   11.12 @@ -94,7 +94,7 @@
   11.13    </ItemDefinitionGroup>
   11.14    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   11.15      <ClCompile>
   11.16 -      <PreprocessorDefinitions>_USRDLL;WAV_MUSIC;OGG_MUSIC;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   11.17 +      <PreprocessorDefinitions>_USRDLL;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   11.18        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   11.19        <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
   11.20        <CompileAsWinRT>false</CompileAsWinRT>
   11.21 @@ -110,7 +110,7 @@
   11.22    </ItemDefinitionGroup>
   11.23    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
   11.24      <ClCompile>
   11.25 -      <PreprocessorDefinitions>_USRDLL;WAV_MUSIC;OGG_MUSIC;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   11.26 +      <PreprocessorDefinitions>_USRDLL;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   11.27        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   11.28        <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
   11.29        <CompileAsWinRT>false</CompileAsWinRT>
   11.30 @@ -126,7 +126,7 @@
   11.31    </ItemDefinitionGroup>
   11.32    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
   11.33      <ClCompile>
   11.34 -      <PreprocessorDefinitions>_USRDLL;WAV_MUSIC;OGG_MUSIC;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   11.35 +      <PreprocessorDefinitions>_USRDLL;MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   11.36        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   11.37        <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
   11.38        <CompileAsWinRT>false</CompileAsWinRT>
   11.39 @@ -152,12 +152,12 @@
   11.40    <ItemGroup>
   11.41      <ClCompile Include="..\..\dynamic_flac.c" />
   11.42      <ClCompile Include="..\..\dynamic_fluidsynth.c" />
   11.43 -    <ClCompile Include="..\..\dynamic_mod.c" />
   11.44 -    <ClCompile Include="..\..\dynamic_mp3.c" />
   11.45 +    <ClCompile Include="..\..\dynamic_mikmod.c" />
   11.46      <ClCompile Include="..\..\dynamic_ogg.c" />
   11.47 -    <ClCompile Include="..\..\effects_internal.c" />
   11.48 +    <ClCompile Include="..\..\dynamic_smpeg.c" />
   11.49      <ClCompile Include="..\..\effect_position.c" />
   11.50      <ClCompile Include="..\..\effect_stereoreverse.c" />
   11.51 +    <ClCompile Include="..\..\effects_internal.c" />
   11.52      <ClCompile Include="..\..\fluidsynth.c" />
   11.53      <ClCompile Include="..\..\load_aiff.c" />
   11.54      <ClCompile Include="..\..\load_flac.c" />
   11.55 @@ -168,16 +168,16 @@
   11.56      <ClCompile Include="..\..\music_cmd.c" />
   11.57      <ClCompile Include="..\..\music_flac.c" />
   11.58      <ClCompile Include="..\..\music_mad.c" />
   11.59 -    <ClCompile Include="..\..\music_mod.c" />
   11.60 +    <ClCompile Include="..\..\music_mikmod.c" />
   11.61      <ClCompile Include="..\..\music_ogg.c" />
   11.62      <ClCompile Include="..\..\wavestream.c" />
   11.63    </ItemGroup>
   11.64    <ItemGroup>
   11.65      <ClInclude Include="..\..\dynamic_flac.h" />
   11.66      <ClInclude Include="..\..\dynamic_fluidsynth.h" />
   11.67 -    <ClInclude Include="..\..\dynamic_mod.h" />
   11.68 -    <ClInclude Include="..\..\dynamic_mp3.h" />
   11.69 +    <ClInclude Include="..\..\dynamic_mikmod.h" />
   11.70      <ClInclude Include="..\..\dynamic_ogg.h" />
   11.71 +    <ClInclude Include="..\..\dynamic_smpeg.h" />
   11.72      <ClInclude Include="..\..\effects_internal.h" />
   11.73      <ClInclude Include="..\..\fluidsynth.h" />
   11.74      <ClInclude Include="..\..\load_aiff.h" />
   11.75 @@ -187,7 +187,7 @@
   11.76      <ClInclude Include="..\..\music_cmd.h" />
   11.77      <ClInclude Include="..\..\music_flac.h" />
   11.78      <ClInclude Include="..\..\music_mad.h" />
   11.79 -    <ClInclude Include="..\..\music_mod.h" />
   11.80 +    <ClInclude Include="..\..\music_mikmod.h" />
   11.81      <ClInclude Include="..\..\music_ogg.h" />
   11.82      <ClInclude Include="..\..\SDL_mixer.h" />
   11.83      <ClInclude Include="..\..\wavestream.h" />
   11.84 @@ -210,4 +210,4 @@
   11.85    <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" />
   11.86    <ImportGroup Label="ExtensionTargets">
   11.87    </ImportGroup>
   11.88 -</Project>
   11.89 \ No newline at end of file
   11.90 +</Project>
    12.1 --- a/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj.filters	Mon Oct 16 02:16:47 2017 -0700
    12.2 +++ b/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj.filters	Tue Oct 17 02:33:47 2017 -0700
    12.3 @@ -3,9 +3,9 @@
    12.4    <ItemGroup>
    12.5      <ClCompile Include="..\..\dynamic_flac.c" />
    12.6      <ClCompile Include="..\..\dynamic_fluidsynth.c" />
    12.7 -    <ClCompile Include="..\..\dynamic_mod.c" />
    12.8 -    <ClCompile Include="..\..\dynamic_mp3.c" />
    12.9 +    <ClCompile Include="..\..\dynamic_mikmod.c" />
   12.10      <ClCompile Include="..\..\dynamic_ogg.c" />
   12.11 +    <ClCompile Include="..\..\dynamic_smpeg.c" />
   12.12      <ClCompile Include="..\..\effect_position.c" />
   12.13      <ClCompile Include="..\..\effect_stereoreverse.c" />
   12.14      <ClCompile Include="..\..\effects_internal.c" />
   12.15 @@ -19,16 +19,16 @@
   12.16      <ClCompile Include="..\..\music_cmd.c" />
   12.17      <ClCompile Include="..\..\music_flac.c" />
   12.18      <ClCompile Include="..\..\music_mad.c" />
   12.19 -    <ClCompile Include="..\..\music_mod.c" />
   12.20 +    <ClCompile Include="..\..\music_mikmod.c" />
   12.21      <ClCompile Include="..\..\music_ogg.c" />
   12.22      <ClCompile Include="..\..\wavestream.c" />
   12.23    </ItemGroup>
   12.24    <ItemGroup>
   12.25      <ClInclude Include="..\..\dynamic_flac.h" />
   12.26      <ClInclude Include="..\..\dynamic_fluidsynth.h" />
   12.27 -    <ClInclude Include="..\..\dynamic_mod.h" />
   12.28 -    <ClInclude Include="..\..\dynamic_mp3.h" />
   12.29 +    <ClInclude Include="..\..\dynamic_mikmod.h" />
   12.30      <ClInclude Include="..\..\dynamic_ogg.h" />
   12.31 +    <ClInclude Include="..\..\dynamic_smpeg.h" />
   12.32      <ClInclude Include="..\..\effects_internal.h" />
   12.33      <ClInclude Include="..\..\fluidsynth.h" />
   12.34      <ClInclude Include="..\..\load_aiff.h" />
   12.35 @@ -38,9 +38,9 @@
   12.36      <ClInclude Include="..\..\music_cmd.h" />
   12.37      <ClInclude Include="..\..\music_flac.h" />
   12.38      <ClInclude Include="..\..\music_mad.h" />
   12.39 -    <ClInclude Include="..\..\music_mod.h" />
   12.40 +    <ClInclude Include="..\..\music_mikmod.h" />
   12.41      <ClInclude Include="..\..\music_ogg.h" />
   12.42      <ClInclude Include="..\..\SDL_mixer.h" />
   12.43      <ClInclude Include="..\..\wavestream.h" />
   12.44    </ItemGroup>
   12.45 -</Project>
   12.46 \ No newline at end of file
   12.47 +</Project>
    13.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.2 +++ b/VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.sln	Tue Oct 17 02:33:47 2017 -0700
    13.3 @@ -0,0 +1,58 @@
    13.4 +
    13.5 +Microsoft Visual Studio Solution File, Format Version 12.00
    13.6 +# Visual Studio 2013
    13.7 +VisualStudioVersion = 12.0.40629.0
    13.8 +MinimumVisualStudioVersion = 10.0.40219.1
    13.9 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2_mixer-WinPhone81", "SDL_mixer-WinPhone81.vcxproj", "{FB75C3D3-D261-4575-9D17-9E88E09568BA}"
   13.10 +EndProject
   13.11 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg_dynamic-WinPhone81", "libogg_dynamic-WinPhone81.vcxproj", "{0CCC2E56-E3A4-4CD7-92BA-0C6F99440753}"
   13.12 +EndProject
   13.13 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbis_dynamic-WinPhone81", "libvorbis_dynamic-WinPhone81.vcxproj", "{C943DBC9-4EB0-4684-BE3E-334342A7EE2C}"
   13.14 +EndProject
   13.15 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbisfile_dynamic-WinPhone81", "libvorbisfile_dynamic-WinPhone81.vcxproj", "{203EFCC5-CE11-4A75-92F4-C3DBF7609376}"
   13.16 +EndProject
   13.17 +Global
   13.18 +	GlobalSection(SolutionConfigurationPlatforms) = preSolution
   13.19 +		Debug|ARM = Debug|ARM
   13.20 +		Debug|Win32 = Debug|Win32
   13.21 +		Release|ARM = Release|ARM
   13.22 +		Release|Win32 = Release|Win32
   13.23 +	EndGlobalSection
   13.24 +	GlobalSection(ProjectConfigurationPlatforms) = postSolution
   13.25 +		{FB75C3D3-D261-4575-9D17-9E88E09568BA}.Debug|ARM.ActiveCfg = Debug|ARM
   13.26 +		{FB75C3D3-D261-4575-9D17-9E88E09568BA}.Debug|ARM.Build.0 = Debug|ARM
   13.27 +		{FB75C3D3-D261-4575-9D17-9E88E09568BA}.Debug|Win32.ActiveCfg = Debug|Win32
   13.28 +		{FB75C3D3-D261-4575-9D17-9E88E09568BA}.Debug|Win32.Build.0 = Debug|Win32
   13.29 +		{FB75C3D3-D261-4575-9D17-9E88E09568BA}.Release|ARM.ActiveCfg = Release|ARM
   13.30 +		{FB75C3D3-D261-4575-9D17-9E88E09568BA}.Release|ARM.Build.0 = Release|ARM
   13.31 +		{FB75C3D3-D261-4575-9D17-9E88E09568BA}.Release|Win32.ActiveCfg = Release|Win32
   13.32 +		{FB75C3D3-D261-4575-9D17-9E88E09568BA}.Release|Win32.Build.0 = Release|Win32
   13.33 +		{0CCC2E56-E3A4-4CD7-92BA-0C6F99440753}.Debug|ARM.ActiveCfg = Debug|ARM
   13.34 +		{0CCC2E56-E3A4-4CD7-92BA-0C6F99440753}.Debug|ARM.Build.0 = Debug|ARM
   13.35 +		{0CCC2E56-E3A4-4CD7-92BA-0C6F99440753}.Debug|Win32.ActiveCfg = Debug|Win32
   13.36 +		{0CCC2E56-E3A4-4CD7-92BA-0C6F99440753}.Debug|Win32.Build.0 = Debug|Win32
   13.37 +		{0CCC2E56-E3A4-4CD7-92BA-0C6F99440753}.Release|ARM.ActiveCfg = Release|ARM
   13.38 +		{0CCC2E56-E3A4-4CD7-92BA-0C6F99440753}.Release|ARM.Build.0 = Release|ARM
   13.39 +		{0CCC2E56-E3A4-4CD7-92BA-0C6F99440753}.Release|Win32.ActiveCfg = Release|Win32
   13.40 +		{0CCC2E56-E3A4-4CD7-92BA-0C6F99440753}.Release|Win32.Build.0 = Release|Win32
   13.41 +		{C943DBC9-4EB0-4684-BE3E-334342A7EE2C}.Debug|ARM.ActiveCfg = Debug|ARM
   13.42 +		{C943DBC9-4EB0-4684-BE3E-334342A7EE2C}.Debug|ARM.Build.0 = Debug|ARM
   13.43 +		{C943DBC9-4EB0-4684-BE3E-334342A7EE2C}.Debug|Win32.ActiveCfg = Debug|Win32
   13.44 +		{C943DBC9-4EB0-4684-BE3E-334342A7EE2C}.Debug|Win32.Build.0 = Debug|Win32
   13.45 +		{C943DBC9-4EB0-4684-BE3E-334342A7EE2C}.Release|ARM.ActiveCfg = Release|ARM
   13.46 +		{C943DBC9-4EB0-4684-BE3E-334342A7EE2C}.Release|ARM.Build.0 = Release|ARM
   13.47 +		{C943DBC9-4EB0-4684-BE3E-334342A7EE2C}.Release|Win32.ActiveCfg = Release|Win32
   13.48 +		{C943DBC9-4EB0-4684-BE3E-334342A7EE2C}.Release|Win32.Build.0 = Release|Win32
   13.49 +		{203EFCC5-CE11-4A75-92F4-C3DBF7609376}.Debug|ARM.ActiveCfg = Debug|ARM
   13.50 +		{203EFCC5-CE11-4A75-92F4-C3DBF7609376}.Debug|ARM.Build.0 = Debug|ARM
   13.51 +		{203EFCC5-CE11-4A75-92F4-C3DBF7609376}.Debug|Win32.ActiveCfg = Debug|Win32
   13.52 +		{203EFCC5-CE11-4A75-92F4-C3DBF7609376}.Debug|Win32.Build.0 = Debug|Win32
   13.53 +		{203EFCC5-CE11-4A75-92F4-C3DBF7609376}.Release|ARM.ActiveCfg = Release|ARM
   13.54 +		{203EFCC5-CE11-4A75-92F4-C3DBF7609376}.Release|ARM.Build.0 = Release|ARM
   13.55 +		{203EFCC5-CE11-4A75-92F4-C3DBF7609376}.Release|Win32.ActiveCfg = Release|Win32
   13.56 +		{203EFCC5-CE11-4A75-92F4-C3DBF7609376}.Release|Win32.Build.0 = Release|Win32
   13.57 +	EndGlobalSection
   13.58 +	GlobalSection(SolutionProperties) = preSolution
   13.59 +		HideSolutionNode = FALSE
   13.60 +	EndGlobalSection
   13.61 +EndGlobal
    14.1 --- a/VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj	Mon Oct 16 02:16:47 2017 -0700
    14.2 +++ b/VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj	Tue Oct 17 02:33:47 2017 -0700
    14.3 @@ -19,49 +19,6 @@
    14.4      </ProjectConfiguration>
    14.5    </ItemGroup>
    14.6    <ItemGroup>
    14.7 -    <ClCompile Include="..\..\dynamic_flac.c" />
    14.8 -    <ClCompile Include="..\..\dynamic_fluidsynth.c" />
    14.9 -    <ClCompile Include="..\..\dynamic_mod.c" />
   14.10 -    <ClCompile Include="..\..\dynamic_mp3.c" />
   14.11 -    <ClCompile Include="..\..\dynamic_ogg.c" />
   14.12 -    <ClCompile Include="..\..\effects_internal.c" />
   14.13 -    <ClCompile Include="..\..\effect_position.c" />
   14.14 -    <ClCompile Include="..\..\effect_stereoreverse.c" />
   14.15 -    <ClCompile Include="..\..\fluidsynth.c" />
   14.16 -    <ClCompile Include="..\..\load_aiff.c" />
   14.17 -    <ClCompile Include="..\..\load_flac.c" />
   14.18 -    <ClCompile Include="..\..\load_ogg.c" />
   14.19 -    <ClCompile Include="..\..\load_voc.c" />
   14.20 -    <ClCompile Include="..\..\mixer.c" />
   14.21 -    <ClCompile Include="..\..\music.c" />
   14.22 -    <ClCompile Include="..\..\music_cmd.c" />
   14.23 -    <ClCompile Include="..\..\music_flac.c" />
   14.24 -    <ClCompile Include="..\..\music_mad.c" />
   14.25 -    <ClCompile Include="..\..\music_mod.c" />
   14.26 -    <ClCompile Include="..\..\music_ogg.c" />
   14.27 -    <ClCompile Include="..\..\wavestream.c" />
   14.28 -  </ItemGroup>
   14.29 -  <ItemGroup>
   14.30 -    <ClInclude Include="..\..\dynamic_flac.h" />
   14.31 -    <ClInclude Include="..\..\dynamic_fluidsynth.h" />
   14.32 -    <ClInclude Include="..\..\dynamic_mod.h" />
   14.33 -    <ClInclude Include="..\..\dynamic_mp3.h" />
   14.34 -    <ClInclude Include="..\..\dynamic_ogg.h" />
   14.35 -    <ClInclude Include="..\..\effects_internal.h" />
   14.36 -    <ClInclude Include="..\..\fluidsynth.h" />
   14.37 -    <ClInclude Include="..\..\load_aiff.h" />
   14.38 -    <ClInclude Include="..\..\load_flac.h" />
   14.39 -    <ClInclude Include="..\..\load_ogg.h" />
   14.40 -    <ClInclude Include="..\..\load_voc.h" />
   14.41 -    <ClInclude Include="..\..\music_cmd.h" />
   14.42 -    <ClInclude Include="..\..\music_flac.h" />
   14.43 -    <ClInclude Include="..\..\music_mad.h" />
   14.44 -    <ClInclude Include="..\..\music_mod.h" />
   14.45 -    <ClInclude Include="..\..\music_ogg.h" />
   14.46 -    <ClInclude Include="..\..\SDL_mixer.h" />
   14.47 -    <ClInclude Include="..\..\wavestream.h" />
   14.48 -  </ItemGroup>
   14.49 -  <ItemGroup>
   14.50      <ProjectReference Include="..\..\..\SDL\VisualC-WinRT\WinPhone81_VS2013\SDL-WinPhone81.vcxproj">
   14.51        <Project>{48fadc0e-964d-4dab-bced-372e0ad19577}</Project>
   14.52      </ProjectReference>
   14.53 @@ -75,6 +32,47 @@
   14.54        <Project>{c943dbc9-4eb0-4684-be3e-334342a7ee2c}</Project>
   14.55      </ProjectReference>
   14.56    </ItemGroup>
   14.57 +  <ItemGroup>
   14.58 +    <ClCompile Include="..\..\effects_internal.c" />
   14.59 +    <ClCompile Include="..\..\effect_position.c" />
   14.60 +    <ClCompile Include="..\..\effect_stereoreverse.c" />
   14.61 +    <ClCompile Include="..\..\load_aiff.c" />
   14.62 +    <ClCompile Include="..\..\load_voc.c" />
   14.63 +    <ClCompile Include="..\..\mixer.c" />
   14.64 +    <ClCompile Include="..\..\music.c" />
   14.65 +    <ClCompile Include="..\..\music_cmd.c" />
   14.66 +    <ClCompile Include="..\..\music_flac.c" />
   14.67 +    <ClCompile Include="..\..\music_fluidsynth.c" />
   14.68 +    <ClCompile Include="..\..\music_mad.c" />
   14.69 +    <ClCompile Include="..\..\music_mikmod.c" />
   14.70 +    <ClCompile Include="..\..\music_modplug.c" />
   14.71 +    <ClCompile Include="..\..\music_mpg123.c" />
   14.72 +    <ClCompile Include="..\..\music_nativemidi.c" />
   14.73 +    <ClCompile Include="..\..\music_ogg.c" />
   14.74 +    <ClCompile Include="..\..\music_smpeg.c" />
   14.75 +    <ClCompile Include="..\..\music_timidity.c" />
   14.76 +    <ClCompile Include="..\..\music_wav.c" />
   14.77 +  </ItemGroup>
   14.78 +  <ItemGroup>
   14.79 +    <ClInclude Include="..\..\effects_internal.h" />
   14.80 +    <ClInclude Include="..\..\load_aiff.h" />
   14.81 +    <ClInclude Include="..\..\load_voc.h" />
   14.82 +    <ClInclude Include="..\..\mixer.h" />
   14.83 +    <ClInclude Include="..\..\music.h" />
   14.84 +    <ClInclude Include="..\..\music_cmd.h" />
   14.85 +    <ClInclude Include="..\..\music_flac.h" />
   14.86 +    <ClInclude Include="..\..\music_fluidsynth.h" />
   14.87 +    <ClInclude Include="..\..\music_mad.h" />
   14.88 +    <ClInclude Include="..\..\music_mikmod.h" />
   14.89 +    <ClInclude Include="..\..\music_modplug.h" />
   14.90 +    <ClInclude Include="..\..\music_mpg123.h" />
   14.91 +    <ClInclude Include="..\..\music_nativemidi.h" />
   14.92 +    <ClInclude Include="..\..\music_ogg.h" />
   14.93 +    <ClInclude Include="..\..\music_smpeg.h" />
   14.94 +    <ClInclude Include="..\..\music_timidity.h" />
   14.95 +    <ClInclude Include="..\..\music_wav.h" />
   14.96 +    <ClInclude Include="..\..\SDL_mixer.h" />
   14.97 +  </ItemGroup>
   14.98    <PropertyGroup Label="Globals">
   14.99      <ProjectGuid>{fb75c3d3-d261-4575-9d17-9e88e09568ba}</ProjectGuid>
  14.100      <Keyword>Win32Proj</Keyword>
  14.101 @@ -150,7 +148,7 @@
  14.102        <CompileAsWinRT>false</CompileAsWinRT>
  14.103        <SDLCheck>true</SDLCheck>
  14.104        <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  14.105 -      <PreprocessorDefinitions>WAV_MUSIC;OGG_MUSIC;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  14.106 +      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  14.107      </ClCompile>
  14.108      <Link>
  14.109        <SubSystem>Console</SubSystem>
  14.110 @@ -164,7 +162,7 @@
  14.111        <CompileAsWinRT>false</CompileAsWinRT>
  14.112        <SDLCheck>true</SDLCheck>
  14.113        <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  14.114 -      <PreprocessorDefinitions>WAV_MUSIC;OGG_MUSIC;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  14.115 +      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  14.116      </ClCompile>
  14.117      <Link>
  14.118        <SubSystem>Console</SubSystem>
  14.119 @@ -178,7 +176,7 @@
  14.120        <CompileAsWinRT>false</CompileAsWinRT>
  14.121        <SDLCheck>true</SDLCheck>
  14.122        <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  14.123 -      <PreprocessorDefinitions>WAV_MUSIC;OGG_MUSIC;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  14.124 +      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  14.125      </ClCompile>
  14.126      <Link>
  14.127        <SubSystem>Console</SubSystem>
  14.128 @@ -192,7 +190,7 @@
  14.129        <CompileAsWinRT>false</CompileAsWinRT>
  14.130        <SDLCheck>true</SDLCheck>
  14.131        <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  14.132 -      <PreprocessorDefinitions>WAV_MUSIC;OGG_MUSIC;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  14.133 +      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  14.134      </ClCompile>
  14.135      <Link>
  14.136        <SubSystem>Console</SubSystem>
    15.1 --- a/VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj.filters	Mon Oct 16 02:16:47 2017 -0700
    15.2 +++ b/VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj.filters	Tue Oct 17 02:33:47 2017 -0700
    15.3 @@ -1,46 +1,44 @@
    15.4  <?xml version="1.0" encoding="utf-8"?>
    15.5  <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    15.6    <ItemGroup>
    15.7 -    <ClCompile Include="..\..\dynamic_flac.c" />
    15.8 -    <ClCompile Include="..\..\dynamic_fluidsynth.c" />
    15.9 -    <ClCompile Include="..\..\dynamic_mod.c" />
   15.10 -    <ClCompile Include="..\..\dynamic_mp3.c" />
   15.11 -    <ClCompile Include="..\..\dynamic_ogg.c" />
   15.12      <ClCompile Include="..\..\effect_position.c" />
   15.13      <ClCompile Include="..\..\effect_stereoreverse.c" />
   15.14      <ClCompile Include="..\..\effects_internal.c" />
   15.15 -    <ClCompile Include="..\..\fluidsynth.c" />
   15.16      <ClCompile Include="..\..\load_aiff.c" />
   15.17 -    <ClCompile Include="..\..\load_flac.c" />
   15.18 -    <ClCompile Include="..\..\load_ogg.c" />
   15.19      <ClCompile Include="..\..\load_voc.c" />
   15.20      <ClCompile Include="..\..\mixer.c" />
   15.21      <ClCompile Include="..\..\music.c" />
   15.22      <ClCompile Include="..\..\music_cmd.c" />
   15.23      <ClCompile Include="..\..\music_flac.c" />
   15.24 +    <ClCompile Include="..\..\music_fluidsynth.c" />
   15.25      <ClCompile Include="..\..\music_mad.c" />
   15.26 -    <ClCompile Include="..\..\music_mod.c" />
   15.27 +    <ClCompile Include="..\..\music_mikmod.c" />
   15.28 +    <ClCompile Include="..\..\music_modplug.c" />
   15.29 +    <ClCompile Include="..\..\music_mpg123.c" />
   15.30 +    <ClCompile Include="..\..\music_nativemidi.c" />
   15.31      <ClCompile Include="..\..\music_ogg.c" />
   15.32 -    <ClCompile Include="..\..\wavestream.c" />
   15.33 +    <ClCompile Include="..\..\music_smpeg.c" />
   15.34 +    <ClCompile Include="..\..\music_timidity.c" />
   15.35 +    <ClCompile Include="..\..\music_wav.c" />
   15.36    </ItemGroup>
   15.37    <ItemGroup>
   15.38 -    <ClInclude Include="..\..\dynamic_flac.h" />
   15.39 -    <ClInclude Include="..\..\dynamic_fluidsynth.h" />
   15.40 -    <ClInclude Include="..\..\dynamic_mod.h" />
   15.41 -    <ClInclude Include="..\..\dynamic_mp3.h" />
   15.42 -    <ClInclude Include="..\..\dynamic_ogg.h" />
   15.43      <ClInclude Include="..\..\effects_internal.h" />
   15.44 -    <ClInclude Include="..\..\fluidsynth.h" />
   15.45      <ClInclude Include="..\..\load_aiff.h" />
   15.46 -    <ClInclude Include="..\..\load_flac.h" />
   15.47 -    <ClInclude Include="..\..\load_ogg.h" />
   15.48      <ClInclude Include="..\..\load_voc.h" />
   15.49 +    <ClInclude Include="..\..\mixer.h" />
   15.50 +    <ClInclude Include="..\..\music.h" />
   15.51      <ClInclude Include="..\..\music_cmd.h" />
   15.52      <ClInclude Include="..\..\music_flac.h" />
   15.53 +    <ClInclude Include="..\..\music_fluidsynth.h" />
   15.54      <ClInclude Include="..\..\music_mad.h" />
   15.55 -    <ClInclude Include="..\..\music_mod.h" />
   15.56 +    <ClInclude Include="..\..\music_mikmod.h" />
   15.57 +    <ClInclude Include="..\..\music_modplug.h" />
   15.58 +    <ClInclude Include="..\..\music_mpg123.h" />
   15.59 +    <ClInclude Include="..\..\music_nativemidi.h" />
   15.60      <ClInclude Include="..\..\music_ogg.h" />
   15.61 +    <ClInclude Include="..\..\music_smpeg.h" />
   15.62 +    <ClInclude Include="..\..\music_timidity.h" />
   15.63 +    <ClInclude Include="..\..\music_wav.h" />
   15.64      <ClInclude Include="..\..\SDL_mixer.h" />
   15.65 -    <ClInclude Include="..\..\wavestream.h" />
   15.66    </ItemGroup>
   15.67  </Project>
   15.68 \ No newline at end of file
    16.1 --- a/VisualC-WinRT/WinPhone81_VS2013/libogg_dynamic-WinPhone81.vcxproj	Mon Oct 16 02:16:47 2017 -0700
    16.2 +++ b/VisualC-WinRT/WinPhone81_VS2013/libogg_dynamic-WinPhone81.vcxproj	Tue Oct 17 02:33:47 2017 -0700
    16.3 @@ -19,15 +19,15 @@
    16.4      </ProjectConfiguration>
    16.5    </ItemGroup>
    16.6    <ItemGroup>
    16.7 -    <ClCompile Include="..\..\external\libogg-1.3.1\src\bitwise.c" />
    16.8 -    <ClCompile Include="..\..\external\libogg-1.3.1\src\framing.c" />
    16.9 +    <ClCompile Include="..\..\external\libogg-1.3.2\src\bitwise.c" />
   16.10 +    <ClCompile Include="..\..\external\libogg-1.3.2\src\framing.c" />
   16.11    </ItemGroup>
   16.12    <ItemGroup>
   16.13 -    <None Include="..\..\external\libogg-1.3.1\win32\ogg.def" />
   16.14 +    <None Include="..\..\external\libogg-1.3.2\win32\ogg.def" />
   16.15    </ItemGroup>
   16.16    <ItemGroup>
   16.17 -    <ClInclude Include="..\..\external\libogg-1.3.1\include\ogg\ogg.h" />
   16.18 -    <ClInclude Include="..\..\external\libogg-1.3.1\include\ogg\os_types.h" />
   16.19 +    <ClInclude Include="..\..\external\libogg-1.3.2\include\ogg\ogg.h" />
   16.20 +    <ClInclude Include="..\..\external\libogg-1.3.2\include\ogg\os_types.h" />
   16.21    </ItemGroup>
   16.22    <PropertyGroup Label="Globals">
   16.23      <ProjectGuid>{0ccc2e56-e3a4-4cd7-92ba-0c6f99440753}</ProjectGuid>
   16.24 @@ -103,7 +103,7 @@
   16.25        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   16.26        <CompileAsWinRT>false</CompileAsWinRT>
   16.27        <SDLCheck>true</SDLCheck>
   16.28 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   16.29 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   16.30        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   16.31        <DisableSpecificWarnings>4244</DisableSpecificWarnings>
   16.32      </ClCompile>
   16.33 @@ -111,7 +111,7 @@
   16.34        <SubSystem>Console</SubSystem>
   16.35        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
   16.36        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
   16.37 -      <ModuleDefinitionFile>..\..\external\libogg-1.3.1\win32\ogg.def</ModuleDefinitionFile>
   16.38 +      <ModuleDefinitionFile>..\..\external\libogg-1.3.2\win32\ogg.def</ModuleDefinitionFile>
   16.39      </Link>
   16.40    </ItemDefinitionGroup>
   16.41    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   16.42 @@ -119,7 +119,7 @@
   16.43        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   16.44        <CompileAsWinRT>false</CompileAsWinRT>
   16.45        <SDLCheck>true</SDLCheck>
   16.46 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   16.47 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   16.48        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   16.49        <DisableSpecificWarnings>4244</DisableSpecificWarnings>
   16.50      </ClCompile>
   16.51 @@ -127,7 +127,7 @@
   16.52        <SubSystem>Console</SubSystem>
   16.53        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
   16.54        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
   16.55 -      <ModuleDefinitionFile>..\..\external\libogg-1.3.1\win32\ogg.def</ModuleDefinitionFile>
   16.56 +      <ModuleDefinitionFile>..\..\external\libogg-1.3.2\win32\ogg.def</ModuleDefinitionFile>
   16.57      </Link>
   16.58    </ItemDefinitionGroup>
   16.59    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
   16.60 @@ -135,7 +135,7 @@
   16.61        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   16.62        <CompileAsWinRT>false</CompileAsWinRT>
   16.63        <SDLCheck>true</SDLCheck>
   16.64 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   16.65 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   16.66        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   16.67        <DisableSpecificWarnings>4244</DisableSpecificWarnings>
   16.68      </ClCompile>
   16.69 @@ -143,7 +143,7 @@
   16.70        <SubSystem>Console</SubSystem>
   16.71        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
   16.72        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
   16.73 -      <ModuleDefinitionFile>..\..\external\libogg-1.3.1\win32\ogg.def</ModuleDefinitionFile>
   16.74 +      <ModuleDefinitionFile>..\..\external\libogg-1.3.2\win32\ogg.def</ModuleDefinitionFile>
   16.75      </Link>
   16.76    </ItemDefinitionGroup>
   16.77    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
   16.78 @@ -151,7 +151,7 @@
   16.79        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   16.80        <CompileAsWinRT>false</CompileAsWinRT>
   16.81        <SDLCheck>true</SDLCheck>
   16.82 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   16.83 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   16.84        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   16.85        <DisableSpecificWarnings>4244</DisableSpecificWarnings>
   16.86      </ClCompile>
   16.87 @@ -159,10 +159,10 @@
   16.88        <SubSystem>Console</SubSystem>
   16.89        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
   16.90        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
   16.91 -      <ModuleDefinitionFile>..\..\external\libogg-1.3.1\win32\ogg.def</ModuleDefinitionFile>
   16.92 +      <ModuleDefinitionFile>..\..\external\libogg-1.3.2\win32\ogg.def</ModuleDefinitionFile>
   16.93      </Link>
   16.94    </ItemDefinitionGroup>
   16.95    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   16.96    <ImportGroup Label="ExtensionTargets">
   16.97    </ImportGroup>
   16.98 -</Project>
   16.99 \ No newline at end of file
  16.100 +</Project>
    17.1 --- a/VisualC-WinRT/WinPhone81_VS2013/libvorbis_dynamic-WinPhone81.vcxproj	Mon Oct 16 02:16:47 2017 -0700
    17.2 +++ b/VisualC-WinRT/WinPhone81_VS2013/libvorbis_dynamic-WinPhone81.vcxproj	Tue Oct 17 02:33:47 2017 -0700
    17.3 @@ -19,74 +19,74 @@
    17.4      </ProjectConfiguration>
    17.5    </ItemGroup>
    17.6    <ItemGroup>
    17.7 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\analysis.c" />
    17.8 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\bitrate.c" />
    17.9 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\block.c" />
   17.10 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\codebook.c" />
   17.11 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\envelope.c" />
   17.12 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\floor0.c" />
   17.13 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\floor1.c" />
   17.14 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\info.c" />
   17.15 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\lookup.c" />
   17.16 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\lpc.c" />
   17.17 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\lsp.c" />
   17.18 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\mapping0.c" />
   17.19 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\mdct.c" />
   17.20 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\psy.c" />
   17.21 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\registry.c" />
   17.22 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\res0.c" />
   17.23 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\sharedbook.c" />
   17.24 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\smallft.c" />
   17.25 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\synthesis.c" />
   17.26 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\vorbisenc.c" />
   17.27 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\window.c" />
   17.28 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\analysis.c" />
   17.29 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\bitrate.c" />
   17.30 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\block.c" />
   17.31 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\codebook.c" />
   17.32 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\envelope.c" />
   17.33 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\floor0.c" />
   17.34 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\floor1.c" />
   17.35 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\info.c" />
   17.36 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\lookup.c" />
   17.37 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\lpc.c" />
   17.38 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\lsp.c" />
   17.39 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\mapping0.c" />
   17.40 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\mdct.c" />
   17.41 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\psy.c" />
   17.42 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\registry.c" />
   17.43 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\res0.c" />
   17.44 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\sharedbook.c" />
   17.45 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\smallft.c" />
   17.46 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\synthesis.c" />
   17.47 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\vorbisenc.c" />
   17.48 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\window.c" />
   17.49    </ItemGroup>
   17.50    <ItemGroup>
   17.51 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\include\vorbis\codec.h" />
   17.52 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\include\vorbis\vorbisenc.h" />
   17.53 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\include\vorbis\vorbisfile.h" />
   17.54 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\backends.h" />
   17.55 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\bitrate.h" />
   17.56 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\books\coupled\res_books_stereo.h" />
   17.57 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\books\floor\floor_books.h" />
   17.58 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\books\uncoupled\res_books_uncoupled.h" />
   17.59 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\codebook.h" />
   17.60 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\codec_internal.h" />
   17.61 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\envelope.h" />
   17.62 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\highlevel.h" />
   17.63 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\lookup.h" />
   17.64 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\lookup_data.h" />
   17.65 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\lpc.h" />
   17.66 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\lsp.h" />
   17.67 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\masking.h" />
   17.68 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\mdct.h" />
   17.69 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\misc.h" />
   17.70 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\floor_all.h" />
   17.71 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\psych_11.h" />
   17.72 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\psych_16.h" />
   17.73 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\psych_44.h" />
   17.74 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\psych_8.h" />
   17.75 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\residue_16.h" />
   17.76 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\residue_44.h" />
   17.77 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\residue_44u.h" />
   17.78 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\residue_8.h" />
   17.79 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_11.h" />
   17.80 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_16.h" />
   17.81 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_22.h" />
   17.82 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_32.h" />
   17.83 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_44.h" />
   17.84 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_44u.h" />
   17.85 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_8.h" />
   17.86 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_X.h" />
   17.87 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\os.h" />
   17.88 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\psy.h" />
   17.89 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\registry.h" />
   17.90 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\scales.h" />
   17.91 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\smallft.h" />
   17.92 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\window.h" />
   17.93 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\include\vorbis\codec.h" />
   17.94 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\include\vorbis\vorbisenc.h" />
   17.95 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\include\vorbis\vorbisfile.h" />
   17.96 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\backends.h" />
   17.97 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\bitrate.h" />
   17.98 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\books\coupled\res_books_stereo.h" />
   17.99 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\books\floor\floor_books.h" />
  17.100 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\books\uncoupled\res_books_uncoupled.h" />
  17.101 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\codebook.h" />
  17.102 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\codec_internal.h" />
  17.103 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\envelope.h" />
  17.104 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\highlevel.h" />
  17.105 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\lookup.h" />
  17.106 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\lookup_data.h" />
  17.107 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\lpc.h" />
  17.108 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\lsp.h" />
  17.109 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\masking.h" />
  17.110 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\mdct.h" />
  17.111 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\misc.h" />
  17.112 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\floor_all.h" />
  17.113 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\psych_11.h" />
  17.114 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\psych_16.h" />
  17.115 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\psych_44.h" />
  17.116 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\psych_8.h" />
  17.117 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\residue_16.h" />
  17.118 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\residue_44.h" />
  17.119 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\residue_44u.h" />
  17.120 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\residue_8.h" />
  17.121 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_11.h" />
  17.122 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_16.h" />
  17.123 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_22.h" />
  17.124 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_32.h" />
  17.125 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_44.h" />
  17.126 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_44u.h" />
  17.127 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_8.h" />
  17.128 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_X.h" />
  17.129 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\os.h" />
  17.130 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\psy.h" />
  17.131 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\registry.h" />
  17.132 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\scales.h" />
  17.133 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\smallft.h" />
  17.134 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\window.h" />
  17.135    </ItemGroup>
  17.136    <ItemGroup>
  17.137 -    <None Include="..\..\external\libvorbis-1.3.3\win32\vorbis.def" />
  17.138 +    <None Include="..\..\external\libvorbis-1.3.5\win32\vorbis.def" />
  17.139    </ItemGroup>
  17.140    <ItemGroup>
  17.141      <ProjectReference Include="libogg_dynamic-WinPhone81.vcxproj">
  17.142 @@ -167,7 +167,7 @@
  17.143        <PrecompiledHeader>NotUsing</PrecompiledHeader>
  17.144        <CompileAsWinRT>false</CompileAsWinRT>
  17.145        <SDLCheck>true</SDLCheck>
  17.146 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  17.147 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  17.148        <PreprocessorDefinitions>LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  17.149        <DisableSpecificWarnings>4244;4100;4267;4189;4305;4127;4706</DisableSpecificWarnings>
  17.150      </ClCompile>
  17.151 @@ -175,7 +175,7 @@
  17.152        <SubSystem>Console</SubSystem>
  17.153        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
  17.154        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
  17.155 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbis.def</ModuleDefinitionFile>
  17.156 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbis.def</ModuleDefinitionFile>
  17.157      </Link>
  17.158    </ItemDefinitionGroup>
  17.159    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
  17.160 @@ -183,7 +183,7 @@
  17.161        <PrecompiledHeader>NotUsing</PrecompiledHeader>
  17.162        <CompileAsWinRT>false</CompileAsWinRT>
  17.163        <SDLCheck>true</SDLCheck>
  17.164 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  17.165 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  17.166        <PreprocessorDefinitions>LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  17.167        <DisableSpecificWarnings>4244;4100;4267;4189;4305;4127;4706</DisableSpecificWarnings>
  17.168      </ClCompile>
  17.169 @@ -191,7 +191,7 @@
  17.170        <SubSystem>Console</SubSystem>
  17.171        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
  17.172        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
  17.173 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbis.def</ModuleDefinitionFile>
  17.174 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbis.def</ModuleDefinitionFile>
  17.175      </Link>
  17.176    </ItemDefinitionGroup>
  17.177    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
  17.178 @@ -199,7 +199,7 @@
  17.179        <PrecompiledHeader>NotUsing</PrecompiledHeader>
  17.180        <CompileAsWinRT>false</CompileAsWinRT>
  17.181        <SDLCheck>true</SDLCheck>
  17.182 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  17.183 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  17.184        <PreprocessorDefinitions>LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WIN32_WCE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  17.185        <DisableSpecificWarnings>4244;4100;4267;4189;4305;4127;4706</DisableSpecificWarnings>
  17.186      </ClCompile>
  17.187 @@ -207,7 +207,7 @@
  17.188        <SubSystem>Console</SubSystem>
  17.189        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
  17.190        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
  17.191 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbis.def</ModuleDefinitionFile>
  17.192 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbis.def</ModuleDefinitionFile>
  17.193      </Link>
  17.194    </ItemDefinitionGroup>
  17.195    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
  17.196 @@ -215,7 +215,7 @@
  17.197        <PrecompiledHeader>NotUsing</PrecompiledHeader>
  17.198        <CompileAsWinRT>false</CompileAsWinRT>
  17.199        <SDLCheck>true</SDLCheck>
  17.200 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  17.201 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  17.202        <PreprocessorDefinitions>LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WIN32_WCE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  17.203        <DisableSpecificWarnings>4244;4100;4267;4189;4305;4127;4706</DisableSpecificWarnings>
  17.204      </ClCompile>
  17.205 @@ -223,10 +223,10 @@
  17.206        <SubSystem>Console</SubSystem>
  17.207        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
  17.208        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
  17.209 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbis.def</ModuleDefinitionFile>
  17.210 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbis.def</ModuleDefinitionFile>
  17.211      </Link>
  17.212    </ItemDefinitionGroup>
  17.213    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  17.214    <ImportGroup Label="ExtensionTargets">
  17.215    </ImportGroup>
  17.216 -</Project>
  17.217 \ No newline at end of file
  17.218 +</Project>
    18.1 --- a/VisualC-WinRT/WinPhone81_VS2013/libvorbisfile_dynamic-WinPhone81.vcxproj	Mon Oct 16 02:16:47 2017 -0700
    18.2 +++ b/VisualC-WinRT/WinPhone81_VS2013/libvorbisfile_dynamic-WinPhone81.vcxproj	Tue Oct 17 02:33:47 2017 -0700
    18.3 @@ -19,10 +19,10 @@
    18.4      </ProjectConfiguration>
    18.5    </ItemGroup>
    18.6    <ItemGroup>
    18.7 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\vorbisfile.c" />
    18.8 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\vorbisfile.c" />
    18.9    </ItemGroup>
   18.10    <ItemGroup>
   18.11 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\include\vorbis\vorbisfile.h" />
   18.12 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\include\vorbis\vorbisfile.h" />
   18.13    </ItemGroup>
   18.14    <ItemGroup>
   18.15      <ProjectReference Include="libogg_dynamic-WinPhone81.vcxproj">
   18.16 @@ -106,7 +106,7 @@
   18.17        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   18.18        <CompileAsWinRT>false</CompileAsWinRT>
   18.19        <SDLCheck>true</SDLCheck>
   18.20 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   18.21 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   18.22        <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;PSAPI_VERSION=2;WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP;_UITHREADCTXT_SUPPORT=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   18.23        <DisableSpecificWarnings>4244;4101</DisableSpecificWarnings>
   18.24      </ClCompile>
   18.25 @@ -114,7 +114,7 @@
   18.26        <SubSystem>Console</SubSystem>
   18.27        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
   18.28        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
   18.29 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbisfile.def</ModuleDefinitionFile>
   18.30 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbisfile.def</ModuleDefinitionFile>
   18.31      </Link>
   18.32    </ItemDefinitionGroup>
   18.33    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   18.34 @@ -122,7 +122,7 @@
   18.35        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   18.36        <CompileAsWinRT>false</CompileAsWinRT>
   18.37        <SDLCheck>true</SDLCheck>
   18.38 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   18.39 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   18.40        <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   18.41        <DisableSpecificWarnings>4244;4101</DisableSpecificWarnings>
   18.42      </ClCompile>
   18.43 @@ -130,7 +130,7 @@
   18.44        <SubSystem>Console</SubSystem>
   18.45        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
   18.46        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
   18.47 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbisfile.def</ModuleDefinitionFile>
   18.48 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbisfile.def</ModuleDefinitionFile>
   18.49      </Link>
   18.50    </ItemDefinitionGroup>
   18.51    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
   18.52 @@ -138,7 +138,7 @@
   18.53        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   18.54        <CompileAsWinRT>false</CompileAsWinRT>
   18.55        <SDLCheck>true</SDLCheck>
   18.56 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   18.57 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   18.58        <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WIN32_WCE;PSAPI_VERSION=2;WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP;_UITHREADCTXT_SUPPORT=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   18.59        <DisableSpecificWarnings>4244;4101</DisableSpecificWarnings>
   18.60      </ClCompile>
   18.61 @@ -146,7 +146,7 @@
   18.62        <SubSystem>Console</SubSystem>
   18.63        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
   18.64        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
   18.65 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbisfile.def</ModuleDefinitionFile>
   18.66 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbisfile.def</ModuleDefinitionFile>
   18.67      </Link>
   18.68    </ItemDefinitionGroup>
   18.69    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
   18.70 @@ -154,7 +154,7 @@
   18.71        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   18.72        <CompileAsWinRT>false</CompileAsWinRT>
   18.73        <SDLCheck>true</SDLCheck>
   18.74 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   18.75 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   18.76        <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WIN32_WCE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   18.77        <DisableSpecificWarnings>4244;4101</DisableSpecificWarnings>
   18.78      </ClCompile>
   18.79 @@ -162,10 +162,10 @@
   18.80        <SubSystem>Console</SubSystem>
   18.81        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
   18.82        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
   18.83 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbisfile.def</ModuleDefinitionFile>
   18.84 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbisfile.def</ModuleDefinitionFile>
   18.85      </Link>
   18.86    </ItemDefinitionGroup>
   18.87    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   18.88    <ImportGroup Label="ExtensionTargets">
   18.89    </ImportGroup>
   18.90 -</Project>
   18.91 \ No newline at end of file
   18.92 +</Project>
    19.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.2 +++ b/VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.sln	Tue Oct 17 02:33:47 2017 -0700
    19.3 @@ -0,0 +1,74 @@
    19.4 +
    19.5 +Microsoft Visual Studio Solution File, Format Version 12.00
    19.6 +# Visual Studio 2012
    19.7 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2_mixer-WinRT80", "SDL_mixer-WinRT80.vcxproj", "{06925935-B340-44E8-BDDD-7C1B8D64FF76}"
    19.8 +EndProject
    19.9 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg_dynamic-WinRT80", "libogg_dynamic-WinRT80.vcxproj", "{15CBFEFF-7965-41F5-B4E2-21E8795C9159}"
   19.10 +EndProject
   19.11 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbis_dynamic-WinRT80", "libvorbis_dynamic-WinRT80.vcxproj", "{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}"
   19.12 +EndProject
   19.13 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbisfile_dynamic-WinRT80", "libvorbisfile_dynamic-WinRT80.vcxproj", "{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}"
   19.14 +EndProject
   19.15 +Global
   19.16 +	GlobalSection(SolutionConfigurationPlatforms) = preSolution
   19.17 +		Debug|ARM = Debug|ARM
   19.18 +		Debug|Win32 = Debug|Win32
   19.19 +		Debug|x64 = Debug|x64
   19.20 +		Release|ARM = Release|ARM
   19.21 +		Release|Win32 = Release|Win32
   19.22 +		Release|x64 = Release|x64
   19.23 +	EndGlobalSection
   19.24 +	GlobalSection(ProjectConfigurationPlatforms) = postSolution
   19.25 +		{06925935-B340-44E8-BDDD-7C1B8D64FF76}.Debug|ARM.ActiveCfg = Debug|ARM
   19.26 +		{06925935-B340-44E8-BDDD-7C1B8D64FF76}.Debug|ARM.Build.0 = Debug|ARM
   19.27 +		{06925935-B340-44E8-BDDD-7C1B8D64FF76}.Debug|Win32.ActiveCfg = Debug|Win32
   19.28 +		{06925935-B340-44E8-BDDD-7C1B8D64FF76}.Debug|Win32.Build.0 = Debug|Win32
   19.29 +		{06925935-B340-44E8-BDDD-7C1B8D64FF76}.Debug|x64.ActiveCfg = Debug|x64
   19.30 +		{06925935-B340-44E8-BDDD-7C1B8D64FF76}.Debug|x64.Build.0 = Debug|x64
   19.31 +		{06925935-B340-44E8-BDDD-7C1B8D64FF76}.Release|ARM.ActiveCfg = Release|ARM
   19.32 +		{06925935-B340-44E8-BDDD-7C1B8D64FF76}.Release|ARM.Build.0 = Release|ARM
   19.33 +		{06925935-B340-44E8-BDDD-7C1B8D64FF76}.Release|Win32.ActiveCfg = Release|Win32
   19.34 +		{06925935-B340-44E8-BDDD-7C1B8D64FF76}.Release|Win32.Build.0 = Release|Win32
   19.35 +		{06925935-B340-44E8-BDDD-7C1B8D64FF76}.Release|x64.ActiveCfg = Release|x64
   19.36 +		{06925935-B340-44E8-BDDD-7C1B8D64FF76}.Release|x64.Build.0 = Release|x64
   19.37 +		{15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Debug|ARM.ActiveCfg = Debug|ARM
   19.38 +		{15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Debug|ARM.Build.0 = Debug|ARM
   19.39 +		{15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Debug|Win32.ActiveCfg = Debug|Win32
   19.40 +		{15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Debug|Win32.Build.0 = Debug|Win32
   19.41 +		{15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Debug|x64.ActiveCfg = Debug|x64
   19.42 +		{15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Debug|x64.Build.0 = Debug|x64
   19.43 +		{15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Release|ARM.ActiveCfg = Release|ARM
   19.44 +		{15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Release|ARM.Build.0 = Release|ARM
   19.45 +		{15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Release|Win32.ActiveCfg = Release|Win32
   19.46 +		{15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Release|Win32.Build.0 = Release|Win32
   19.47 +		{15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Release|x64.ActiveCfg = Release|x64
   19.48 +		{15CBFEFF-7965-41F5-B4E2-21E8795C9159}.Release|x64.Build.0 = Release|x64
   19.49 +		{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Debug|ARM.ActiveCfg = Debug|ARM
   19.50 +		{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Debug|ARM.Build.0 = Debug|ARM
   19.51 +		{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Debug|Win32.ActiveCfg = Debug|Win32
   19.52 +		{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Debug|Win32.Build.0 = Debug|Win32
   19.53 +		{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Debug|x64.ActiveCfg = Debug|x64
   19.54 +		{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Debug|x64.Build.0 = Debug|x64
   19.55 +		{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Release|ARM.ActiveCfg = Release|ARM
   19.56 +		{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Release|ARM.Build.0 = Release|ARM
   19.57 +		{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Release|Win32.ActiveCfg = Release|Win32
   19.58 +		{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Release|Win32.Build.0 = Release|Win32
   19.59 +		{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Release|x64.ActiveCfg = Release|x64
   19.60 +		{3A214E06-B95E-4D61-A291-1F8DF2EC10FD}.Release|x64.Build.0 = Release|x64
   19.61 +		{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Debug|ARM.ActiveCfg = Debug|ARM
   19.62 +		{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Debug|ARM.Build.0 = Debug|ARM
   19.63 +		{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Debug|Win32.ActiveCfg = Debug|Win32
   19.64 +		{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Debug|Win32.Build.0 = Debug|Win32
   19.65 +		{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Debug|x64.ActiveCfg = Debug|x64
   19.66 +		{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Debug|x64.Build.0 = Debug|x64
   19.67 +		{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Release|ARM.ActiveCfg = Release|ARM
   19.68 +		{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Release|ARM.Build.0 = Release|ARM
   19.69 +		{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Release|Win32.ActiveCfg = Release|Win32
   19.70 +		{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Release|Win32.Build.0 = Release|Win32
   19.71 +		{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Release|x64.ActiveCfg = Release|x64
   19.72 +		{CEBDE98B-A6AA-46E6-BC79-FAAF823DB9EC}.Release|x64.Build.0 = Release|x64
   19.73 +	EndGlobalSection
   19.74 +	GlobalSection(SolutionProperties) = preSolution
   19.75 +		HideSolutionNode = FALSE
   19.76 +	EndGlobalSection
   19.77 +EndGlobal
    20.1 --- a/VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.vcxproj	Mon Oct 16 02:16:47 2017 -0700
    20.2 +++ b/VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.vcxproj	Tue Oct 17 02:33:47 2017 -0700
    20.3 @@ -27,49 +27,6 @@
    20.4      </ProjectConfiguration>
    20.5    </ItemGroup>
    20.6    <ItemGroup>
    20.7 -    <ClCompile Include="..\..\dynamic_flac.c" />
    20.8 -    <ClCompile Include="..\..\dynamic_fluidsynth.c" />
    20.9 -    <ClCompile Include="..\..\dynamic_mod.c" />
   20.10 -    <ClCompile Include="..\..\dynamic_mp3.c" />
   20.11 -    <ClCompile Include="..\..\dynamic_ogg.c" />
   20.12 -    <ClCompile Include="..\..\effects_internal.c" />
   20.13 -    <ClCompile Include="..\..\effect_position.c" />
   20.14 -    <ClCompile Include="..\..\effect_stereoreverse.c" />
   20.15 -    <ClCompile Include="..\..\fluidsynth.c" />
   20.16 -    <ClCompile Include="..\..\load_aiff.c" />
   20.17 -    <ClCompile Include="..\..\load_flac.c" />
   20.18 -    <ClCompile Include="..\..\load_ogg.c" />
   20.19 -    <ClCompile Include="..\..\load_voc.c" />
   20.20 -    <ClCompile Include="..\..\mixer.c" />
   20.21 -    <ClCompile Include="..\..\music.c" />
   20.22 -    <ClCompile Include="..\..\music_cmd.c" />
   20.23 -    <ClCompile Include="..\..\music_flac.c" />
   20.24 -    <ClCompile Include="..\..\music_mad.c" />
   20.25 -    <ClCompile Include="..\..\music_mod.c" />
   20.26 -    <ClCompile Include="..\..\music_ogg.c" />
   20.27 -    <ClCompile Include="..\..\wavestream.c" />
   20.28 -  </ItemGroup>
   20.29 -  <ItemGroup>
   20.30 -    <ClInclude Include="..\..\dynamic_flac.h" />
   20.31 -    <ClInclude Include="..\..\dynamic_fluidsynth.h" />
   20.32 -    <ClInclude Include="..\..\dynamic_mod.h" />
   20.33 -    <ClInclude Include="..\..\dynamic_mp3.h" />
   20.34 -    <ClInclude Include="..\..\dynamic_ogg.h" />
   20.35 -    <ClInclude Include="..\..\effects_internal.h" />
   20.36 -    <ClInclude Include="..\..\fluidsynth.h" />
   20.37 -    <ClInclude Include="..\..\load_aiff.h" />
   20.38 -    <ClInclude Include="..\..\load_flac.h" />
   20.39 -    <ClInclude Include="..\..\load_ogg.h" />
   20.40 -    <ClInclude Include="..\..\load_voc.h" />
   20.41 -    <ClInclude Include="..\..\music_cmd.h" />
   20.42 -    <ClInclude Include="..\..\music_flac.h" />
   20.43 -    <ClInclude Include="..\..\music_mad.h" />
   20.44 -    <ClInclude Include="..\..\music_mod.h" />
   20.45 -    <ClInclude Include="..\..\music_ogg.h" />
   20.46 -    <ClInclude Include="..\..\SDL_mixer.h" />
   20.47 -    <ClInclude Include="..\..\wavestream.h" />
   20.48 -  </ItemGroup>
   20.49 -  <ItemGroup>
   20.50      <ProjectReference Include="..\..\..\SDL\VisualC-WinRT\WinRT80_VS2012\SDL-WinRT80.vcxproj">
   20.51        <Project>{aeaea3a2-d4e6-45b1-8ec6-53d84287fc14}</Project>
   20.52      </ProjectReference>
   20.53 @@ -83,6 +40,47 @@
   20.54        <Project>{3a214e06-b95e-4d61-a291-1f8df2ec10fd}</Project>
   20.55      </ProjectReference>
   20.56    </ItemGroup>
   20.57 +  <ItemGroup>
   20.58 +    <ClCompile Include="..\..\effects_internal.c" />
   20.59 +    <ClCompile Include="..\..\effect_position.c" />
   20.60 +    <ClCompile Include="..\..\effect_stereoreverse.c" />
   20.61 +    <ClCompile Include="..\..\load_aiff.c" />
   20.62 +    <ClCompile Include="..\..\load_voc.c" />
   20.63 +    <ClCompile Include="..\..\mixer.c" />
   20.64 +    <ClCompile Include="..\..\music.c" />
   20.65 +    <ClCompile Include="..\..\music_cmd.c" />
   20.66 +    <ClCompile Include="..\..\music_flac.c" />
   20.67 +    <ClCompile Include="..\..\music_fluidsynth.c" />
   20.68 +    <ClCompile Include="..\..\music_mad.c" />
   20.69 +    <ClCompile Include="..\..\music_mikmod.c" />
   20.70 +    <ClCompile Include="..\..\music_modplug.c" />
   20.71 +    <ClCompile Include="..\..\music_mpg123.c" />
   20.72 +    <ClCompile Include="..\..\music_nativemidi.c" />
   20.73 +    <ClCompile Include="..\..\music_ogg.c" />
   20.74 +    <ClCompile Include="..\..\music_smpeg.c" />
   20.75 +    <ClCompile Include="..\..\music_timidity.c" />
   20.76 +    <ClCompile Include="..\..\music_wav.c" />
   20.77 +  </ItemGroup>
   20.78 +  <ItemGroup>
   20.79 +    <ClInclude Include="..\..\effects_internal.h" />
   20.80 +    <ClInclude Include="..\..\load_aiff.h" />
   20.81 +    <ClInclude Include="..\..\load_voc.h" />
   20.82 +    <ClInclude Include="..\..\mixer.h" />
   20.83 +    <ClInclude Include="..\..\music.h" />
   20.84 +    <ClInclude Include="..\..\music_cmd.h" />
   20.85 +    <ClInclude Include="..\..\music_flac.h" />
   20.86 +    <ClInclude Include="..\..\music_fluidsynth.h" />
   20.87 +    <ClInclude Include="..\..\music_mad.h" />
   20.88 +    <ClInclude Include="..\..\music_mikmod.h" />
   20.89 +    <ClInclude Include="..\..\music_modplug.h" />
   20.90 +    <ClInclude Include="..\..\music_mpg123.h" />
   20.91 +    <ClInclude Include="..\..\music_nativemidi.h" />
   20.92 +    <ClInclude Include="..\..\music_ogg.h" />
   20.93 +    <ClInclude Include="..\..\music_smpeg.h" />
   20.94 +    <ClInclude Include="..\..\music_timidity.h" />
   20.95 +    <ClInclude Include="..\..\music_wav.h" />
   20.96 +    <ClInclude Include="..\..\SDL_mixer.h" />
   20.97 +  </ItemGroup>
   20.98    <PropertyGroup Label="Globals">
   20.99      <ProjectGuid>{06925935-b340-44e8-bddd-7c1b8d64ff76}</ProjectGuid>
  20.100      <Keyword>Win32Proj</Keyword>
  20.101 @@ -187,8 +185,8 @@
  20.102      <ClCompile>
  20.103        <PrecompiledHeader>NotUsing</PrecompiledHeader>
  20.104        <CompileAsWinRT>false</CompileAsWinRT>
  20.105 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  20.106 -      <PreprocessorDefinitions>WAV_MUSIC;OGG_MUSIC;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  20.107 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  20.108 +      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  20.109      </ClCompile>
  20.110      <Link>
  20.111        <SubSystem>Console</SubSystem>
  20.112 @@ -200,8 +198,8 @@
  20.113      <ClCompile>
  20.114        <PrecompiledHeader>NotUsing</PrecompiledHeader>
  20.115        <CompileAsWinRT>false</CompileAsWinRT>
  20.116 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  20.117 -      <PreprocessorDefinitions>WAV_MUSIC;OGG_MUSIC;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  20.118 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  20.119 +      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  20.120      </ClCompile>
  20.121      <Link>
  20.122        <SubSystem>Console</SubSystem>
  20.123 @@ -213,8 +211,8 @@
  20.124      <ClCompile>
  20.125        <PrecompiledHeader>NotUsing</PrecompiledHeader>
  20.126        <CompileAsWinRT>false</CompileAsWinRT>
  20.127 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  20.128 -      <PreprocessorDefinitions>WAV_MUSIC;OGG_MUSIC;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  20.129 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  20.130 +      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  20.131      </ClCompile>
  20.132      <Link>
  20.133        <SubSystem>Console</SubSystem>
  20.134 @@ -226,8 +224,8 @@
  20.135      <ClCompile>
  20.136        <PrecompiledHeader>NotUsing</PrecompiledHeader>
  20.137        <CompileAsWinRT>false</CompileAsWinRT>
  20.138 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  20.139 -      <PreprocessorDefinitions>WAV_MUSIC;OGG_MUSIC;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  20.140 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  20.141 +      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  20.142      </ClCompile>
  20.143      <Link>
  20.144        <SubSystem>Console</SubSystem>
  20.145 @@ -239,8 +237,8 @@
  20.146      <ClCompile>
  20.147        <PrecompiledHeader>NotUsing</PrecompiledHeader>
  20.148        <CompileAsWinRT>false</CompileAsWinRT>
  20.149 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  20.150 -      <PreprocessorDefinitions>WAV_MUSIC;OGG_MUSIC;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  20.151 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  20.152 +      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  20.153      </ClCompile>
  20.154      <Link>
  20.155        <SubSystem>Console</SubSystem>
  20.156 @@ -252,8 +250,8 @@
  20.157      <ClCompile>
  20.158        <PrecompiledHeader>NotUsing</PrecompiledHeader>
  20.159        <CompileAsWinRT>false</CompileAsWinRT>
  20.160 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  20.161 -      <PreprocessorDefinitions>WAV_MUSIC;OGG_MUSIC;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  20.162 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  20.163 +      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  20.164      </ClCompile>
  20.165      <Link>
  20.166        <SubSystem>Console</SubSystem>
  20.167 @@ -264,4 +262,4 @@
  20.168    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  20.169    <ImportGroup Label="ExtensionTargets">
  20.170    </ImportGroup>
  20.171 -</Project>
  20.172 \ No newline at end of file
  20.173 +</Project>
    21.1 --- a/VisualC-WinRT/WinRT80_VS2012/libogg_dynamic-WinRT80.vcxproj	Mon Oct 16 02:16:47 2017 -0700
    21.2 +++ b/VisualC-WinRT/WinRT80_VS2012/libogg_dynamic-WinRT80.vcxproj	Tue Oct 17 02:33:47 2017 -0700
    21.3 @@ -124,7 +124,7 @@
    21.4    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    21.5      <ClCompile>
    21.6        <Optimization>Disabled</Optimization>
    21.7 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    21.8 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    21.9        <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBOGG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   21.10        <MinimalRebuild>true</MinimalRebuild>
   21.11        <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
   21.12 @@ -137,13 +137,13 @@
   21.13        <CallingConvention>Cdecl</CallingConvention>
   21.14      </ClCompile>
   21.15      <Link>
   21.16 -      <ModuleDefinitionFile>..\..\external\libogg-1.3.1\win32\ogg.def</ModuleDefinitionFile>
   21.17 +      <ModuleDefinitionFile>..\..\external\libogg-1.3.2\win32\ogg.def</ModuleDefinitionFile>
   21.18      </Link>
   21.19    </ItemDefinitionGroup>
   21.20    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
   21.21      <ClCompile>
   21.22        <Optimization>Disabled</Optimization>
   21.23 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   21.24 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   21.25        <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBOGG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   21.26        <MinimalRebuild>true</MinimalRebuild>
   21.27        <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
   21.28 @@ -156,7 +156,7 @@
   21.29        <CallingConvention>Cdecl</CallingConvention>
   21.30      </ClCompile>
   21.31      <Link>
   21.32 -      <ModuleDefinitionFile>..\..\external\libogg-1.3.1\win32\ogg.def</ModuleDefinitionFile>
   21.33 +      <ModuleDefinitionFile>..\..\external\libogg-1.3.2\win32\ogg.def</ModuleDefinitionFile>
   21.34      </Link>
   21.35    </ItemDefinitionGroup>
   21.36    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
   21.37 @@ -165,7 +165,7 @@
   21.38      </Midl>
   21.39      <ClCompile>
   21.40        <Optimization>Disabled</Optimization>
   21.41 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   21.42 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   21.43        <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBOGG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   21.44        <MinimalRebuild>true</MinimalRebuild>
   21.45        <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
   21.46 @@ -178,7 +178,7 @@
   21.47        <CallingConvention>Cdecl</CallingConvention>
   21.48      </ClCompile>
   21.49      <Link>
   21.50 -      <ModuleDefinitionFile>..\..\external\libogg-1.3.1\win32\ogg.def</ModuleDefinitionFile>
   21.51 +      <ModuleDefinitionFile>..\..\external\libogg-1.3.2\win32\ogg.def</ModuleDefinitionFile>
   21.52      </Link>
   21.53    </ItemDefinitionGroup>
   21.54    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   21.55 @@ -187,7 +187,7 @@
   21.56        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
   21.57        <IntrinsicFunctions>true</IntrinsicFunctions>
   21.58        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
   21.59 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   21.60 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   21.61        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBOGG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   21.62        <StringPooling>true</StringPooling>
   21.63        <ExceptionHandling>
   21.64 @@ -204,7 +204,7 @@
   21.65        <CallingConvention>Cdecl</CallingConvention>
   21.66      </ClCompile>
   21.67      <Link>
   21.68 -      <ModuleDefinitionFile>..\..\external\libogg-1.3.1\win32\ogg.def</ModuleDefinitionFile>
   21.69 +      <ModuleDefinitionFile>..\..\external\libogg-1.3.2\win32\ogg.def</ModuleDefinitionFile>
   21.70      </Link>
   21.71    </ItemDefinitionGroup>
   21.72    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
   21.73 @@ -213,7 +213,7 @@
   21.74        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
   21.75        <IntrinsicFunctions>true</IntrinsicFunctions>
   21.76        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
   21.77 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   21.78 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   21.79        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBOGG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   21.80        <StringPooling>true</StringPooling>
   21.81        <ExceptionHandling>
   21.82 @@ -230,7 +230,7 @@
   21.83        <CallingConvention>Cdecl</CallingConvention>
   21.84      </ClCompile>
   21.85      <Link>
   21.86 -      <ModuleDefinitionFile>..\..\external\libogg-1.3.1\win32\ogg.def</ModuleDefinitionFile>
   21.87 +      <ModuleDefinitionFile>..\..\external\libogg-1.3.2\win32\ogg.def</ModuleDefinitionFile>
   21.88      </Link>
   21.89    </ItemDefinitionGroup>
   21.90    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
   21.91 @@ -242,7 +242,7 @@
   21.92        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
   21.93        <IntrinsicFunctions>true</IntrinsicFunctions>
   21.94        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
   21.95 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   21.96 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   21.97        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBOGG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   21.98        <StringPooling>true</StringPooling>
   21.99        <ExceptionHandling>
  21.100 @@ -259,21 +259,21 @@
  21.101        <CallingConvention>Cdecl</CallingConvention>
  21.102      </ClCompile>
  21.103      <Link>
  21.104 -      <ModuleDefinitionFile>..\..\external\libogg-1.3.1\win32\ogg.def</ModuleDefinitionFile>
  21.105 +      <ModuleDefinitionFile>..\..\external\libogg-1.3.2\win32\ogg.def</ModuleDefinitionFile>
  21.106      </Link>
  21.107    </ItemDefinitionGroup>
  21.108    <ItemGroup>
  21.109 -    <ClCompile Include="..\..\external\libogg-1.3.1\src\bitwise.c" />
  21.110 -    <ClCompile Include="..\..\external\libogg-1.3.1\src\framing.c" />
  21.111 +    <ClCompile Include="..\..\external\libogg-1.3.2\src\bitwise.c" />
  21.112 +    <ClCompile Include="..\..\external\libogg-1.3.2\src\framing.c" />
  21.113    </ItemGroup>
  21.114    <ItemGroup>
  21.115 -    <None Include="..\..\external\libogg-1.3.1\win32\ogg.def" />
  21.116 +    <None Include="..\..\external\libogg-1.3.2\win32\ogg.def" />
  21.117    </ItemGroup>
  21.118    <ItemGroup>
  21.119 -    <ClInclude Include="..\..\external\libogg-1.3.1\include\ogg\ogg.h" />
  21.120 -    <ClInclude Include="..\..\external\libogg-1.3.1\include\ogg\os_types.h" />
  21.121 +    <ClInclude Include="..\..\external\libogg-1.3.2\include\ogg\ogg.h" />
  21.122 +    <ClInclude Include="..\..\external\libogg-1.3.2\include\ogg\os_types.h" />
  21.123    </ItemGroup>
  21.124    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  21.125    <ImportGroup Label="ExtensionTargets">
  21.126    </ImportGroup>
  21.127 -</Project>
  21.128 \ No newline at end of file
  21.129 +</Project>
    22.1 --- a/VisualC-WinRT/WinRT80_VS2012/libvorbis_dynamic-WinRT80.vcxproj	Mon Oct 16 02:16:47 2017 -0700
    22.2 +++ b/VisualC-WinRT/WinRT80_VS2012/libvorbis_dynamic-WinRT80.vcxproj	Tue Oct 17 02:33:47 2017 -0700
    22.3 @@ -112,7 +112,7 @@
    22.4    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    22.5      <ClCompile>
    22.6        <Optimization>Disabled</Optimization>
    22.7 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    22.8 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    22.9        <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   22.10        <MinimalRebuild>true</MinimalRebuild>
   22.11        <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
   22.12 @@ -126,7 +126,7 @@
   22.13      </ClCompile>
   22.14      <Link>
   22.15        <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
   22.16 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbis.def</ModuleDefinitionFile>
   22.17 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbis.def</ModuleDefinitionFile>
   22.18        <GenerateDebugInformation>true</GenerateDebugInformation>
   22.19        <ProgramDatabaseFile>$(OutDir)libvorbis.pdb</ProgramDatabaseFile>
   22.20        <SubSystem>Windows</SubSystem>
   22.21 @@ -136,7 +136,7 @@
   22.22    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
   22.23      <ClCompile>
   22.24        <Optimization>Disabled</Optimization>
   22.25 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   22.26 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   22.27        <PreprocessorDefinitions>WIN32;_WIN32_WCE;_DEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   22.28        <MinimalRebuild>true</MinimalRebuild>
   22.29        <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
   22.30 @@ -150,7 +150,7 @@
   22.31      </ClCompile>
   22.32      <Link>
   22.33        <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
   22.34 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbis.def</ModuleDefinitionFile>
   22.35 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbis.def</ModuleDefinitionFile>
   22.36        <GenerateDebugInformation>true</GenerateDebugInformation>
   22.37        <ProgramDatabaseFile>$(OutDir)libvorbis.pdb</ProgramDatabaseFile>
   22.38        <SubSystem>Windows</SubSystem>
   22.39 @@ -162,7 +162,7 @@
   22.40      </Midl>
   22.41      <ClCompile>
   22.42        <Optimization>Disabled</Optimization>
   22.43 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   22.44 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   22.45        <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   22.46        <MinimalRebuild>true</MinimalRebuild>
   22.47        <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
   22.48 @@ -176,7 +176,7 @@
   22.49      </ClCompile>
   22.50      <Link>
   22.51        <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
   22.52 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbis.def</ModuleDefinitionFile>
   22.53 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbis.def</ModuleDefinitionFile>
   22.54        <GenerateDebugInformation>true</GenerateDebugInformation>
   22.55        <ProgramDatabaseFile>$(OutDir)libvorbis.pdb</ProgramDatabaseFile>
   22.56        <SubSystem>Windows</SubSystem>
   22.57 @@ -189,7 +189,7 @@
   22.58        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
   22.59        <IntrinsicFunctions>true</IntrinsicFunctions>
   22.60        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
   22.61 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   22.62 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   22.63        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   22.64        <StringPooling>true</StringPooling>
   22.65        <ExceptionHandling>
   22.66 @@ -206,7 +206,7 @@
   22.67      </ClCompile>
   22.68      <Link>
   22.69        <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
   22.70 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbis.def</ModuleDefinitionFile>
   22.71 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbis.def</ModuleDefinitionFile>
   22.72        <GenerateDebugInformation>false</GenerateDebugInformation>
   22.73        <SubSystem>Windows</SubSystem>
   22.74        <OptimizeReferences>true</OptimizeReferences>
   22.75 @@ -220,7 +220,7 @@
   22.76        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
   22.77        <IntrinsicFunctions>true</IntrinsicFunctions>
   22.78        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
   22.79 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   22.80 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   22.81        <PreprocessorDefinitions>WIN32;_WIN32_WCE;NDEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   22.82        <StringPooling>true</StringPooling>
   22.83        <ExceptionHandling>
   22.84 @@ -237,7 +237,7 @@
   22.85      </ClCompile>
   22.86      <Link>
   22.87        <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
   22.88 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbis.def</ModuleDefinitionFile>
   22.89 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbis.def</ModuleDefinitionFile>
   22.90        <GenerateDebugInformation>false</GenerateDebugInformation>
   22.91        <SubSystem>Windows</SubSystem>
   22.92        <OptimizeReferences>true</OptimizeReferences>
   22.93 @@ -253,7 +253,7 @@
   22.94        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
   22.95        <IntrinsicFunctions>true</IntrinsicFunctions>
   22.96        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
   22.97 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   22.98 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   22.99        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  22.100        <StringPooling>true</StringPooling>
  22.101        <ExceptionHandling>
  22.102 @@ -270,7 +270,7 @@
  22.103      </ClCompile>
  22.104      <Link>
  22.105        <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
  22.106 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbis.def</ModuleDefinitionFile>
  22.107 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbis.def</ModuleDefinitionFile>
  22.108        <GenerateDebugInformation>false</GenerateDebugInformation>
  22.109        <SubSystem>Windows</SubSystem>
  22.110        <OptimizeReferences>true</OptimizeReferences>
  22.111 @@ -279,74 +279,74 @@
  22.112      </Link>
  22.113    </ItemDefinitionGroup>
  22.114    <ItemGroup>
  22.115 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\analysis.c" />
  22.116 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\bitrate.c" />
  22.117 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\block.c" />
  22.118 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\codebook.c" />
  22.119 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\envelope.c" />
  22.120 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\floor0.c" />
  22.121 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\floor1.c" />
  22.122 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\info.c" />
  22.123 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\lookup.c" />
  22.124 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\lpc.c" />
  22.125 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\lsp.c" />
  22.126 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\mapping0.c" />
  22.127 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\mdct.c" />
  22.128 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\psy.c" />
  22.129 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\registry.c" />
  22.130 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\res0.c" />
  22.131 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\sharedbook.c" />
  22.132 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\smallft.c" />
  22.133 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\synthesis.c" />
  22.134 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\vorbisenc.c" />
  22.135 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\window.c" />
  22.136 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\analysis.c" />
  22.137 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\bitrate.c" />
  22.138 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\block.c" />
  22.139 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\codebook.c" />
  22.140 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\envelope.c" />
  22.141 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\floor0.c" />
  22.142 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\floor1.c" />
  22.143 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\info.c" />
  22.144 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\lookup.c" />
  22.145 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\lpc.c" />
  22.146 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\lsp.c" />
  22.147 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\mapping0.c" />
  22.148 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\mdct.c" />
  22.149 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\psy.c" />
  22.150 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\registry.c" />
  22.151 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\res0.c" />
  22.152 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\sharedbook.c" />
  22.153 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\smallft.c" />
  22.154 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\synthesis.c" />
  22.155 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\vorbisenc.c" />
  22.156 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\window.c" />
  22.157    </ItemGroup>
  22.158    <ItemGroup>
  22.159 -    <None Include="..\..\external\libvorbis-1.3.3\win32\vorbis.def" />
  22.160 +    <None Include="..\..\external\libvorbis-1.3.5\win32\vorbis.def" />
  22.161    </ItemGroup>
  22.162    <ItemGroup>
  22.163 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\backends.h" />
  22.164 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\bitrate.h" />
  22.165 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\codebook.h" />
  22.166 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\include\vorbis\codec.h" />
  22.167 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\codec_internal.h" />
  22.168 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\envelope.h" />
  22.169 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\floor_all.h" />
  22.170 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\books\floor\floor_books.h" />
  22.171 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\highlevel.h" />
  22.172 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\lookup.h" />
  22.173 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\lookup_data.h" />
  22.174 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\lpc.h" />
  22.175 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\lsp.h" />
  22.176 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\masking.h" />
  22.177 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\mdct.h" />
  22.178 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\misc.h" />
  22.179 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\os.h" />
  22.180 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\psy.h" />
  22.181 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\psych_11.h" />
  22.182 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\psych_16.h" />
  22.183 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\psych_44.h" />
  22.184 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\psych_8.h" />
  22.185 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\registry.h" />
  22.186 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\books\coupled\res_books_stereo.h" />
  22.187 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\books\uncoupled\res_books_uncoupled.h" />
  22.188 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\residue_16.h" />
  22.189 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\residue_44.h" />
  22.190 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\residue_44u.h" />
  22.191 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\residue_8.h" />
  22.192 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\scales.h" />
  22.193 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_11.h" />
  22.194 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_16.h" />
  22.195 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_22.h" />
  22.196 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_32.h" />
  22.197 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_44.h" />
  22.198 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_44u.h" />
  22.199 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_8.h" />
  22.200 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_X.h" />
  22.201 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\smallft.h" />
  22.202 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\include\vorbis\vorbisenc.h" />
  22.203 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\include\vorbis\vorbisfile.h" />
  22.204 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\window.h" />
  22.205 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\backends.h" />
  22.206 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\bitrate.h" />
  22.207 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\codebook.h" />
  22.208 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\include\vorbis\codec.h" />
  22.209 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\codec_internal.h" />
  22.210 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\envelope.h" />
  22.211 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\floor_all.h" />
  22.212 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\books\floor\floor_books.h" />
  22.213 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\highlevel.h" />
  22.214 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\lookup.h" />
  22.215 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\lookup_data.h" />
  22.216 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\lpc.h" />
  22.217 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\lsp.h" />
  22.218 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\masking.h" />
  22.219 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\mdct.h" />
  22.220 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\misc.h" />
  22.221 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\os.h" />
  22.222 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\psy.h" />
  22.223 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\psych_11.h" />
  22.224 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\psych_16.h" />
  22.225 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\psych_44.h" />
  22.226 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\psych_8.h" />
  22.227 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\registry.h" />
  22.228 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\books\coupled\res_books_stereo.h" />
  22.229 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\books\uncoupled\res_books_uncoupled.h" />
  22.230 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\residue_16.h" />
  22.231 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\residue_44.h" />
  22.232 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\residue_44u.h" />
  22.233 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\residue_8.h" />
  22.234 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\scales.h" />
  22.235 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_11.h" />
  22.236 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_16.h" />
  22.237 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_22.h" />
  22.238 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_32.h" />
  22.239 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_44.h" />
  22.240 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_44u.h" />
  22.241 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_8.h" />
  22.242 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_X.h" />
  22.243 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\smallft.h" />
  22.244 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\include\vorbis\vorbisenc.h" />
  22.245 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\include\vorbis\vorbisfile.h" />
  22.246 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\window.h" />
  22.247    </ItemGroup>
  22.248    <ItemGroup>
  22.249      <ProjectReference Include="libogg_dynamic-WinRT80.vcxproj">
  22.250 @@ -356,4 +356,4 @@
  22.251    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  22.252    <ImportGroup Label="ExtensionTargets">
  22.253    </ImportGroup>
  22.254 -</Project>
  22.255 \ No newline at end of file
  22.256 +</Project>
    23.1 --- a/VisualC-WinRT/WinRT80_VS2012/libvorbisfile_dynamic-WinRT80.vcxproj	Mon Oct 16 02:16:47 2017 -0700
    23.2 +++ b/VisualC-WinRT/WinRT80_VS2012/libvorbisfile_dynamic-WinRT80.vcxproj	Tue Oct 17 02:33:47 2017 -0700
    23.3 @@ -113,7 +113,7 @@
    23.4    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    23.5      <ClCompile>
    23.6        <Optimization>Disabled</Optimization>
    23.7 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    23.8 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    23.9        <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBVORBISFILE_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   23.10        <MinimalRebuild>true</MinimalRebuild>
   23.11        <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
   23.12 @@ -126,7 +126,7 @@
   23.13      </ClCompile>
   23.14      <Link>
   23.15        <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
   23.16 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbisfile.def</ModuleDefinitionFile>
   23.17 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbisfile.def</ModuleDefinitionFile>
   23.18        <GenerateDebugInformation>true</GenerateDebugInformation>
   23.19        <ProgramDatabaseFile>$(OutDir)libvorbisfile.pdb</ProgramDatabaseFile>
   23.20        <SubSystem>Windows</SubSystem>
   23.21 @@ -136,7 +136,7 @@
   23.22    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
   23.23      <ClCompile>
   23.24        <Optimization>Disabled</Optimization>
   23.25 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   23.26 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   23.27        <PreprocessorDefinitions>WIN32;_WIN32_WCE;_DEBUG;_WINDOWS;_USRDLL;LIBVORBISFILE_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   23.28        <MinimalRebuild>true</MinimalRebuild>
   23.29        <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
   23.30 @@ -149,7 +149,7 @@
   23.31      </ClCompile>
   23.32      <Link>
   23.33        <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
   23.34 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbisfile.def</ModuleDefinitionFile>
   23.35 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbisfile.def</ModuleDefinitionFile>
   23.36        <GenerateDebugInformation>true</GenerateDebugInformation>
   23.37        <ProgramDatabaseFile>$(OutDir)libvorbisfile.pdb</ProgramDatabaseFile>
   23.38        <SubSystem>Windows</SubSystem>
   23.39 @@ -161,7 +161,7 @@
   23.40      </Midl>
   23.41      <ClCompile>
   23.42        <Optimization>Disabled</Optimization>
   23.43 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   23.44 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   23.45        <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBVORBISFILE_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   23.46        <MinimalRebuild>true</MinimalRebuild>
   23.47        <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
   23.48 @@ -174,7 +174,7 @@
   23.49      </ClCompile>
   23.50      <Link>
   23.51        <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
   23.52 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbisfile.def</ModuleDefinitionFile>
   23.53 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbisfile.def</ModuleDefinitionFile>
   23.54        <GenerateDebugInformation>true</GenerateDebugInformation>
   23.55        <ProgramDatabaseFile>$(OutDir)libvorbisfile.pdb</ProgramDatabaseFile>
   23.56        <SubSystem>Windows</SubSystem>
   23.57 @@ -183,7 +183,7 @@
   23.58    </ItemDefinitionGroup>
   23.59    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   23.60      <ClCompile>
   23.61 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   23.62 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   23.63        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBVORBISFILE_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   23.64        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   23.65        <PrecompiledHeader>
   23.66 @@ -194,7 +194,7 @@
   23.67      </ClCompile>
   23.68      <Link>
   23.69        <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
   23.70 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbisfile.def</ModuleDefinitionFile>
   23.71 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbisfile.def</ModuleDefinitionFile>
   23.72        <GenerateDebugInformation>false</GenerateDebugInformation>
   23.73        <SubSystem>Windows</SubSystem>
   23.74        <OptimizeReferences>true</OptimizeReferences>
   23.75 @@ -204,7 +204,7 @@
   23.76    </ItemDefinitionGroup>
   23.77    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
   23.78      <ClCompile>
   23.79 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   23.80 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   23.81        <PreprocessorDefinitions>WIN32;_WIN32_WCE;NDEBUG;_WINDOWS;_USRDLL;LIBVORBISFILE_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   23.82        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   23.83        <PrecompiledHeader>
   23.84 @@ -215,7 +215,7 @@
   23.85      </ClCompile>
   23.86      <Link>
   23.87        <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
   23.88 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbisfile.def</ModuleDefinitionFile>
   23.89 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbisfile.def</ModuleDefinitionFile>
   23.90        <GenerateDebugInformation>false</GenerateDebugInformation>
   23.91        <SubSystem>Windows</SubSystem>
   23.92        <OptimizeReferences>true</OptimizeReferences>
   23.93 @@ -227,7 +227,7 @@
   23.94        <TargetEnvironment>X64</TargetEnvironment>
   23.95      </Midl>
   23.96      <ClCompile>
   23.97 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   23.98 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   23.99        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBVORBISFILE_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  23.100        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  23.101        <PrecompiledHeader>
  23.102 @@ -238,7 +238,7 @@
  23.103      </ClCompile>
  23.104      <Link>
  23.105        <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
  23.106 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbisfile.def</ModuleDefinitionFile>
  23.107 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbisfile.def</ModuleDefinitionFile>
  23.108        <GenerateDebugInformation>false</GenerateDebugInformation>
  23.109        <SubSystem>Windows</SubSystem>
  23.110        <OptimizeReferences>true</OptimizeReferences>
  23.111 @@ -247,10 +247,10 @@
  23.112      </Link>
  23.113    </ItemDefinitionGroup>
  23.114    <ItemGroup>
  23.115 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\vorbisfile.c" />
  23.116 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\vorbisfile.c" />
  23.117    </ItemGroup>
  23.118    <ItemGroup>
  23.119 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\include\vorbis\vorbisfile.h" />
  23.120 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\include\vorbis\vorbisfile.h" />
  23.121    </ItemGroup>
  23.122    <ItemGroup>
  23.123      <ProjectReference Include="libogg_dynamic-WinRT80.vcxproj">
  23.124 @@ -263,4 +263,4 @@
  23.125    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  23.126    <ImportGroup Label="ExtensionTargets">
  23.127    </ImportGroup>
  23.128 -</Project>
  23.129 \ No newline at end of file
  23.130 +</Project>
    24.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    24.2 +++ b/VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.sln	Tue Oct 17 02:33:47 2017 -0700
    24.3 @@ -0,0 +1,76 @@
    24.4 +
    24.5 +Microsoft Visual Studio Solution File, Format Version 12.00
    24.6 +# Visual Studio 2013
    24.7 +VisualStudioVersion = 12.0.40629.0
    24.8 +MinimumVisualStudioVersion = 10.0.40219.1
    24.9 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2_mixer-WinRT81", "SDL_mixer-WinRT81.vcxproj", "{3A833C7A-C776-4202-9DBD-BC879B23C605}"
   24.10 +EndProject
   24.11 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg_dynamic-WinRT81", "libogg_dynamic-WinRT81.vcxproj", "{6BC6349C-E355-4F1C-9290-FF755114A84B}"
   24.12 +EndProject
   24.13 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbis_dynamic-WinRT81", "libvorbis_dynamic-WinRT81.vcxproj", "{E3AB27F1-EB89-4C65-85DF-CB6A4F805753}"
   24.14 +EndProject
   24.15 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbisfile_dynamic-WinRT81", "libvorbisfile_dynamic-WinRT81.vcxproj", "{936B2819-2364-45D9-901D-52878914FAFA}"
   24.16 +EndProject
   24.17 +Global
   24.18 +	GlobalSection(SolutionConfigurationPlatforms) = preSolution
   24.19 +		Debug|ARM = Debug|ARM
   24.20 +		Debug|Win32 = Debug|Win32
   24.21 +		Debug|x64 = Debug|x64
   24.22 +		Release|ARM = Release|ARM
   24.23 +		Release|Win32 = Release|Win32
   24.24 +		Release|x64 = Release|x64
   24.25 +	EndGlobalSection
   24.26 +	GlobalSection(ProjectConfigurationPlatforms) = postSolution
   24.27 +		{3A833C7A-C776-4202-9DBD-BC879B23C605}.Debug|ARM.ActiveCfg = Debug|ARM
   24.28 +		{3A833C7A-C776-4202-9DBD-BC879B23C605}.Debug|ARM.Build.0 = Debug|ARM
   24.29 +		{3A833C7A-C776-4202-9DBD-BC879B23C605}.Debug|Win32.ActiveCfg = Debug|Win32
   24.30 +		{3A833C7A-C776-4202-9DBD-BC879B23C605}.Debug|Win32.Build.0 = Debug|Win32
   24.31 +		{3A833C7A-C776-4202-9DBD-BC879B23C605}.Debug|x64.ActiveCfg = Debug|x64
   24.32 +		{3A833C7A-C776-4202-9DBD-BC879B23C605}.Debug|x64.Build.0 = Debug|x64
   24.33 +		{3A833C7A-C776-4202-9DBD-BC879B23C605}.Release|ARM.ActiveCfg = Release|ARM
   24.34 +		{3A833C7A-C776-4202-9DBD-BC879B23C605}.Release|ARM.Build.0 = Release|ARM
   24.35 +		{3A833C7A-C776-4202-9DBD-BC879B23C605}.Release|Win32.ActiveCfg = Release|Win32
   24.36 +		{3A833C7A-C776-4202-9DBD-BC879B23C605}.Release|Win32.Build.0 = Release|Win32
   24.37 +		{3A833C7A-C776-4202-9DBD-BC879B23C605}.Release|x64.ActiveCfg = Release|x64
   24.38 +		{3A833C7A-C776-4202-9DBD-BC879B23C605}.Release|x64.Build.0 = Release|x64
   24.39 +		{6BC6349C-E355-4F1C-9290-FF755114A84B}.Debug|ARM.ActiveCfg = Debug|ARM
   24.40 +		{6BC6349C-E355-4F1C-9290-FF755114A84B}.Debug|ARM.Build.0 = Debug|ARM
   24.41 +		{6BC6349C-E355-4F1C-9290-FF755114A84B}.Debug|Win32.ActiveCfg = Debug|Win32
   24.42 +		{6BC6349C-E355-4F1C-9290-FF755114A84B}.Debug|Win32.Build.0 = Debug|Win32
   24.43 +		{6BC6349C-E355-4F1C-9290-FF755114A84B}.Debug|x64.ActiveCfg = Debug|x64
   24.44 +		{6BC6349C-E355-4F1C-9290-FF755114A84B}.Debug|x64.Build.0 = Debug|x64
   24.45 +		{6BC6349C-E355-4F1C-9290-FF755114A84B}.Release|ARM.ActiveCfg = Release|ARM
   24.46 +		{6BC6349C-E355-4F1C-9290-FF755114A84B}.Release|ARM.Build.0 = Release|ARM
   24.47 +		{6BC6349C-E355-4F1C-9290-FF755114A84B}.Release|Win32.ActiveCfg = Release|Win32
   24.48 +		{6BC6349C-E355-4F1C-9290-FF755114A84B}.Release|Win32.Build.0 = Release|Win32
   24.49 +		{6BC6349C-E355-4F1C-9290-FF755114A84B}.Release|x64.ActiveCfg = Release|x64
   24.50 +		{6BC6349C-E355-4F1C-9290-FF755114A84B}.Release|x64.Build.0 = Release|x64
   24.51 +		{E3AB27F1-EB89-4C65-85DF-CB6A4F805753}.Debug|ARM.ActiveCfg = Debug|ARM
   24.52 +		{E3AB27F1-EB89-4C65-85DF-CB6A4F805753}.Debug|ARM.Build.0 = Debug|ARM
   24.53 +		{E3AB27F1-EB89-4C65-85DF-CB6A4F805753}.Debug|Win32.ActiveCfg = Debug|Win32
   24.54 +		{E3AB27F1-EB89-4C65-85DF-CB6A4F805753}.Debug|Win32.Build.0 = Debug|Win32
   24.55 +		{E3AB27F1-EB89-4C65-85DF-CB6A4F805753}.Debug|x64.ActiveCfg = Debug|x64
   24.56 +		{E3AB27F1-EB89-4C65-85DF-CB6A4F805753}.Debug|x64.Build.0 = Debug|x64
   24.57 +		{E3AB27F1-EB89-4C65-85DF-CB6A4F805753}.Release|ARM.ActiveCfg = Release|ARM
   24.58 +		{E3AB27F1-EB89-4C65-85DF-CB6A4F805753}.Release|ARM.Build.0 = Release|ARM
   24.59 +		{E3AB27F1-EB89-4C65-85DF-CB6A4F805753}.Release|Win32.ActiveCfg = Release|Win32
   24.60 +		{E3AB27F1-EB89-4C65-85DF-CB6A4F805753}.Release|Win32.Build.0 = Release|Win32
   24.61 +		{E3AB27F1-EB89-4C65-85DF-CB6A4F805753}.Release|x64.ActiveCfg = Release|x64
   24.62 +		{E3AB27F1-EB89-4C65-85DF-CB6A4F805753}.Release|x64.Build.0 = Release|x64
   24.63 +		{936B2819-2364-45D9-901D-52878914FAFA}.Debug|ARM.ActiveCfg = Debug|ARM
   24.64 +		{936B2819-2364-45D9-901D-52878914FAFA}.Debug|ARM.Build.0 = Debug|ARM
   24.65 +		{936B2819-2364-45D9-901D-52878914FAFA}.Debug|Win32.ActiveCfg = Debug|Win32
   24.66 +		{936B2819-2364-45D9-901D-52878914FAFA}.Debug|Win32.Build.0 = Debug|Win32
   24.67 +		{936B2819-2364-45D9-901D-52878914FAFA}.Debug|x64.ActiveCfg = Debug|x64
   24.68 +		{936B2819-2364-45D9-901D-52878914FAFA}.Debug|x64.Build.0 = Debug|x64
   24.69 +		{936B2819-2364-45D9-901D-52878914FAFA}.Release|ARM.ActiveCfg = Release|ARM
   24.70 +		{936B2819-2364-45D9-901D-52878914FAFA}.Release|ARM.Build.0 = Release|ARM
   24.71 +		{936B2819-2364-45D9-901D-52878914FAFA}.Release|Win32.ActiveCfg = Release|Win32
   24.72 +		{936B2819-2364-45D9-901D-52878914FAFA}.Release|Win32.Build.0 = Release|Win32
   24.73 +		{936B2819-2364-45D9-901D-52878914FAFA}.Release|x64.ActiveCfg = Release|x64
   24.74 +		{936B2819-2364-45D9-901D-52878914FAFA}.Release|x64.Build.0 = Release|x64
   24.75 +	EndGlobalSection
   24.76 +	GlobalSection(SolutionProperties) = preSolution
   24.77 +		HideSolutionNode = FALSE
   24.78 +	EndGlobalSection
   24.79 +EndGlobal
    25.1 --- a/VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj	Mon Oct 16 02:16:47 2017 -0700
    25.2 +++ b/VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj	Tue Oct 17 02:33:47 2017 -0700
    25.3 @@ -27,49 +27,6 @@
    25.4      </ProjectConfiguration>
    25.5    </ItemGroup>
    25.6    <ItemGroup>
    25.7 -    <ClCompile Include="..\..\dynamic_flac.c" />
    25.8 -    <ClCompile Include="..\..\dynamic_fluidsynth.c" />
    25.9 -    <ClCompile Include="..\..\dynamic_mod.c" />
   25.10 -    <ClCompile Include="..\..\dynamic_mp3.c" />
   25.11 -    <ClCompile Include="..\..\dynamic_ogg.c" />
   25.12 -    <ClCompile Include="..\..\effects_internal.c" />
   25.13 -    <ClCompile Include="..\..\effect_position.c" />
   25.14 -    <ClCompile Include="..\..\effect_stereoreverse.c" />
   25.15 -    <ClCompile Include="..\..\fluidsynth.c" />
   25.16 -    <ClCompile Include="..\..\load_aiff.c" />
   25.17 -    <ClCompile Include="..\..\load_flac.c" />
   25.18 -    <ClCompile Include="..\..\load_ogg.c" />
   25.19 -    <ClCompile Include="..\..\load_voc.c" />
   25.20 -    <ClCompile Include="..\..\mixer.c" />
   25.21 -    <ClCompile Include="..\..\music.c" />
   25.22 -    <ClCompile Include="..\..\music_cmd.c" />
   25.23 -    <ClCompile Include="..\..\music_flac.c" />
   25.24 -    <ClCompile Include="..\..\music_mad.c" />
   25.25 -    <ClCompile Include="..\..\music_mod.c" />
   25.26 -    <ClCompile Include="..\..\music_ogg.c" />
   25.27 -    <ClCompile Include="..\..\wavestream.c" />
   25.28 -  </ItemGroup>
   25.29 -  <ItemGroup>
   25.30 -    <ClInclude Include="..\..\dynamic_flac.h" />
   25.31 -    <ClInclude Include="..\..\dynamic_fluidsynth.h" />
   25.32 -    <ClInclude Include="..\..\dynamic_mod.h" />
   25.33 -    <ClInclude Include="..\..\dynamic_mp3.h" />
   25.34 -    <ClInclude Include="..\..\dynamic_ogg.h" />
   25.35 -    <ClInclude Include="..\..\effects_internal.h" />
   25.36 -    <ClInclude Include="..\..\fluidsynth.h" />
   25.37 -    <ClInclude Include="..\..\load_aiff.h" />
   25.38 -    <ClInclude Include="..\..\load_flac.h" />
   25.39 -    <ClInclude Include="..\..\load_ogg.h" />
   25.40 -    <ClInclude Include="..\..\load_voc.h" />
   25.41 -    <ClInclude Include="..\..\music_cmd.h" />
   25.42 -    <ClInclude Include="..\..\music_flac.h" />
   25.43 -    <ClInclude Include="..\..\music_mad.h" />
   25.44 -    <ClInclude Include="..\..\music_mod.h" />
   25.45 -    <ClInclude Include="..\..\music_ogg.h" />
   25.46 -    <ClInclude Include="..\..\SDL_mixer.h" />
   25.47 -    <ClInclude Include="..\..\wavestream.h" />
   25.48 -  </ItemGroup>
   25.49 -  <ItemGroup>
   25.50      <ProjectReference Include="..\..\..\SDL\VisualC-WinRT\WinRT81_VS2013\SDL-WinRT81.vcxproj">
   25.51        <Project>{c8df6173-06a1-4f56-a9bc-2002596b30e9}</Project>
   25.52      </ProjectReference>
   25.53 @@ -83,6 +40,47 @@
   25.54        <Project>{e3ab27f1-eb89-4c65-85df-cb6a4f805753}</Project>
   25.55      </ProjectReference>
   25.56    </ItemGroup>
   25.57 +  <ItemGroup>
   25.58 +    <ClCompile Include="..\..\effects_internal.c" />
   25.59 +    <ClCompile Include="..\..\effect_position.c" />
   25.60 +    <ClCompile Include="..\..\effect_stereoreverse.c" />
   25.61 +    <ClCompile Include="..\..\load_aiff.c" />
   25.62 +    <ClCompile Include="..\..\load_voc.c" />
   25.63 +    <ClCompile Include="..\..\mixer.c" />
   25.64 +    <ClCompile Include="..\..\music.c" />
   25.65 +    <ClCompile Include="..\..\music_cmd.c" />
   25.66 +    <ClCompile Include="..\..\music_flac.c" />
   25.67 +    <ClCompile Include="..\..\music_fluidsynth.c" />
   25.68 +    <ClCompile Include="..\..\music_mad.c" />
   25.69 +    <ClCompile Include="..\..\music_mikmod.c" />
   25.70 +    <ClCompile Include="..\..\music_modplug.c" />
   25.71 +    <ClCompile Include="..\..\music_mpg123.c" />
   25.72 +    <ClCompile Include="..\..\music_nativemidi.c" />
   25.73 +    <ClCompile Include="..\..\music_ogg.c" />
   25.74 +    <ClCompile Include="..\..\music_smpeg.c" />
   25.75 +    <ClCompile Include="..\..\music_timidity.c" />
   25.76 +    <ClCompile Include="..\..\music_wav.c" />
   25.77 +  </ItemGroup>
   25.78 +  <ItemGroup>
   25.79 +    <ClInclude Include="..\..\effects_internal.h" />
   25.80 +    <ClInclude Include="..\..\load_aiff.h" />
   25.81 +    <ClInclude Include="..\..\load_voc.h" />
   25.82 +    <ClInclude Include="..\..\mixer.h" />
   25.83 +    <ClInclude Include="..\..\music.h" />
   25.84 +    <ClInclude Include="..\..\music_cmd.h" />
   25.85 +    <ClInclude Include="..\..\music_flac.h" />
   25.86 +    <ClInclude Include="..\..\music_fluidsynth.h" />
   25.87 +    <ClInclude Include="..\..\music_mad.h" />
   25.88 +    <ClInclude Include="..\..\music_mikmod.h" />
   25.89 +    <ClInclude Include="..\..\music_modplug.h" />
   25.90 +    <ClInclude Include="..\..\music_mpg123.h" />
   25.91 +    <ClInclude Include="..\..\music_nativemidi.h" />
   25.92 +    <ClInclude Include="..\..\music_ogg.h" />
   25.93 +    <ClInclude Include="..\..\music_smpeg.h" />
   25.94 +    <ClInclude Include="..\..\music_timidity.h" />
   25.95 +    <ClInclude Include="..\..\music_wav.h" />
   25.96 +    <ClInclude Include="..\..\SDL_mixer.h" />
   25.97 +  </ItemGroup>
   25.98    <PropertyGroup Label="Globals">
   25.99      <ProjectGuid>{3a833c7a-c776-4202-9dbd-bc879b23c605}</ProjectGuid>
  25.100      <Keyword>Win32Proj</Keyword>
  25.101 @@ -189,8 +187,8 @@
  25.102      <ClCompile>
  25.103        <PrecompiledHeader>NotUsing</PrecompiledHeader>
  25.104        <CompileAsWinRT>false</CompileAsWinRT>
  25.105 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  25.106 -      <PreprocessorDefinitions>WAV_MUSIC;OGG_MUSIC;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  25.107 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  25.108 +      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  25.109      </ClCompile>
  25.110      <Link>
  25.111        <SubSystem>Console</SubSystem>
  25.112 @@ -202,8 +200,8 @@
  25.113      <ClCompile>
  25.114        <PrecompiledHeader>NotUsing</PrecompiledHeader>
  25.115        <CompileAsWinRT>false</CompileAsWinRT>
  25.116 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  25.117 -      <PreprocessorDefinitions>WAV_MUSIC;OGG_MUSIC;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  25.118 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  25.119 +      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  25.120      </ClCompile>
  25.121      <Link>
  25.122        <SubSystem>Console</SubSystem>
  25.123 @@ -215,8 +213,8 @@
  25.124      <ClCompile>
  25.125        <PrecompiledHeader>NotUsing</PrecompiledHeader>
  25.126        <CompileAsWinRT>false</CompileAsWinRT>
  25.127 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  25.128 -      <PreprocessorDefinitions>WAV_MUSIC;OGG_MUSIC;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  25.129 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  25.130 +      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  25.131      </ClCompile>
  25.132      <Link>
  25.133        <SubSystem>Console</SubSystem>
  25.134 @@ -228,8 +226,8 @@
  25.135      <ClCompile>
  25.136        <PrecompiledHeader>NotUsing</PrecompiledHeader>
  25.137        <CompileAsWinRT>false</CompileAsWinRT>
  25.138 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  25.139 -      <PreprocessorDefinitions>WAV_MUSIC;OGG_MUSIC;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  25.140 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  25.141 +      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  25.142      </ClCompile>
  25.143      <Link>
  25.144        <SubSystem>Console</SubSystem>
  25.145 @@ -241,8 +239,8 @@
  25.146      <ClCompile>
  25.147        <PrecompiledHeader>NotUsing</PrecompiledHeader>
  25.148        <CompileAsWinRT>false</CompileAsWinRT>
  25.149 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  25.150 -      <PreprocessorDefinitions>WAV_MUSIC;OGG_MUSIC;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  25.151 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  25.152 +      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  25.153      </ClCompile>
  25.154      <Link>
  25.155        <SubSystem>Console</SubSystem>
  25.156 @@ -254,8 +252,8 @@
  25.157      <ClCompile>
  25.158        <PrecompiledHeader>NotUsing</PrecompiledHeader>
  25.159        <CompileAsWinRT>false</CompileAsWinRT>
  25.160 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;..\..\external\libvorbis-1.3.3\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  25.161 -      <PreprocessorDefinitions>WAV_MUSIC;OGG_MUSIC;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  25.162 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;..\..\external\libvorbis-1.3.5\include;..\..\..\SDL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  25.163 +      <PreprocessorDefinitions>MUSIC_WAV;MUSIC_OGG;OGG_DYNAMIC="libvorbisfile.dll";_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  25.164      </ClCompile>
  25.165      <Link>
  25.166        <SubSystem>Console</SubSystem>
  25.167 @@ -266,4 +264,4 @@
  25.168    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  25.169    <ImportGroup Label="ExtensionTargets">
  25.170    </ImportGroup>
  25.171 -</Project>
  25.172 \ No newline at end of file
  25.173 +</Project>
    26.1 --- a/VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj.filters	Mon Oct 16 02:16:47 2017 -0700
    26.2 +++ b/VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj.filters	Tue Oct 17 02:33:47 2017 -0700
    26.3 @@ -1,46 +1,44 @@
    26.4  <?xml version="1.0" encoding="utf-8"?>
    26.5  <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    26.6    <ItemGroup>
    26.7 -    <ClCompile Include="..\..\dynamic_flac.c" />
    26.8 -    <ClCompile Include="..\..\dynamic_fluidsynth.c" />
    26.9 -    <ClCompile Include="..\..\dynamic_mod.c" />
   26.10 -    <ClCompile Include="..\..\dynamic_mp3.c" />
   26.11 -    <ClCompile Include="..\..\dynamic_ogg.c" />
   26.12      <ClCompile Include="..\..\effect_position.c" />
   26.13      <ClCompile Include="..\..\effect_stereoreverse.c" />
   26.14      <ClCompile Include="..\..\effects_internal.c" />
   26.15 -    <ClCompile Include="..\..\fluidsynth.c" />
   26.16      <ClCompile Include="..\..\load_aiff.c" />
   26.17 -    <ClCompile Include="..\..\load_flac.c" />
   26.18 -    <ClCompile Include="..\..\load_ogg.c" />
   26.19      <ClCompile Include="..\..\load_voc.c" />
   26.20      <ClCompile Include="..\..\mixer.c" />
   26.21      <ClCompile Include="..\..\music.c" />
   26.22      <ClCompile Include="..\..\music_cmd.c" />
   26.23      <ClCompile Include="..\..\music_flac.c" />
   26.24 +    <ClCompile Include="..\..\music_fluidsynth.c" />
   26.25      <ClCompile Include="..\..\music_mad.c" />
   26.26 -    <ClCompile Include="..\..\music_mod.c" />
   26.27 +    <ClCompile Include="..\..\music_mikmod.c" />
   26.28 +    <ClCompile Include="..\..\music_modplug.c" />
   26.29 +    <ClCompile Include="..\..\music_mpg123.c" />
   26.30 +    <ClCompile Include="..\..\music_nativemidi.c" />
   26.31      <ClCompile Include="..\..\music_ogg.c" />
   26.32 -    <ClCompile Include="..\..\wavestream.c" />
   26.33 +    <ClCompile Include="..\..\music_smpeg.c" />
   26.34 +    <ClCompile Include="..\..\music_timidity.c" />
   26.35 +    <ClCompile Include="..\..\music_wav.c" />
   26.36    </ItemGroup>
   26.37    <ItemGroup>
   26.38 -    <ClInclude Include="..\..\dynamic_flac.h" />
   26.39 -    <ClInclude Include="..\..\dynamic_fluidsynth.h" />
   26.40 -    <ClInclude Include="..\..\dynamic_mod.h" />
   26.41 -    <ClInclude Include="..\..\dynamic_mp3.h" />
   26.42 -    <ClInclude Include="..\..\dynamic_ogg.h" />
   26.43      <ClInclude Include="..\..\effects_internal.h" />
   26.44 -    <ClInclude Include="..\..\fluidsynth.h" />
   26.45      <ClInclude Include="..\..\load_aiff.h" />
   26.46 -    <ClInclude Include="..\..\load_flac.h" />
   26.47 -    <ClInclude Include="..\..\load_ogg.h" />
   26.48      <ClInclude Include="..\..\load_voc.h" />
   26.49 +    <ClInclude Include="..\..\mixer.h" />
   26.50 +    <ClInclude Include="..\..\music.h" />
   26.51      <ClInclude Include="..\..\music_cmd.h" />
   26.52      <ClInclude Include="..\..\music_flac.h" />
   26.53 +    <ClInclude Include="..\..\music_fluidsynth.h" />
   26.54      <ClInclude Include="..\..\music_mad.h" />
   26.55 -    <ClInclude Include="..\..\music_mod.h" />
   26.56 +    <ClInclude Include="..\..\music_mikmod.h" />
   26.57 +    <ClInclude Include="..\..\music_modplug.h" />
   26.58 +    <ClInclude Include="..\..\music_mpg123.h" />
   26.59 +    <ClInclude Include="..\..\music_nativemidi.h" />
   26.60      <ClInclude Include="..\..\music_ogg.h" />
   26.61 +    <ClInclude Include="..\..\music_smpeg.h" />
   26.62 +    <ClInclude Include="..\..\music_timidity.h" />
   26.63 +    <ClInclude Include="..\..\music_wav.h" />
   26.64      <ClInclude Include="..\..\SDL_mixer.h" />
   26.65 -    <ClInclude Include="..\..\wavestream.h" />
   26.66    </ItemGroup>
   26.67  </Project>
   26.68 \ No newline at end of file
    27.1 --- a/VisualC-WinRT/WinRT81_VS2013/libogg_dynamic-WinRT81.vcxproj	Mon Oct 16 02:16:47 2017 -0700
    27.2 +++ b/VisualC-WinRT/WinRT81_VS2013/libogg_dynamic-WinRT81.vcxproj	Tue Oct 17 02:33:47 2017 -0700
    27.3 @@ -27,15 +27,15 @@
    27.4      </ProjectConfiguration>
    27.5    </ItemGroup>
    27.6    <ItemGroup>
    27.7 -    <ClCompile Include="..\..\external\libogg-1.3.1\src\bitwise.c" />
    27.8 -    <ClCompile Include="..\..\external\libogg-1.3.1\src\framing.c" />
    27.9 +    <ClCompile Include="..\..\external\libogg-1.3.2\src\bitwise.c" />
   27.10 +    <ClCompile Include="..\..\external\libogg-1.3.2\src\framing.c" />
   27.11    </ItemGroup>
   27.12    <ItemGroup>
   27.13 -    <None Include="..\..\external\libogg-1.3.1\win32\ogg.def" />
   27.14 +    <None Include="..\..\external\libogg-1.3.2\win32\ogg.def" />
   27.15    </ItemGroup>
   27.16    <ItemGroup>
   27.17 -    <ClInclude Include="..\..\external\libogg-1.3.1\include\ogg\ogg.h" />
   27.18 -    <ClInclude Include="..\..\external\libogg-1.3.1\include\ogg\os_types.h" />
   27.19 +    <ClInclude Include="..\..\external\libogg-1.3.2\include\ogg\ogg.h" />
   27.20 +    <ClInclude Include="..\..\external\libogg-1.3.2\include\ogg\os_types.h" />
   27.21    </ItemGroup>
   27.22    <PropertyGroup Label="Globals">
   27.23      <ProjectGuid>{6bc6349c-e355-4f1c-9290-ff755114a84b}</ProjectGuid>
   27.24 @@ -143,7 +143,7 @@
   27.25      <ClCompile>
   27.26        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   27.27        <CompileAsWinRT>false</CompileAsWinRT>
   27.28 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   27.29 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   27.30        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   27.31        <DisableSpecificWarnings>4244</DisableSpecificWarnings>
   27.32      </ClCompile>
   27.33 @@ -151,14 +151,14 @@
   27.34        <SubSystem>Console</SubSystem>
   27.35        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
   27.36        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
   27.37 -      <ModuleDefinitionFile>..\..\external\libogg-1.3.1\win32\ogg.def</ModuleDefinitionFile>
   27.38 +      <ModuleDefinitionFile>..\..\external\libogg-1.3.2\win32\ogg.def</ModuleDefinitionFile>
   27.39      </Link>
   27.40    </ItemDefinitionGroup>
   27.41    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   27.42      <ClCompile>
   27.43        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   27.44        <CompileAsWinRT>false</CompileAsWinRT>
   27.45 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   27.46 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   27.47        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   27.48        <DisableSpecificWarnings>4244</DisableSpecificWarnings>
   27.49      </ClCompile>
   27.50 @@ -166,14 +166,14 @@
   27.51        <SubSystem>Console</SubSystem>
   27.52        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
   27.53        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
   27.54 -      <ModuleDefinitionFile>..\..\external\libogg-1.3.1\win32\ogg.def</ModuleDefinitionFile>
   27.55 +      <ModuleDefinitionFile>..\..\external\libogg-1.3.2\win32\ogg.def</ModuleDefinitionFile>
   27.56      </Link>
   27.57    </ItemDefinitionGroup>
   27.58    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
   27.59      <ClCompile>
   27.60        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   27.61        <CompileAsWinRT>false</CompileAsWinRT>
   27.62 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   27.63 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   27.64        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   27.65        <DisableSpecificWarnings>4244</DisableSpecificWarnings>
   27.66      </ClCompile>
   27.67 @@ -181,14 +181,14 @@
   27.68        <SubSystem>Console</SubSystem>
   27.69        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
   27.70        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
   27.71 -      <ModuleDefinitionFile>..\..\external\libogg-1.3.1\win32\ogg.def</ModuleDefinitionFile>
   27.72 +      <ModuleDefinitionFile>..\..\external\libogg-1.3.2\win32\ogg.def</ModuleDefinitionFile>
   27.73      </Link>
   27.74    </ItemDefinitionGroup>
   27.75    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
   27.76      <ClCompile>
   27.77        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   27.78        <CompileAsWinRT>false</CompileAsWinRT>
   27.79 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   27.80 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   27.81        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   27.82        <DisableSpecificWarnings>4244</DisableSpecificWarnings>
   27.83      </ClCompile>
   27.84 @@ -196,14 +196,14 @@
   27.85        <SubSystem>Console</SubSystem>
   27.86        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
   27.87        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
   27.88 -      <ModuleDefinitionFile>..\..\external\libogg-1.3.1\win32\ogg.def</ModuleDefinitionFile>
   27.89 +      <ModuleDefinitionFile>..\..\external\libogg-1.3.2\win32\ogg.def</ModuleDefinitionFile>
   27.90      </Link>
   27.91    </ItemDefinitionGroup>
   27.92    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
   27.93      <ClCompile>
   27.94        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   27.95        <CompileAsWinRT>false</CompileAsWinRT>
   27.96 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   27.97 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   27.98        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   27.99        <DisableSpecificWarnings>4244</DisableSpecificWarnings>
  27.100      </ClCompile>
  27.101 @@ -211,14 +211,14 @@
  27.102        <SubSystem>Console</SubSystem>
  27.103        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
  27.104        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
  27.105 -      <ModuleDefinitionFile>..\..\external\libogg-1.3.1\win32\ogg.def</ModuleDefinitionFile>
  27.106 +      <ModuleDefinitionFile>..\..\external\libogg-1.3.2\win32\ogg.def</ModuleDefinitionFile>
  27.107      </Link>
  27.108    </ItemDefinitionGroup>
  27.109    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
  27.110      <ClCompile>
  27.111        <PrecompiledHeader>NotUsing</PrecompiledHeader>
  27.112        <CompileAsWinRT>false</CompileAsWinRT>
  27.113 -      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  27.114 +      <AdditionalIncludeDirectories>..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  27.115        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;LIBOGG_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  27.116        <DisableSpecificWarnings>4244</DisableSpecificWarnings>
  27.117      </ClCompile>
  27.118 @@ -226,10 +226,10 @@
  27.119        <SubSystem>Console</SubSystem>
  27.120        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
  27.121        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
  27.122 -      <ModuleDefinitionFile>..\..\external\libogg-1.3.1\win32\ogg.def</ModuleDefinitionFile>
  27.123 +      <ModuleDefinitionFile>..\..\external\libogg-1.3.2\win32\ogg.def</ModuleDefinitionFile>
  27.124      </Link>
  27.125    </ItemDefinitionGroup>
  27.126    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  27.127    <ImportGroup Label="ExtensionTargets">
  27.128    </ImportGroup>
  27.129 -</Project>
  27.130 \ No newline at end of file
  27.131 +</Project>
    28.1 --- a/VisualC-WinRT/WinRT81_VS2013/libvorbis_dynamic-WinRT81.vcxproj	Mon Oct 16 02:16:47 2017 -0700
    28.2 +++ b/VisualC-WinRT/WinRT81_VS2013/libvorbis_dynamic-WinRT81.vcxproj	Tue Oct 17 02:33:47 2017 -0700
    28.3 @@ -27,74 +27,74 @@
    28.4      </ProjectConfiguration>
    28.5    </ItemGroup>
    28.6    <ItemGroup>
    28.7 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\analysis.c" />
    28.8 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\bitrate.c" />
    28.9 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\block.c" />
   28.10 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\codebook.c" />
   28.11 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\envelope.c" />
   28.12 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\floor0.c" />
   28.13 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\floor1.c" />
   28.14 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\info.c" />
   28.15 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\lookup.c" />
   28.16 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\lpc.c" />
   28.17 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\lsp.c" />
   28.18 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\mapping0.c" />
   28.19 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\mdct.c" />
   28.20 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\psy.c" />
   28.21 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\registry.c" />
   28.22 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\res0.c" />
   28.23 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\sharedbook.c" />
   28.24 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\smallft.c" />
   28.25 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\synthesis.c" />
   28.26 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\vorbisenc.c" />
   28.27 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\window.c" />
   28.28 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\analysis.c" />
   28.29 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\bitrate.c" />
   28.30 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\block.c" />
   28.31 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\codebook.c" />
   28.32 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\envelope.c" />
   28.33 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\floor0.c" />
   28.34 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\floor1.c" />
   28.35 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\info.c" />
   28.36 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\lookup.c" />
   28.37 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\lpc.c" />
   28.38 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\lsp.c" />
   28.39 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\mapping0.c" />
   28.40 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\mdct.c" />
   28.41 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\psy.c" />
   28.42 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\registry.c" />
   28.43 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\res0.c" />
   28.44 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\sharedbook.c" />
   28.45 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\smallft.c" />
   28.46 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\synthesis.c" />
   28.47 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\vorbisenc.c" />
   28.48 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\window.c" />
   28.49    </ItemGroup>
   28.50    <ItemGroup>
   28.51 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\include\vorbis\codec.h" />
   28.52 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\include\vorbis\vorbisenc.h" />
   28.53 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\include\vorbis\vorbisfile.h" />
   28.54 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\backends.h" />
   28.55 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\bitrate.h" />
   28.56 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\books\coupled\res_books_stereo.h" />
   28.57 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\books\floor\floor_books.h" />
   28.58 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\books\uncoupled\res_books_uncoupled.h" />
   28.59 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\codebook.h" />
   28.60 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\codec_internal.h" />
   28.61 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\envelope.h" />
   28.62 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\highlevel.h" />
   28.63 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\lookup.h" />
   28.64 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\lookup_data.h" />
   28.65 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\lpc.h" />
   28.66 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\lsp.h" />
   28.67 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\masking.h" />
   28.68 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\mdct.h" />
   28.69 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\misc.h" />
   28.70 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\floor_all.h" />
   28.71 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\psych_11.h" />
   28.72 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\psych_16.h" />
   28.73 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\psych_44.h" />
   28.74 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\psych_8.h" />
   28.75 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\residue_16.h" />
   28.76 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\residue_44.h" />
   28.77 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\residue_44u.h" />
   28.78 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\residue_8.h" />
   28.79 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_11.h" />
   28.80 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_16.h" />
   28.81 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_22.h" />
   28.82 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_32.h" />
   28.83 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_44.h" />
   28.84 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_44u.h" />
   28.85 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_8.h" />
   28.86 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\modes\setup_X.h" />
   28.87 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\os.h" />
   28.88 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\psy.h" />
   28.89 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\registry.h" />
   28.90 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\scales.h" />
   28.91 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\smallft.h" />
   28.92 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\lib\window.h" />
   28.93 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\include\vorbis\codec.h" />
   28.94 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\include\vorbis\vorbisenc.h" />
   28.95 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\include\vorbis\vorbisfile.h" />
   28.96 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\backends.h" />
   28.97 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\bitrate.h" />
   28.98 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\books\coupled\res_books_stereo.h" />
   28.99 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\books\floor\floor_books.h" />
  28.100 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\books\uncoupled\res_books_uncoupled.h" />
  28.101 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\codebook.h" />
  28.102 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\codec_internal.h" />
  28.103 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\envelope.h" />
  28.104 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\highlevel.h" />
  28.105 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\lookup.h" />
  28.106 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\lookup_data.h" />
  28.107 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\lpc.h" />
  28.108 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\lsp.h" />
  28.109 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\masking.h" />
  28.110 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\mdct.h" />
  28.111 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\misc.h" />
  28.112 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\floor_all.h" />
  28.113 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\psych_11.h" />
  28.114 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\psych_16.h" />
  28.115 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\psych_44.h" />
  28.116 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\psych_8.h" />
  28.117 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\residue_16.h" />
  28.118 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\residue_44.h" />
  28.119 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\residue_44u.h" />
  28.120 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\residue_8.h" />
  28.121 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_11.h" />
  28.122 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_16.h" />
  28.123 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_22.h" />
  28.124 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_32.h" />
  28.125 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_44.h" />
  28.126 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_44u.h" />
  28.127 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_8.h" />
  28.128 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\modes\setup_X.h" />
  28.129 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\os.h" />
  28.130 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\psy.h" />
  28.131 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\registry.h" />
  28.132 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\scales.h" />
  28.133 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\smallft.h" />
  28.134 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\lib\window.h" />
  28.135    </ItemGroup>
  28.136    <ItemGroup>
  28.137 -    <None Include="..\..\external\libvorbis-1.3.3\win32\vorbis.def" />
  28.138 +    <None Include="..\..\external\libvorbis-1.3.5\win32\vorbis.def" />
  28.139    </ItemGroup>
  28.140    <ItemGroup>
  28.141      <ProjectReference Include="libogg_dynamic-WinRT81.vcxproj">
  28.142 @@ -207,7 +207,7 @@
  28.143      <ClCompile>
  28.144        <PrecompiledHeader>NotUsing</PrecompiledHeader>
  28.145        <CompileAsWinRT>false</CompileAsWinRT>
  28.146 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  28.147 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  28.148        <PreprocessorDefinitions>LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  28.149        <DisableSpecificWarnings>4244;4100;4267;4189;4305;4127;4706</DisableSpecificWarnings>
  28.150      </ClCompile>
  28.151 @@ -215,14 +215,14 @@
  28.152        <SubSystem>Console</SubSystem>
  28.153        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
  28.154        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
  28.155 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbis.def</ModuleDefinitionFile>
  28.156 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbis.def</ModuleDefinitionFile>
  28.157      </Link>
  28.158    </ItemDefinitionGroup>
  28.159    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
  28.160      <ClCompile>
  28.161        <PrecompiledHeader>NotUsing</PrecompiledHeader>
  28.162        <CompileAsWinRT>false</CompileAsWinRT>
  28.163 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  28.164 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  28.165        <PreprocessorDefinitions>LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  28.166        <DisableSpecificWarnings>4244;4100;4267;4189;4305;4127;4706</DisableSpecificWarnings>
  28.167      </ClCompile>
  28.168 @@ -230,14 +230,14 @@
  28.169        <SubSystem>Console</SubSystem>
  28.170        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
  28.171        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
  28.172 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbis.def</ModuleDefinitionFile>
  28.173 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbis.def</ModuleDefinitionFile>
  28.174      </Link>
  28.175    </ItemDefinitionGroup>
  28.176    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
  28.177      <ClCompile>
  28.178        <PrecompiledHeader>NotUsing</PrecompiledHeader>
  28.179        <CompileAsWinRT>false</CompileAsWinRT>
  28.180 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  28.181 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  28.182        <PreprocessorDefinitions>LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WIN32_WCE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  28.183        <DisableSpecificWarnings>4244;4100;4267;4189;4305;4127;4706</DisableSpecificWarnings>
  28.184      </ClCompile>
  28.185 @@ -245,14 +245,14 @@
  28.186        <SubSystem>Console</SubSystem>
  28.187        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
  28.188        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
  28.189 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbis.def</ModuleDefinitionFile>
  28.190 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbis.def</ModuleDefinitionFile>
  28.191      </Link>
  28.192    </ItemDefinitionGroup>
  28.193    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
  28.194      <ClCompile>
  28.195        <PrecompiledHeader>NotUsing</PrecompiledHeader>
  28.196        <CompileAsWinRT>false</CompileAsWinRT>
  28.197 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  28.198 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  28.199        <PreprocessorDefinitions>LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;_WIN32_WCE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  28.200        <DisableSpecificWarnings>4244;4100;4267;4189;4305;4127;4706</DisableSpecificWarnings>
  28.201      </ClCompile>
  28.202 @@ -260,14 +260,14 @@
  28.203        <SubSystem>Console</SubSystem>
  28.204        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
  28.205        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
  28.206 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbis.def</ModuleDefinitionFile>
  28.207 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbis.def</ModuleDefinitionFile>
  28.208      </Link>
  28.209    </ItemDefinitionGroup>
  28.210    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
  28.211      <ClCompile>
  28.212        <PrecompiledHeader>NotUsing</PrecompiledHeader>
  28.213        <CompileAsWinRT>false</CompileAsWinRT>
  28.214 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  28.215 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  28.216        <PreprocessorDefinitions>LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  28.217        <DisableSpecificWarnings>4244;4100;4267;4189;4305;4127;4706</DisableSpecificWarnings>
  28.218      </ClCompile>
  28.219 @@ -275,14 +275,14 @@
  28.220        <SubSystem>Console</SubSystem>
  28.221        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
  28.222        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
  28.223 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbis.def</ModuleDefinitionFile>
  28.224 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbis.def</ModuleDefinitionFile>
  28.225      </Link>
  28.226    </ItemDefinitionGroup>
  28.227    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
  28.228      <ClCompile>
  28.229        <PrecompiledHeader>NotUsing</PrecompiledHeader>
  28.230        <CompileAsWinRT>false</CompileAsWinRT>
  28.231 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  28.232 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  28.233        <PreprocessorDefinitions>LIBVORBIS_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  28.234        <DisableSpecificWarnings>4244;4100;4267;4189;4305;4127;4706</DisableSpecificWarnings>
  28.235      </ClCompile>
  28.236 @@ -290,10 +290,10 @@
  28.237        <SubSystem>Console</SubSystem>
  28.238        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
  28.239        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
  28.240 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbis.def</ModuleDefinitionFile>
  28.241 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbis.def</ModuleDefinitionFile>
  28.242      </Link>
  28.243    </ItemDefinitionGroup>
  28.244    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  28.245    <ImportGroup Label="ExtensionTargets">
  28.246    </ImportGroup>
  28.247 -</Project>
  28.248 \ No newline at end of file
  28.249 +</Project>
    29.1 --- a/VisualC-WinRT/WinRT81_VS2013/libvorbisfile_dynamic-WinRT81.vcxproj	Mon Oct 16 02:16:47 2017 -0700
    29.2 +++ b/VisualC-WinRT/WinRT81_VS2013/libvorbisfile_dynamic-WinRT81.vcxproj	Tue Oct 17 02:33:47 2017 -0700
    29.3 @@ -27,10 +27,10 @@
    29.4      </ProjectConfiguration>
    29.5    </ItemGroup>
    29.6    <ItemGroup>
    29.7 -    <ClCompile Include="..\..\external\libvorbis-1.3.3\lib\vorbisfile.c" />
    29.8 +    <ClCompile Include="..\..\external\libvorbis-1.3.5\lib\vorbisfile.c" />
    29.9    </ItemGroup>
   29.10    <ItemGroup>
   29.11 -    <ClInclude Include="..\..\external\libvorbis-1.3.3\include\vorbis\vorbisfile.h" />
   29.12 +    <ClInclude Include="..\..\external\libvorbis-1.3.5\include\vorbis\vorbisfile.h" />
   29.13    </ItemGroup>
   29.14    <ItemGroup>
   29.15      <ProjectReference Include="libogg_dynamic-WinRT81.vcxproj">
   29.16 @@ -146,7 +146,7 @@
   29.17      <ClCompile>
   29.18        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   29.19        <CompileAsWinRT>false</CompileAsWinRT>
   29.20 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   29.21 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   29.22        <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   29.23        <DisableSpecificWarnings>4244;4101</DisableSpecificWarnings>
   29.24      </ClCompile>
   29.25 @@ -154,14 +154,14 @@
   29.26        <SubSystem>Console</SubSystem>
   29.27        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
   29.28        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
   29.29 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbisfile.def</ModuleDefinitionFile>
   29.30 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbisfile.def</ModuleDefinitionFile>
   29.31      </Link>
   29.32    </ItemDefinitionGroup>
   29.33    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
   29.34      <ClCompile>
   29.35        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   29.36        <CompileAsWinRT>false</CompileAsWinRT>
   29.37 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   29.38 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   29.39        <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   29.40        <DisableSpecificWarnings>4244;4101</DisableSpecificWarnings>
   29.41      </ClCompile>
   29.42 @@ -169,14 +169,14 @@
   29.43        <SubSystem>Console</SubSystem>
   29.44        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
   29.45        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
   29.46 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbisfile.def</ModuleDefinitionFile>
   29.47 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbisfile.def</ModuleDefinitionFile>
   29.48      </Link>
   29.49    </ItemDefinitionGroup>
   29.50    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
   29.51      <ClCompile>
   29.52        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   29.53        <CompileAsWinRT>false</CompileAsWinRT>
   29.54 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   29.55 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   29.56        <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WIN32_WCE;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   29.57        <DisableSpecificWarnings>4244;4101</DisableSpecificWarnings>
   29.58      </ClCompile>
   29.59 @@ -184,14 +184,14 @@
   29.60        <SubSystem>Console</SubSystem>
   29.61        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
   29.62        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
   29.63 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbisfile.def</ModuleDefinitionFile>
   29.64 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbisfile.def</ModuleDefinitionFile>
   29.65      </Link>
   29.66    </ItemDefinitionGroup>
   29.67    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
   29.68      <ClCompile>
   29.69        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   29.70        <CompileAsWinRT>false</CompileAsWinRT>
   29.71 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   29.72 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   29.73        <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WIN32_WCE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   29.74        <DisableSpecificWarnings>4244;4101</DisableSpecificWarnings>
   29.75      </ClCompile>
   29.76 @@ -199,14 +199,14 @@
   29.77        <SubSystem>Console</SubSystem>
   29.78        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
   29.79        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
   29.80 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbisfile.def</ModuleDefinitionFile>
   29.81 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbisfile.def</ModuleDefinitionFile>
   29.82      </Link>
   29.83    </ItemDefinitionGroup>
   29.84    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
   29.85      <ClCompile>
   29.86        <PrecompiledHeader>NotUsing</PrecompiledHeader>
   29.87        <CompileAsWinRT>false</CompileAsWinRT>
   29.88 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   29.89 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   29.90        <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   29.91        <DisableSpecificWarnings>4244;4101</DisableSpecificWarnings>
   29.92      </ClCompile>
   29.93 @@ -214,14 +214,14 @@
   29.94        <SubSystem>Console</SubSystem>
   29.95        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
   29.96        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
   29.97 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbisfile.def</ModuleDefinitionFile>
   29.98 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbisfile.def</ModuleDefinitionFile>
   29.99      </Link>
  29.100    </ItemDefinitionGroup>
  29.101    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
  29.102      <ClCompile>
  29.103        <PrecompiledHeader>NotUsing</PrecompiledHeader>
  29.104        <CompileAsWinRT>false</CompileAsWinRT>
  29.105 -      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.3\include;..\..\external\libogg-1.3.1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  29.106 +      <AdditionalIncludeDirectories>..\..\external\libvorbis-1.3.5\include;..\..\external\libogg-1.3.2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  29.107        <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  29.108        <DisableSpecificWarnings>4244;4101</DisableSpecificWarnings>
  29.109      </ClCompile>
  29.110 @@ -229,10 +229,10 @@
  29.111        <SubSystem>Console</SubSystem>
  29.112        <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
  29.113        <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
  29.114 -      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.3\win32\vorbisfile.def</ModuleDefinitionFile>
  29.115 +      <ModuleDefinitionFile>..\..\external\libvorbis-1.3.5\win32\vorbisfile.def</ModuleDefinitionFile>
  29.116      </Link>
  29.117    </ItemDefinitionGroup>
  29.118    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  29.119    <ImportGroup Label="ExtensionTargets">
  29.120    </ImportGroup>
  29.121 -</Project>
  29.122 \ No newline at end of file
  29.123 +</Project>
    30.1 --- a/VisualC/SDL_mixer.vcxproj	Mon Oct 16 02:16:47 2017 -0700
    30.2 +++ b/VisualC/SDL_mixer.vcxproj	Tue Oct 17 02:33:47 2017 -0700
    30.3 @@ -93,7 +93,7 @@
    30.4        <AdditionalOptions>/D OGG_DYNAMIC=\"libvorbisfile-3.dll\" %(AdditionalOptions)</AdditionalOptions>
    30.5        <Optimization>Disabled</Optimization>
    30.6        <AdditionalIncludeDirectories>..\timidity;..\native_midi;external\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    30.7 -      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MODPLUG_MUSIC;MODPLUG_DYNAMIC="libmodplug-1.dll";OGG_MUSIC;OGG_DYNAMIC="libvorbisfile-3.dll";FLAC_MUSIC;FLAC_DYNAMIC="libFLAC-8.dll";MP3_MUSIC;MP3_DYNAMIC="smpeg2.dll";MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    30.8 +      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_MOD_MODPLUG;MODPLUG_DYNAMIC="libmodplug-1.dll";MUSIC_OGG;OGG_DYNAMIC="libvorbisfile-3.dll";MUSIC_FLAC;FLAC_DYNAMIC="libFLAC-8.dll";MUSIC_MP3_SMPEG;SMPEG_DYNAMIC="smpeg2.dll";MUSIC_MID;MUSIC_MID_TIMIDITY;MUSIC_MID_NATIVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    30.9        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   30.10        <WarningLevel>Level3</WarningLevel>
   30.11        <DebugInformationFormat>OldStyle</DebugInformationFormat>
   30.12 @@ -123,7 +123,7 @@
   30.13        <AdditionalOptions>/D OGG_DYNAMIC=\"libvorbisfile-3.dll\" %(AdditionalOptions)</AdditionalOptions>
   30.14        <Optimization>Disabled</Optimization>
   30.15        <AdditionalIncludeDirectories>..\timidity;..\native_midi;external\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   30.16 -      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MODPLUG_MUSIC;MODPLUG_DYNAMIC="libmodplug-1.dll";OGG_MUSIC;OGG_DYNAMIC="libvorbisfile-3.dll";FLAC_MUSIC;FLAC_DYNAMIC="libFLAC-8.dll";MP3_MUSIC;MP3_DYNAMIC="smpeg2.dll";MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   30.17 +      <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_MOD_MODPLUG;MODPLUG_DYNAMIC="libmodplug-1.dll";MUSIC_OGG;OGG_DYNAMIC="libvorbisfile-3.dll";MUSIC_FLAC;FLAC_DYNAMIC="libFLAC-8.dll";MUSIC_MP3_SMPEG;SMPEG_DYNAMIC="smpeg2.dll";MUSIC_MID;MUSIC_MID_TIMIDITY;MUSIC_MID_NATIVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   30.18        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   30.19        <WarningLevel>Level3</WarningLevel>
   30.20        <DebugInformationFormat>OldStyle</DebugInformationFormat>
   30.21 @@ -152,7 +152,7 @@
   30.22      <ClCompile>
   30.23        <AdditionalOptions>/D OGG_DYNAMIC=\"libvorbisfile-3.dll\" %(AdditionalOptions)</AdditionalOptions>
   30.24        <AdditionalIncludeDirectories>..\timidity;..\native_midi;external\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   30.25 -      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MODPLUG_MUSIC;MODPLUG_DYNAMIC="libmodplug-1.dll";OGG_MUSIC;OGG_DYNAMIC="libvorbisfile-3.dll";FLAC_MUSIC;FLAC_DYNAMIC="libFLAC-8.dll";MP3_MUSIC;MP3_DYNAMIC="smpeg2.dll";MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   30.26 +      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_MOD_MODPLUG;MODPLUG_DYNAMIC="libmodplug-1.dll";MUSIC_OGG;OGG_DYNAMIC="libvorbisfile-3.dll";MUSIC_FLAC;FLAC_DYNAMIC="libFLAC-8.dll";MUSIC_MP3_SMPEG;SMPEG_DYNAMIC="smpeg2.dll";MUSIC_MID;MUSIC_MID_TIMIDITY;MUSIC_MID_NATIVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   30.27        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   30.28        <WarningLevel>Level3</WarningLevel>
   30.29        <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
   30.30 @@ -179,7 +179,7 @@
   30.31      <ClCompile>
   30.32        <AdditionalOptions>/D OGG_DYNAMIC=\"libvorbisfile-3.dll\" %(AdditionalOptions)</AdditionalOptions>
   30.33        <AdditionalIncludeDirectories>..\timidity;..\native_midi;external\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   30.34 -      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;WAV_MUSIC;MODPLUG_MUSIC;MODPLUG_DYNAMIC="libmodplug-1.dll";OGG_MUSIC;OGG_DYNAMIC="libvorbisfile-3.dll";FLAC_MUSIC;FLAC_DYNAMIC="libFLAC-8.dll";MP3_MUSIC;MP3_DYNAMIC="smpeg2.dll";MID_MUSIC;USE_TIMIDITY_MIDI;USE_NATIVE_MIDI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   30.35 +      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_CRT_SECURE_NO_WARNINGS;MUSIC_WAV;MUSIC_MOD_MODPLUG;MODPLUG_DYNAMIC="libmodplug-1.dll";MUSIC_OGG;OGG_DYNAMIC="libvorbisfile-3.dll";MUSIC_FLAC;FLAC_DYNAMIC="libFLAC-8.dll";MUSIC_MP3_SMPEG;SMPEG_DYNAMIC="smpeg2.dll";MUSIC_MID;MUSIC_MID_TIMIDITY;MUSIC_MID_NATIVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
   30.36        <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
   30.37        <WarningLevel>Level3</WarningLevel>
   30.38        <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
   30.39 @@ -194,53 +194,24 @@
   30.40      <Bscmake />
   30.41    </ItemDefinitionGroup>
   30.42    <ItemGroup>
   30.43 -    <ClCompile Include="..\dynamic_flac.c" />
   30.44 -    <ClCompile Include="..\dynamic_fluidsynth.c" />
   30.45 -    <ClCompile Include="..\dynamic_mod.c" />
   30.46 -    <ClCompile Include="..\dynamic_modplug.c" />
   30.47 -    <ClCompile Include="..\dynamic_mp3.c" />
   30.48 -    <ClCompile Include="..\dynamic_ogg.c" />
   30.49 -    <ClCompile Include="..\effect_position.c" />
   30.50 -    <ClCompile Include="..\effect_stereoreverse.c" />
   30.51 -    <ClCompile Include="..\effects_internal.c" />
   30.52 -    <ClCompile Include="..\fluidsynth.c" />
   30.53 -    <ClCompile Include="..\load_aiff.c" />
   30.54 -    <ClCompile Include="..\load_flac.c" />
   30.55 -    <ClCompile Include="..\load_mp3.c" />
   30.56 -    <ClCompile Include="..\load_ogg.c" />
   30.57 -    <ClCompile Include="..\load_voc.c" />
   30.58 -    <ClCompile Include="..\mixer.c" />
   30.59 -    <ClCompile Include="..\music.c" />
   30.60 -    <ClCompile Include="..\music_cmd.c" />
   30.61 -    <ClCompile Include="..\music_flac.c" />
   30.62 -    <ClCompile Include="..\music_mad.c" />
   30.63 -    <ClCompile Include="..\music_mod.c" />
   30.64 -    <ClCompile Include="..\music_modplug.c" />
   30.65 -    <ClCompile Include="..\music_ogg.c" />
   30.66 -    <ClCompile Include="..\wavestream.c" />
   30.67 -  </ItemGroup>
   30.68 -  <ItemGroup>
   30.69 -    <ClInclude Include="..\dynamic_flac.h" />
   30.70 -    <ClInclude Include="..\dynamic_fluidsynth.h" />
   30.71 -    <ClInclude Include="..\dynamic_mod.h" />
   30.72 -    <ClInclude Include="..\dynamic_modplug.h" />
   30.73 -    <ClInclude Include="..\dynamic_mp3.h" />
   30.74 -    <ClInclude Include="..\dynamic_ogg.h" />
   30.75      <ClInclude Include="..\effects_internal.h" />
   30.76 -    <ClInclude Include="..\fluidsynth.h" />
   30.77      <ClInclude Include="..\load_aiff.h" />
   30.78 -    <ClInclude Include="..\load_flac.h" />
   30.79 -    <ClInclude Include="..\load_mp3.h" />
   30.80 -    <ClInclude Include="..\load_ogg.h" />
   30.81      <ClInclude Include="..\load_voc.h" />
   30.82 +    <ClInclude Include="..\mixer.h" />
   30.83 +    <ClInclude Include="..\music.h" />
   30.84      <ClInclude Include="..\music_cmd.h" />
   30.85      <ClInclude Include="..\music_flac.h" />
   30.86 +    <ClInclude Include="..\music_fluidsynth.h" />
   30.87      <ClInclude Include="..\music_mad.h" />
   30.88 -    <ClInclude Include="..\music_mod.h" />
   30.89 +    <ClInclude Include="..\music_mikmod.h" />
   30.90      <ClInclude Include="..\music_modplug.h" />
   30.91 +    <ClInclude Include="..\music_mpg123.h" />
   30.92 +    <ClInclude Include="..\music_nativemidi.h" />
   30.93      <ClInclude Include="..\music_ogg.h" />
   30.94 +    <ClInclude Include="..\music_smpeg.h" />
   30.95 +    <ClInclude Include="..\music_timidity.h" />
   30.96 +    <ClInclude Include="..\music_wav.h" />
   30.97      <ClInclude Include="..\SDL_mixer.h" />
   30.98 -    <ClInclude Include="..\wavestream.h" />
   30.99    </ItemGroup>
  30.100    <ItemGroup>
  30.101      <ResourceCompile Include="Version.rc">
  30.102 @@ -450,6 +421,27 @@
  30.103        <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\$(Platform)\$(Configuration)\%(Filename)%(Extension)</Outputs>
  30.104      </CustomBuild>
  30.105    </ItemGroup>
  30.106 +  <ItemGroup>
  30.107 +    <ClCompile Include="..\effects_internal.c" />
  30.108 +    <ClCompile Include="..\effect_position.c" />
  30.109 +    <ClCompile Include="..\effect_stereoreverse.c" />
  30.110 +    <ClCompile Include="..\load_aiff.c" />
  30.111 +    <ClCompile Include="..\load_voc.c" />
  30.112 +    <ClCompile Include="..\mixer.c" />
  30.113 +    <ClCompile Include="..\music.c" />
  30.114 +    <ClCompile Include="..\music_cmd.c" />
  30.115 +    <ClCompile Include="..\music_flac.c" />
  30.116 +    <ClCompile Include="..\music_fluidsynth.c" />
  30.117 +    <ClCompile Include="..\music_mad.c" />
  30.118 +    <ClCompile Include="..\music_mikmod.c" />
  30.119 +    <ClCompile Include="..\music_modplug.c" />
  30.120 +    <ClCompile Include="..\music_mpg123.c" />
  30.121 +    <ClCompile Include="..\music_nativemidi.c" />
  30.122 +    <ClCompile Include="..\music_ogg.c" />
  30.123 +    <ClCompile Include="..\music_smpeg.c" />
  30.124 +    <ClCompile Include="..\music_timidity.c" />
  30.125 +    <ClCompile Include="..\music_wav.c" />
  30.126 +  </ItemGroup>
  30.127    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  30.128    <ImportGroup Label="ExtensionTargets">
  30.129    </ImportGroup>
    31.1 --- a/VisualC/SDL_mixer.vcxproj.filters	Mon Oct 16 02:16:47 2017 -0700
    31.2 +++ b/VisualC/SDL_mixer.vcxproj.filters	Tue Oct 17 02:33:47 2017 -0700
    31.3 @@ -1,123 +1,22 @@
    31.4  <?xml version="1.0" encoding="utf-8"?>
    31.5  <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    31.6    <ItemGroup>
    31.7 -    <ClCompile Include="..\dynamic_flac.c">
    31.8 -      <Filter>Sources</Filter>
    31.9 -    </ClCompile>
   31.10 -    <ClCompile Include="..\dynamic_fluidsynth.c">
   31.11 -      <Filter>Sources</Filter>
   31.12 -    </ClCompile>
   31.13 -    <ClCompile Include="..\dynamic_mod.c">
   31.14 -      <Filter>Sources</Filter>
   31.15 -    </ClCompile>
   31.16 -    <ClCompile Include="..\dynamic_modplug.c">
   31.17 -      <Filter>Sources</Filter>
   31.18 -    </ClCompile>
   31.19 -    <ClCompile Include="..\dynamic_mp3.c">
   31.20 -      <Filter>Sources</Filter>
   31.21 -    </ClCompile>
   31.22 -    <ClCompile Include="..\dynamic_ogg.c">
   31.23 -      <Filter>Sources</Filter>
   31.24 -    </ClCompile>
   31.25 -    <ClCompile Include="..\effect_position.c">
   31.26 -      <Filter>Sources</Filter>
   31.27 -    </ClCompile>
   31.28 -    <ClCompile Include="..\effect_stereoreverse.c">
   31.29 -      <Filter>Sources</Filter>
   31.30 -    </ClCompile>
   31.31 -    <ClCompile Include="..\effects_internal.c">
   31.32 -      <Filter>Sources</Filter>
   31.33 -    </ClCompile>
   31.34 -    <ClCompile Include="..\fluidsynth.c">
   31.35 -      <Filter>Sources</Filter>
   31.36 -    </ClCompile>
   31.37 -    <ClCompile Include="..\load_aiff.c">
   31.38 -      <Filter>Sources</Filter>
   31.39 -    </ClCompile>
   31.40 -    <ClCompile Include="..\load_flac.c">
   31.41 -      <Filter>Sources</Filter>
   31.42 -    </ClCompile>
   31.43 -    <ClCompile Include="..\load_mp3.c">
   31.44 -      <Filter>Sources</Filter>
   31.45 -    </ClCompile>
   31.46 -    <ClCompile Include="..\load_ogg.c">
   31.47 -      <Filter>Sources</Filter>
   31.48 -    </ClCompile>
   31.49 -    <ClCompile Include="..\load_voc.c">
   31.50 -      <Filter>Sources</Filter>
   31.51 -    </ClCompile>
   31.52 -    <ClCompile Include="..\mixer.c">
   31.53 -      <Filter>Sources</Filter>
   31.54 -    </ClCompile>
   31.55 -    <ClCompile Include="..\music.c">
   31.56 -      <Filter>Sources</Filter>
   31.57 -    </ClCompile>
   31.58 -    <ClCompile Include="..\music_cmd.c">
   31.59 -      <Filter>Sources</Filter>
   31.60 -    </ClCompile>
   31.61 -    <ClCompile Include="..\music_flac.c">
   31.62 -      <Filter>Sources</Filter>
   31.63 -    </ClCompile>
   31.64 -    <ClCompile Include="..\music_mad.c">
   31.65 -      <Filter>Sources</Filter>
   31.66 -    </ClCompile>
   31.67 -    <ClCompile Include="..\music_mod.c">
   31.68 -      <Filter>Sources</Filter>
   31.69 -    </ClCompile>
   31.70 -    <ClCompile Include="..\music_modplug.c">
   31.71 -      <Filter>Sources</Filter>
   31.72 -    </ClCompile>
   31.73 -    <ClCompile Include="..\music_ogg.c">
   31.74 -      <Filter>Sources</Filter>
   31.75 -    </ClCompile>
   31.76 -    <ClCompile Include="..\wavestream.c">
   31.77 -      <Filter>Sources</Filter>
   31.78 -    </ClCompile>
   31.79 -  </ItemGroup>
   31.80 -  <ItemGroup>
   31.81      <ClInclude Include="..\SDL_mixer.h">
   31.82        <Filter>Public Headers</Filter>
   31.83      </ClInclude>
   31.84 -    <ClInclude Include="..\wavestream.h">
   31.85 -      <Filter>Sources</Filter>
   31.86 -    </ClInclude>
   31.87 -    <ClInclude Include="..\dynamic_flac.h">
   31.88 -      <Filter>Sources</Filter>
   31.89 -    </ClInclude>
   31.90 -    <ClInclude Include="..\dynamic_fluidsynth.h">
   31.91 -      <Filter>Sources</Filter>
   31.92 -    </ClInclude>
   31.93 -    <ClInclude Include="..\dynamic_mod.h">
   31.94 -      <Filter>Sources</Filter>
   31.95 -    </ClInclude>
   31.96 -    <ClInclude Include="..\dynamic_modplug.h">
   31.97 -      <Filter>Sources</Filter>
   31.98 -    </ClInclude>
   31.99 -    <ClInclude Include="..\dynamic_mp3.h">
  31.100 -      <Filter>Sources</Filter>
  31.101 -    </ClInclude>
  31.102 -    <ClInclude Include="..\dynamic_ogg.h">
  31.103 -      <Filter>Sources</Filter>
  31.104 -    </ClInclude>
  31.105      <ClInclude Include="..\effects_internal.h">
  31.106        <Filter>Sources</Filter>
  31.107      </ClInclude>
  31.108 -    <ClInclude Include="..\fluidsynth.h">
  31.109 -      <Filter>Sources</Filter>
  31.110 -    </ClInclude>
  31.111      <ClInclude Include="..\load_aiff.h">
  31.112        <Filter>Sources</Filter>
  31.113      </ClInclude>
  31.114 -    <ClInclude Include="..\load_flac.h">
  31.115 +    <ClInclude Include="..\load_voc.h">
  31.116        <Filter>Sources</Filter>
  31.117      </ClInclude>
  31.118 -    <ClInclude Include="..\load_mp3.h">
  31.119 +    <ClInclude Include="..\mixer.h">
  31.120        <Filter>Sources</Filter>
  31.121      </ClInclude>
  31.122 -    <ClInclude Include="..\load_ogg.h">
  31.123 -      <Filter>Sources</Filter>
  31.124 -    </ClInclude>
  31.125 -    <ClInclude Include="..\load_voc.h">
  31.126 +    <ClInclude Include="..\music.h">
  31.127        <Filter>Sources</Filter>
  31.128      </ClInclude>
  31.129      <ClInclude Include="..\music_cmd.h">
  31.130 @@ -126,18 +25,36 @@
  31.131      <ClInclude Include="..\music_flac.h">
  31.132        <Filter>Sources</Filter>
  31.133      </ClInclude>
  31.134 +    <ClInclude Include="..\music_fluidsynth.h">
  31.135 +      <Filter>Sources</Filter>
  31.136 +    </ClInclude>
  31.137      <ClInclude Include="..\music_mad.h">
  31.138        <Filter>Sources</Filter>
  31.139      </ClInclude>
  31.140 -    <ClInclude Include="..\music_mod.h">
  31.141 +    <ClInclude Include="..\music_mikmod.h">
  31.142        <Filter>Sources</Filter>
  31.143      </ClInclude>
  31.144      <ClInclude Include="..\music_modplug.h">
  31.145        <Filter>Sources</Filter>
  31.146      </ClInclude>
  31.147 +    <ClInclude Include="..\music_mpg123.h">
  31.148 +      <Filter>Sources</Filter>
  31.149 +    </ClInclude>
  31.150 +    <ClInclude Include="..\music_nativemidi.h">
  31.151 +      <Filter>Sources</Filter>
  31.152 +    </ClInclude>
  31.153      <ClInclude Include="..\music_ogg.h">
  31.154        <Filter>Sources</Filter>
  31.155      </ClInclude>
  31.156 +    <ClInclude Include="..\music_smpeg.h">
  31.157 +      <Filter>Sources</Filter>
  31.158 +    </ClInclude>
  31.159 +    <ClInclude Include="..\music_timidity.h">
  31.160 +      <Filter>Sources</Filter>
  31.161 +    </ClInclude>
  31.162 +    <ClInclude Include="..\music_wav.h">
  31.163 +      <Filter>Sources</Filter>
  31.164 +    </ClInclude>
  31.165    </ItemGroup>
  31.166    <ItemGroup>
  31.167      <Filter Include="x86">
  31.168 @@ -148,6 +65,8 @@
  31.169      </Filter>
  31.170      <Filter Include="Sources">
  31.171        <UniqueIdentifier>{8ec29020-3461-45b5-a964-2caa2257aa07}</UniqueIdentifier>
  31.172 +      <Extensions>
  31.173 +      </Extensions>
  31.174      </Filter>
  31.175      <Filter Include="Public Headers">
  31.176        <UniqueIdentifier>{8bbeafe5-52e5-4259-8b07-2de45556c6b9}</UniqueIdentifier>
  31.177 @@ -223,4 +142,63 @@
  31.178        <Filter>x86</Filter>
  31.179      </CustomBuild>
  31.180    </ItemGroup>
  31.181 +  <ItemGroup>
  31.182 +    <ClCompile Include="..\effect_position.c">
  31.183 +      <Filter>Sources</Filter>
  31.184 +    </ClCompile>
  31.185 +    <ClCompile Include="..\effect_stereoreverse.c">
  31.186 +      <Filter>Sources</Filter>
  31.187 +    </ClCompile>
  31.188 +    <ClCompile Include="..\effects_internal.c">
  31.189 +      <Filter>Sources</Filter>
  31.190 +    </ClCompile>
  31.191 +    <ClCompile Include="..\load_aiff.c">
  31.192 +      <Filter>Sources</Filter>
  31.193 +    </ClCompile>
  31.194 +    <ClCompile Include="..\load_voc.c">
  31.195 +      <Filter>Sources</Filter>
  31.196 +    </ClCompile>
  31.197 +    <ClCompile Include="..\mixer.c">
  31.198 +      <Filter>Sources</Filter>
  31.199 +    </ClCompile>
  31.200 +    <ClCompile Include="..\music.c">
  31.201 +      <Filter>Sources</Filter>
  31.202 +    </ClCompile>
  31.203 +    <ClCompile Include="..\music_cmd.c">
  31.204 +      <Filter>Sources</Filter>
  31.205 +    </ClCompile>
  31.206 +    <ClCompile Include="..\music_flac.c">
  31.207 +      <Filter>Sources</Filter>
  31.208 +    </ClCompile>
  31.209 +    <ClCompile Include="..\music_fluidsynth.c">
  31.210 +      <Filter>Sources</Filter>
  31.211 +    </ClCompile>
  31.212 +    <ClCompile Include="..\music_mad.c">
  31.213 +      <Filter>Sources</Filter>
  31.214 +    </ClCompile>
  31.215 +    <ClCompile Include="..\music_mikmod.c">
  31.216 +      <Filter>Sources</Filter>
  31.217 +    </ClCompile>
  31.218 +    <ClCompile Include="..\music_modplug.c">
  31.219 +      <Filter>Sources</Filter>
  31.220 +    </ClCompile>
  31.221 +    <ClCompile Include="..\music_mpg123.c">
  31.222 +      <Filter>Sources</Filter>
  31.223 +    </ClCompile>
  31.224 +    <ClCompile Include="..\music_nativemidi.c">
  31.225 +      <Filter>Sources</Filter>
  31.226 +    </ClCompile>
  31.227 +    <ClCompile Include="..\music_ogg.c">
  31.228 +      <Filter>Sources</Filter>
  31.229 +    </ClCompile>
  31.230 +    <ClCompile Include="..\music_smpeg.c">
  31.231 +      <Filter>Sources</Filter>
  31.232 +    </ClCompile>
  31.233 +    <ClCompile Include="..\music_timidity.c">
  31.234 +      <Filter>Sources</Filter>
  31.235 +    </ClCompile>
  31.236 +    <ClCompile Include="..\music_wav.c">
  31.237 +      <Filter>Sources</Filter>
  31.238 +    </ClCompile>
  31.239 +  </ItemGroup>
  31.240  </Project>
  31.241 \ No newline at end of file
    32.1 --- a/Xcode-iOS/SDL_mixer.xcodeproj/project.pbxproj	Mon Oct 16 02:16:47 2017 -0700
    32.2 +++ b/Xcode-iOS/SDL_mixer.xcodeproj/project.pbxproj	Tue Oct 17 02:33:47 2017 -0700
    32.3 @@ -9,16 +9,16 @@
    32.4  /* Begin PBXBuildFile section */
    32.5  		00938E53108A397A0009CF19 /* dynamic_flac.c in Sources */ = {isa = PBXBuildFile; fileRef = 00938E49108A397A0009CF19 /* dynamic_flac.c */; };
    32.6  		00938E54108A397A0009CF19 /* dynamic_flac.h in Headers */ = {isa = PBXBuildFile; fileRef = 00938E4A108A397A0009CF19 /* dynamic_flac.h */; };
    32.7 -		00938E55108A397A0009CF19 /* dynamic_mod.c in Sources */ = {isa = PBXBuildFile; fileRef = 00938E4B108A397A0009CF19 /* dynamic_mod.c */; };
    32.8 -		00938E56108A397A0009CF19 /* dynamic_mp3.h in Headers */ = {isa = PBXBuildFile; fileRef = 00938E4C108A397A0009CF19 /* dynamic_mp3.h */; };
    32.9 +		00938E55108A397A0009CF19 /* dynamic_mikmod.c in Sources */ = {isa = PBXBuildFile; fileRef = 00938E4B108A397A0009CF19 /* dynamic_mikmod.c */; };
   32.10 +		00938E56108A397A0009CF19 /* dynamic_smpeg.h in Headers */ = {isa = PBXBuildFile; fileRef = 00938E4C108A397A0009CF19 /* dynamic_smpeg.h */; };
   32.11  		00938E57108A397A0009CF19 /* dynamic_ogg.h in Headers */ = {isa = PBXBuildFile; fileRef = 00938E4D108A397A0009CF19 /* dynamic_ogg.h */; };
   32.12  		04939B4A17E607250015E4E3 /* load_mp3.c in Sources */ = {isa = PBXBuildFile; fileRef = 04939B4817E607250015E4E3 /* load_mp3.c */; };
   32.13  		04939B4B17E607250015E4E3 /* load_mp3.h in Headers */ = {isa = PBXBuildFile; fileRef = 04939B4917E607250015E4E3 /* load_mp3.h */; };
   32.14 -		04A8FCA60A19CAEC0046373F /* dynamic_mp3.c in Sources */ = {isa = PBXBuildFile; fileRef = 04A8FCA40A19CAEC0046373F /* dynamic_mp3.c */; };
   32.15 +		04A8FCA60A19CAEC0046373F /* dynamic_smpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 04A8FCA40A19CAEC0046373F /* dynamic_smpeg.c */; };
   32.16  		04A8FCAB0A19CB070046373F /* dynamic_ogg.c in Sources */ = {isa = PBXBuildFile; fileRef = 04A8FCA90A19CB070046373F /* dynamic_ogg.c */; };
   32.17  		AA5F0F0914B6A6490036992F /* dynamic_fluidsynth.c in Sources */ = {isa = PBXBuildFile; fileRef = AA5F0F0214B6A6490036992F /* dynamic_fluidsynth.c */; };
   32.18  		AA5F0F0A14B6A6490036992F /* dynamic_fluidsynth.h in Headers */ = {isa = PBXBuildFile; fileRef = AA5F0F0314B6A6490036992F /* dynamic_fluidsynth.h */; };
   32.19 -		AA5F0F0B14B6A6490036992F /* dynamic_mod.h in Headers */ = {isa = PBXBuildFile; fileRef = AA5F0F0414B6A6490036992F /* dynamic_mod.h */; };
   32.20 +		AA5F0F0B14B6A6490036992F /* dynamic_mikmod.h in Headers */ = {isa = PBXBuildFile; fileRef = AA5F0F0414B6A6490036992F /* dynamic_mikmod.h */; };
   32.21  		AA5F0F0C14B6A6490036992F /* fluidsynth.c in Sources */ = {isa = PBXBuildFile; fileRef = AA5F0F0514B6A6490036992F /* fluidsynth.c */; };
   32.22  		AA5F0F0D14B6A6490036992F /* fluidsynth.h in Headers */ = {isa = PBXBuildFile; fileRef = AA5F0F0614B6A6490036992F /* fluidsynth.h */; };
   32.23  		AA5F0F0E14B6A6490036992F /* music_modplug.c in Sources */ = {isa = PBXBuildFile; fileRef = AA5F0F0714B6A6490036992F /* music_modplug.c */; };
   32.24 @@ -37,7 +37,7 @@
   32.25  		AA60217D17653A9800662B9C /* load_mdl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60215817653A9800662B9C /* load_mdl.cpp */; };
   32.26  		AA60217E17653A9800662B9C /* load_med.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60215917653A9800662B9C /* load_med.cpp */; };
   32.27  		AA60217F17653A9800662B9C /* load_mid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60215A17653A9800662B9C /* load_mid.cpp */; };
   32.28 -		AA60218017653A9800662B9C /* load_mod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60215B17653A9800662B9C /* load_mod.cpp */; };
   32.29 +		AA60218017653A9800662B9C /* load_mikmod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60215B17653A9800662B9C /* load_mikmod.cpp */; };
   32.30  		AA60218117653A9800662B9C /* load_mt2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60215C17653A9800662B9C /* load_mt2.cpp */; };
   32.31  		AA60218217653A9800662B9C /* load_mtm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60215D17653A9800662B9C /* load_mtm.cpp */; };
   32.32  		AA60218317653A9800662B9C /* load_okt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60215E17653A9800662B9C /* load_okt.cpp */; };
   32.33 @@ -145,16 +145,16 @@
   32.34  		00938E2E108A37800009CF19 /* music_flac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_flac.h; path = ../music_flac.h; sourceTree = SOURCE_ROOT; };
   32.35  		00938E2F108A37800009CF19 /* music_mad.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_mad.c; path = ../music_mad.c; sourceTree = SOURCE_ROOT; };
   32.36  		00938E30108A37800009CF19 /* music_mad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_mad.h; path = ../music_mad.h; sourceTree = SOURCE_ROOT; };
   32.37 -		00938E31108A37800009CF19 /* music_mod.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_mod.c; path = ../music_mod.c; sourceTree = SOURCE_ROOT; };
   32.38 -		00938E32108A37800009CF19 /* music_mod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_mod.h; path = ../music_mod.h; sourceTree = SOURCE_ROOT; };
   32.39 +		00938E31108A37800009CF19 /* music_mikmod.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_mikmod.c; path = ../music_mikmod.c; sourceTree = SOURCE_ROOT; };
   32.40 +		00938E32108A37800009CF19 /* music_mikmod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_mikmod.h; path = ../music_mikmod.h; sourceTree = SOURCE_ROOT; };
   32.41  		00938E49108A397A0009CF19 /* dynamic_flac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dynamic_flac.c; path = ../dynamic_flac.c; sourceTree = SOURCE_ROOT; };
   32.42  		00938E4A108A397A0009CF19 /* dynamic_flac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_flac.h; path = ../dynamic_flac.h; sourceTree = SOURCE_ROOT; };
   32.43 -		00938E4B108A397A0009CF19 /* dynamic_mod.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dynamic_mod.c; path = ../dynamic_mod.c; sourceTree = SOURCE_ROOT; };
   32.44 -		00938E4C108A397A0009CF19 /* dynamic_mp3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_mp3.h; path = ../dynamic_mp3.h; sourceTree = SOURCE_ROOT; };
   32.45 +		00938E4B108A397A0009CF19 /* dynamic_mikmod.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dynamic_mikmod.c; path = ../dynamic_mikmod.c; sourceTree = SOURCE_ROOT; };
   32.46 +		00938E4C108A397A0009CF19 /* dynamic_smpeg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_smpeg.h; path = ../dynamic_smpeg.h; sourceTree = SOURCE_ROOT; };
   32.47  		00938E4D108A397A0009CF19 /* dynamic_ogg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_ogg.h; path = ../dynamic_ogg.h; sourceTree = SOURCE_ROOT; };
   32.48  		04939B4817E607250015E4E3 /* load_mp3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = load_mp3.c; path = ../load_mp3.c; sourceTree = "<group>"; };
   32.49  		04939B4917E607250015E4E3 /* load_mp3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = load_mp3.h; path = ../load_mp3.h; sourceTree = "<group>"; };
   32.50 -		04A8FCA40A19CAEC0046373F /* dynamic_mp3.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = dynamic_mp3.c; path = ../dynamic_mp3.c; sourceTree = SOURCE_ROOT; };
   32.51 +		04A8FCA40A19CAEC0046373F /* dynamic_smpeg.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = dynamic_smpeg.c; path = ../dynamic_smpeg.c; sourceTree = SOURCE_ROOT; };
   32.52  		04A8FCA90A19CB070046373F /* dynamic_ogg.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = dynamic_ogg.c; path = ../dynamic_ogg.c; sourceTree = SOURCE_ROOT; };
   32.53  		1014BAEA010A4B677F000001 /* SDL_mixer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_mixer.h; path = ../SDL_mixer.h; sourceTree = SOURCE_ROOT; };
   32.54  		5CC1B879012FB8CD7F000001 /* mixer.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = mixer.c; path = ../mixer.c; sourceTree = "<group>"; };
   32.55 @@ -192,7 +192,7 @@
   32.56  		5CC1B89C012FB8CD7F000001 /* wavestream.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = wavestream.h; path = ../wavestream.h; sourceTree = "<group>"; };
   32.57  		AA5F0F0214B6A6490036992F /* dynamic_fluidsynth.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dynamic_fluidsynth.c; path = ../dynamic_fluidsynth.c; sourceTree = "<group>"; };
   32.58  		AA5F0F0314B6A6490036992F /* dynamic_fluidsynth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_fluidsynth.h; path = ../dynamic_fluidsynth.h; sourceTree = "<group>"; };
   32.59 -		AA5F0F0414B6A6490036992F /* dynamic_mod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_mod.h; path = ../dynamic_mod.h; sourceTree = "<group>"; };
   32.60 +		AA5F0F0414B6A6490036992F /* dynamic_mikmod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_mikmod.h; path = ../dynamic_mikmod.h; sourceTree = "<group>"; };
   32.61  		AA5F0F0514B6A6490036992F /* fluidsynth.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fluidsynth.c; path = ../fluidsynth.c; sourceTree = "<group>"; };
   32.62  		AA5F0F0614B6A6490036992F /* fluidsynth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fluidsynth.h; path = ../fluidsynth.h; sourceTree = "<group>"; };
   32.63  		AA5F0F0714B6A6490036992F /* music_modplug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_modplug.c; path = ../music_modplug.c; sourceTree = "<group>"; };
   32.64 @@ -211,7 +211,7 @@
   32.65  		AA60215817653A9800662B9C /* load_mdl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = load_mdl.cpp; path = src/load_mdl.cpp; sourceTree = "<group>"; };
   32.66  		AA60215917653A9800662B9C /* load_med.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = load_med.cpp; path = src/load_med.cpp; sourceTree = "<group>"; };
   32.67  		AA60215A17653A9800662B9C /* load_mid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = load_mid.cpp; path = src/load_mid.cpp; sourceTree = "<group>"; };
   32.68 -		AA60215B17653A9800662B9C /* load_mod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = load_mod.cpp; path = src/load_mod.cpp; sourceTree = "<group>"; };
   32.69 +		AA60215B17653A9800662B9C /* load_mikmod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = load_mikmod.cpp; path = src/load_mikmod.cpp; sourceTree = "<group>"; };
   32.70  		AA60215C17653A9800662B9C /* load_mt2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = load_mt2.cpp; path = src/load_mt2.cpp; sourceTree = "<group>"; };
   32.71  		AA60215D17653A9800662B9C /* load_mtm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = load_mtm.cpp; path = src/load_mtm.cpp; sourceTree = "<group>"; };
   32.72  		AA60215E17653A9800662B9C /* load_okt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = load_okt.cpp; path = src/load_okt.cpp; sourceTree = "<group>"; };
   32.73 @@ -335,12 +335,12 @@
   32.74  				00938E4A108A397A0009CF19 /* dynamic_flac.h */,
   32.75  				AA5F0F0214B6A6490036992F /* dynamic_fluidsynth.c */,
   32.76  				AA5F0F0314B6A6490036992F /* dynamic_fluidsynth.h */,
   32.77 -				00938E4B108A397A0009CF19 /* dynamic_mod.c */,
   32.78 -				AA5F0F0414B6A6490036992F /* dynamic_mod.h */,
   32.79 +				00938E4B108A397A0009CF19 /* dynamic_mikmod.c */,
   32.80 +				AA5F0F0414B6A6490036992F /* dynamic_mikmod.h */,
   32.81  				AA60219717653B8700662B9C /* dynamic_modplug.c */,
   32.82  				AA60219817653B8700662B9C /* dynamic_modplug.h */,
   32.83 -				04A8FCA40A19CAEC0046373F /* dynamic_mp3.c */,
   32.84 -				00938E4C108A397A0009CF19 /* dynamic_mp3.h */,
   32.85 +				04A8FCA40A19CAEC0046373F /* dynamic_smpeg.c */,
   32.86 +				00938E4C108A397A0009CF19 /* dynamic_smpeg.h */,
   32.87  				04A8FCA90A19CB070046373F /* dynamic_ogg.c */,
   32.88  				00938E4D108A397A0009CF19 /* dynamic_ogg.h */,
   32.89  				F567D63B01CD881401F3E8B9 /* effect_position.c */,
   32.90 @@ -367,8 +367,8 @@
   32.91  				00938E2E108A37800009CF19 /* music_flac.h */,
   32.92  				00938E2F108A37800009CF19 /* music_mad.c */,
   32.93  				00938E30108A37800009CF19 /* music_mad.h */,
   32.94 -				00938E31108A37800009CF19 /* music_mod.c */,
   32.95 -				00938E32108A37800009CF19 /* music_mod.h */,
   32.96 +				00938E31108A37800009CF19 /* music_mikmod.c */,
   32.97 +				00938E32108A37800009CF19 /* music_mikmod.h */,
   32.98  				AA5F0F0714B6A6490036992F /* music_modplug.c */,
   32.99  				AA5F0F0814B6A6490036992F /* music_modplug.h */,
  32.100  				5CC1B87C012FB8CD7F000001 /* music_ogg.c */,
  32.101 @@ -429,7 +429,7 @@
  32.102  				AA60215817653A9800662B9C /* load_mdl.cpp */,
  32.103  				AA60215917653A9800662B9C /* load_med.cpp */,
  32.104  				AA60215A17653A9800662B9C /* load_mid.cpp */,
  32.105 -				AA60215B17653A9800662B9C /* load_mod.cpp */,
  32.106 +				AA60215B17653A9800662B9C /* load_mikmod.cpp */,
  32.107  				AA60215C17653A9800662B9C /* load_mt2.cpp */,
  32.108  				AA60215D17653A9800662B9C /* load_mtm.cpp */,
  32.109  				AA60215E17653A9800662B9C /* load_okt.cpp */,
  32.110 @@ -523,10 +523,10 @@
  32.111  				BE1FA91D07AF96B2004B6283 /* load_voc.h in Headers */,
  32.112  				BE1FA91E07AF96B2004B6283 /* load_ogg.h in Headers */,
  32.113  				00938E54108A397A0009CF19 /* dynamic_flac.h in Headers */,
  32.114 -				00938E56108A397A0009CF19 /* dynamic_mp3.h in Headers */,
  32.115 +				00938E56108A397A0009CF19 /* dynamic_smpeg.h in Headers */,
  32.116  				00938E57108A397A0009CF19 /* dynamic_ogg.h in Headers */,
  32.117  				AA5F0F0A14B6A6490036992F /* dynamic_fluidsynth.h in Headers */,
  32.118 -				AA5F0F0B14B6A6490036992F /* dynamic_mod.h in Headers */,
  32.119 +				AA5F0F0B14B6A6490036992F /* dynamic_mikmod.h in Headers */,
  32.120  				AA5F0F0D14B6A6490036992F /* fluidsynth.h in Headers */,
  32.121  				AA5F0F0F14B6A6490036992F /* music_modplug.h in Headers */,
  32.122  				AA64429E175B0E2500A2125A /* asm_arm.h in Headers */,
  32.123 @@ -642,10 +642,10 @@
  32.124  				BE1FA94D07AF96B2004B6283 /* load_aiff.c in Sources */,
  32.125  				BE1FA94E07AF96B2004B6283 /* load_voc.c in Sources */,
  32.126  				BE1FA94F07AF96B2004B6283 /* load_ogg.c in Sources */,
  32.127 -				04A8FCA60A19CAEC0046373F /* dynamic_mp3.c in Sources */,
  32.128 +				04A8FCA60A19CAEC0046373F /* dynamic_smpeg.c in Sources */,
  32.129  				04A8FCAB0A19CB070046373F /* dynamic_ogg.c in Sources */,
  32.130  				00938E53108A397A0009CF19 /* dynamic_flac.c in Sources */,
  32.131 -				00938E55108A397A0009CF19 /* dynamic_mod.c in Sources */,
  32.132 +				00938E55108A397A0009CF19 /* dynamic_mikmod.c in Sources */,
  32.133  				AA5F0F0914B6A6490036992F /* dynamic_fluidsynth.c in Sources */,
  32.134  				AA5F0F0C14B6A6490036992F /* fluidsynth.c in Sources */,
  32.135  				AA5F0F0E14B6A6490036992F /* music_modplug.c in Sources */,
  32.136 @@ -678,7 +678,7 @@
  32.137  				AA60217D17653A9800662B9C /* load_mdl.cpp in Sources */,
  32.138  				AA60217E17653A9800662B9C /* load_med.cpp in Sources */,
  32.139  				AA60217F17653A9800662B9C /* load_mid.cpp in Sources */,
  32.140 -				AA60218017653A9800662B9C /* load_mod.cpp in Sources */,
  32.141 +				AA60218017653A9800662B9C /* load_mikmod.cpp in Sources */,
  32.142  				AA60218117653A9800662B9C /* load_mt2.cpp in Sources */,
  32.143  				AA60218217653A9800662B9C /* load_mtm.cpp in Sources */,
  32.144  				AA60218317653A9800662B9C /* load_okt.cpp in Sources */,
  32.145 @@ -733,11 +733,11 @@
  32.146  			buildSettings = {
  32.147  				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
  32.148  				GCC_PREPROCESSOR_DEFINITIONS = (
  32.149 -					WAV_MUSIC,
  32.150 -					MODPLUG_MUSIC,
  32.151 +					MUSIC_WAV,
  32.152 +					MUSIC_MOD_MODPLUG,
  32.153  					"MODPLUG_HEADER=\"<modplug.h>\"",
  32.154 -					MID_MUSIC,
  32.155 -					OGG_MUSIC,
  32.156 +					MUSIC_MID,
  32.157 +					MUSIC_OGG,
  32.158  					OGG_USE_TREMOR,
  32.159  					"OGG_HEADER=\"<ivorbisfile.h>\"",
  32.160  					HAVE_STDINT_H,
  32.161 @@ -762,11 +762,11 @@
  32.162  			buildSettings = {
  32.163  				GCC_OPTIMIZATION_LEVEL = 0;
  32.164  				GCC_PREPROCESSOR_DEFINITIONS = (
  32.165 -					WAV_MUSIC,
  32.166 -					MODPLUG_MUSIC,
  32.167 +					MUSIC_WAV,
  32.168 +					MUSIC_MOD_MODPLUG,
  32.169  					"MODPLUG_HEADER=\"<modplug.h>\"",
  32.170 -					MID_MUSIC,
  32.171 -					OGG_MUSIC,
  32.172 +					MUSIC_MID,
  32.173 +					MUSIC_OGG,
  32.174  					OGG_USE_TREMOR,
  32.175  					"OGG_HEADER=\"<ivorbisfile.h>\"",
  32.176  					HAVE_STDINT_H,
    33.1 --- a/Xcode/SDL_mixer.xcodeproj/project.pbxproj	Mon Oct 16 02:16:47 2017 -0700
    33.2 +++ b/Xcode/SDL_mixer.xcodeproj/project.pbxproj	Tue Oct 17 02:33:47 2017 -0700
    33.3 @@ -13,17 +13,17 @@
    33.4  		00938E36108A37800009CF19 /* music_flac.h in Headers */ = {isa = PBXBuildFile; fileRef = 00938E2E108A37800009CF19 /* music_flac.h */; };
    33.5  		00938E37108A37800009CF19 /* music_mad.c in Sources */ = {isa = PBXBuildFile; fileRef = 00938E2F108A37800009CF19 /* music_mad.c */; };
    33.6  		00938E38108A37800009CF19 /* music_mad.h in Headers */ = {isa = PBXBuildFile; fileRef = 00938E30108A37800009CF19 /* music_mad.h */; };
    33.7 -		00938E39108A37800009CF19 /* music_mod.c in Sources */ = {isa = PBXBuildFile; fileRef = 00938E31108A37800009CF19 /* music_mod.c */; };
    33.8 -		00938E3A108A37800009CF19 /* music_mod.h in Headers */ = {isa = PBXBuildFile; fileRef = 00938E32108A37800009CF19 /* music_mod.h */; };
    33.9 +		00938E39108A37800009CF19 /* music_mikmod.c in Sources */ = {isa = PBXBuildFile; fileRef = 00938E31108A37800009CF19 /* music_mikmod.c */; };
   33.10 +		00938E3A108A37800009CF19 /* music_mikmod.h in Headers */ = {isa = PBXBuildFile; fileRef = 00938E32108A37800009CF19 /* music_mikmod.h */; };
   33.11  		00938E4E108A397A0009CF19 /* dynamic_flac.c in Sources */ = {isa = PBXBuildFile; fileRef = 00938E49108A397A0009CF19 /* dynamic_flac.c */; };
   33.12  		00938E4F108A397A0009CF19 /* dynamic_flac.h in Headers */ = {isa = PBXBuildFile; fileRef = 00938E4A108A397A0009CF19 /* dynamic_flac.h */; };
   33.13 -		00938E50108A397A0009CF19 /* dynamic_mod.c in Sources */ = {isa = PBXBuildFile; fileRef = 00938E4B108A397A0009CF19 /* dynamic_mod.c */; };
   33.14 -		00938E51108A397A0009CF19 /* dynamic_mp3.h in Headers */ = {isa = PBXBuildFile; fileRef = 00938E4C108A397A0009CF19 /* dynamic_mp3.h */; };
   33.15 +		00938E50108A397A0009CF19 /* dynamic_mikmod.c in Sources */ = {isa = PBXBuildFile; fileRef = 00938E4B108A397A0009CF19 /* dynamic_mikmod.c */; };
   33.16 +		00938E51108A397A0009CF19 /* dynamic_smpeg.h in Headers */ = {isa = PBXBuildFile; fileRef = 00938E4C108A397A0009CF19 /* dynamic_smpeg.h */; };
   33.17  		00938E52108A397A0009CF19 /* dynamic_ogg.h in Headers */ = {isa = PBXBuildFile; fileRef = 00938E4D108A397A0009CF19 /* dynamic_ogg.h */; };
   33.18  		00938E53108A397A0009CF19 /* dynamic_flac.c in Sources */ = {isa = PBXBuildFile; fileRef = 00938E49108A397A0009CF19 /* dynamic_flac.c */; };
   33.19  		00938E54108A397A0009CF19 /* dynamic_flac.h in Headers */ = {isa = PBXBuildFile; fileRef = 00938E4A108A397A0009CF19 /* dynamic_flac.h */; };
   33.20 -		00938E55108A397A0009CF19 /* dynamic_mod.c in Sources */ = {isa = PBXBuildFile; fileRef = 00938E4B108A397A0009CF19 /* dynamic_mod.c */; };
   33.21 -		00938E56108A397A0009CF19 /* dynamic_mp3.h in Headers */ = {isa = PBXBuildFile; fileRef = 00938E4C108A397A0009CF19 /* dynamic_mp3.h */; };
   33.22 +		00938E55108A397A0009CF19 /* dynamic_mikmod.c in Sources */ = {isa = PBXBuildFile; fileRef = 00938E4B108A397A0009CF19 /* dynamic_mikmod.c */; };
   33.23 +		00938E56108A397A0009CF19 /* dynamic_smpeg.h in Headers */ = {isa = PBXBuildFile; fileRef = 00938E4C108A397A0009CF19 /* dynamic_smpeg.h */; };
   33.24  		00938E57108A397A0009CF19 /* dynamic_ogg.h in Headers */ = {isa = PBXBuildFile; fileRef = 00938E4D108A397A0009CF19 /* dynamic_ogg.h */; };
   33.25  		0448E8AE108B937A00C9D3EA /* native_midi_macosx.c in Sources */ = {isa = PBXBuildFile; fileRef = 0448E8AD108B937A00C9D3EA /* native_midi_macosx.c */; };
   33.26  		0448E8AF108B937A00C9D3EA /* native_midi_macosx.c in Sources */ = {isa = PBXBuildFile; fileRef = 0448E8AD108B937A00C9D3EA /* native_midi_macosx.c */; };
   33.27 @@ -31,8 +31,8 @@
   33.28  		04939B4F17E607F70015E4E3 /* load_mp3.c in Sources */ = {isa = PBXBuildFile; fileRef = 04939B4C17E607F70015E4E3 /* load_mp3.c */; };
   33.29  		04939B5017E607F70015E4E3 /* load_mp3.h in Headers */ = {isa = PBXBuildFile; fileRef = 04939B4D17E607F70015E4E3 /* load_mp3.h */; };
   33.30  		04939B5117E607F70015E4E3 /* load_mp3.h in Headers */ = {isa = PBXBuildFile; fileRef = 04939B4D17E607F70015E4E3 /* load_mp3.h */; };
   33.31 -		04A8FCA60A19CAEC0046373F /* dynamic_mp3.c in Sources */ = {isa = PBXBuildFile; fileRef = 04A8FCA40A19CAEC0046373F /* dynamic_mp3.c */; };
   33.32 -		04A8FCA70A19CAEC0046373F /* dynamic_mp3.c in Sources */ = {isa = PBXBuildFile; fileRef = 04A8FCA40A19CAEC0046373F /* dynamic_mp3.c */; };
   33.33 +		04A8FCA60A19CAEC0046373F /* dynamic_smpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 04A8FCA40A19CAEC0046373F /* dynamic_smpeg.c */; };
   33.34 +		04A8FCA70A19CAEC0046373F /* dynamic_smpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 04A8FCA40A19CAEC0046373F /* dynamic_smpeg.c */; };
   33.35  		04A8FCAB0A19CB070046373F /* dynamic_ogg.c in Sources */ = {isa = PBXBuildFile; fileRef = 04A8FCA90A19CB070046373F /* dynamic_ogg.c */; };
   33.36  		04A8FCAC0A19CB070046373F /* dynamic_ogg.c in Sources */ = {isa = PBXBuildFile; fileRef = 04A8FCA90A19CB070046373F /* dynamic_ogg.c */; };
   33.37  		AA6021301765383B00662B9C /* modplug.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = AA60212F1765382200662B9C /* modplug.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
   33.38 @@ -40,8 +40,8 @@
   33.39  		AA60213B176538EB00662B9C /* dynamic_fluidsynth.c in Sources */ = {isa = PBXBuildFile; fileRef = AA602131176538EB00662B9C /* dynamic_fluidsynth.c */; };
   33.40  		AA60213C176538EB00662B9C /* dynamic_fluidsynth.h in Headers */ = {isa = PBXBuildFile; fileRef = AA602132176538EB00662B9C /* dynamic_fluidsynth.h */; };
   33.41  		AA60213D176538EB00662B9C /* dynamic_fluidsynth.h in Headers */ = {isa = PBXBuildFile; fileRef = AA602132176538EB00662B9C /* dynamic_fluidsynth.h */; };
   33.42 -		AA60213E176538EB00662B9C /* dynamic_mod.h in Headers */ = {isa = PBXBuildFile; fileRef = AA602133176538EB00662B9C /* dynamic_mod.h */; };
   33.43 -		AA60213F176538EB00662B9C /* dynamic_mod.h in Headers */ = {isa = PBXBuildFile; fileRef = AA602133176538EB00662B9C /* dynamic_mod.h */; };
   33.44 +		AA60213E176538EB00662B9C /* dynamic_mikmod.h in Headers */ = {isa = PBXBuildFile; fileRef = AA602133176538EB00662B9C /* dynamic_mikmod.h */; };
   33.45 +		AA60213F176538EB00662B9C /* dynamic_mikmod.h in Headers */ = {isa = PBXBuildFile; fileRef = AA602133176538EB00662B9C /* dynamic_mikmod.h */; };
   33.46  		AA602140176538EB00662B9C /* dynamic_modplug.c in Sources */ = {isa = PBXBuildFile; fileRef = AA602134176538EB00662B9C /* dynamic_modplug.c */; };
   33.47  		AA602141176538EB00662B9C /* dynamic_modplug.c in Sources */ = {isa = PBXBuildFile; fileRef = AA602134176538EB00662B9C /* dynamic_modplug.c */; };
   33.48  		AA602142176538EB00662B9C /* dynamic_modplug.h in Headers */ = {isa = PBXBuildFile; fileRef = AA602135176538EB00662B9C /* dynamic_modplug.h */; };
   33.49 @@ -186,17 +186,17 @@
   33.50  		00938E2E108A37800009CF19 /* music_flac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_flac.h; path = ../music_flac.h; sourceTree = SOURCE_ROOT; };
   33.51  		00938E2F108A37800009CF19 /* music_mad.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_mad.c; path = ../music_mad.c; sourceTree = SOURCE_ROOT; };
   33.52  		00938E30108A37800009CF19 /* music_mad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_mad.h; path = ../music_mad.h; sourceTree = SOURCE_ROOT; };
   33.53 -		00938E31108A37800009CF19 /* music_mod.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_mod.c; path = ../music_mod.c; sourceTree = SOURCE_ROOT; };
   33.54 -		00938E32108A37800009CF19 /* music_mod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_mod.h; path = ../music_mod.h; sourceTree = SOURCE_ROOT; };
   33.55 +		00938E31108A37800009CF19 /* music_mikmod.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_mikmod.c; path = ../music_mikmod.c; sourceTree = SOURCE_ROOT; };
   33.56 +		00938E32108A37800009CF19 /* music_mikmod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_mikmod.h; path = ../music_mikmod.h; sourceTree = SOURCE_ROOT; };
   33.57  		00938E49108A397A0009CF19 /* dynamic_flac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dynamic_flac.c; path = ../dynamic_flac.c; sourceTree = SOURCE_ROOT; };
   33.58  		00938E4A108A397A0009CF19 /* dynamic_flac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_flac.h; path = ../dynamic_flac.h; sourceTree = SOURCE_ROOT; };
   33.59 -		00938E4B108A397A0009CF19 /* dynamic_mod.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dynamic_mod.c; path = ../dynamic_mod.c; sourceTree = SOURCE_ROOT; };
   33.60 -		00938E4C108A397A0009CF19 /* dynamic_mp3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_mp3.h; path = ../dynamic_mp3.h; sourceTree = SOURCE_ROOT; };
   33.61 +		00938E4B108A397A0009CF19 /* dynamic_mikmod.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dynamic_mikmod.c; path = ../dynamic_mikmod.c; sourceTree = SOURCE_ROOT; };
   33.62 +		00938E4C108A397A0009CF19 /* dynamic_smpeg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_smpeg.h; path = ../dynamic_smpeg.h; sourceTree = SOURCE_ROOT; };
   33.63  		00938E4D108A397A0009CF19 /* dynamic_ogg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_ogg.h; path = ../dynamic_ogg.h; sourceTree = SOURCE_ROOT; };
   33.64  		0448E8AD108B937A00C9D3EA /* native_midi_macosx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = native_midi_macosx.c; sourceTree = "<group>"; };
   33.65  		04939B4C17E607F70015E4E3 /* load_mp3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = load_mp3.c; path = ../load_mp3.c; sourceTree = "<group>"; };
   33.66  		04939B4D17E607F70015E4E3 /* load_mp3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = load_mp3.h; path = ../load_mp3.h; sourceTree = "<group>"; };
   33.67 -		04A8FCA40A19CAEC0046373F /* dynamic_mp3.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = dynamic_mp3.c; path = ../dynamic_mp3.c; sourceTree = SOURCE_ROOT; };
   33.68 +		04A8FCA40A19CAEC0046373F /* dynamic_smpeg.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = dynamic_smpeg.c; path = ../dynamic_smpeg.c; sourceTree = SOURCE_ROOT; };
   33.69  		04A8FCA90A19CB070046373F /* dynamic_ogg.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = dynamic_ogg.c; path = ../dynamic_ogg.c; sourceTree = SOURCE_ROOT; };
   33.70  		1014BAEA010A4B677F000001 /* SDL_mixer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_mixer.h; path = ../SDL_mixer.h; sourceTree = SOURCE_ROOT; };
   33.71  		5CC1B879012FB8CD7F000001 /* mixer.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = mixer.c; path = ../mixer.c; sourceTree = "<group>"; };
   33.72 @@ -235,7 +235,7 @@
   33.73  		AA60212F1765382200662B9C /* modplug.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = modplug.framework; path = Frameworks/modplug.framework; sourceTree = "<group>"; };
   33.74  		AA602131176538EB00662B9C /* dynamic_fluidsynth.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dynamic_fluidsynth.c; path = ../dynamic_fluidsynth.c; sourceTree = "<group>"; };
   33.75  		AA602132176538EB00662B9C /* dynamic_fluidsynth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_fluidsynth.h; path = ../dynamic_fluidsynth.h; sourceTree = "<group>"; };
   33.76 -		AA602133176538EB00662B9C /* dynamic_mod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_mod.h; path = ../dynamic_mod.h; sourceTree = "<group>"; };
   33.77 +		AA602133176538EB00662B9C /* dynamic_mikmod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_mikmod.h; path = ../dynamic_mikmod.h; sourceTree = "<group>"; };
   33.78  		AA602134176538EB00662B9C /* dynamic_modplug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dynamic_modplug.c; path = ../dynamic_modplug.c; sourceTree = "<group>"; };
   33.79  		AA602135176538EB00662B9C /* dynamic_modplug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_modplug.h; path = ../dynamic_modplug.h; sourceTree = "<group>"; };
   33.80  		AA602136176538EB00662B9C /* fluidsynth.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fluidsynth.c; path = ../fluidsynth.c; sourceTree = "<group>"; };
   33.81 @@ -340,12 +340,12 @@
   33.82  				00938E4A108A397A0009CF19 /* dynamic_flac.h */,
   33.83  				AA602131176538EB00662B9C /* dynamic_fluidsynth.c */,
   33.84  				AA602132176538EB00662B9C /* dynamic_fluidsynth.h */,
   33.85 -				00938E4B108A397A0009CF19 /* dynamic_mod.c */,
   33.86 -				AA602133176538EB00662B9C /* dynamic_mod.h */,
   33.87 +				00938E4B108A397A0009CF19 /* dynamic_mikmod.c */,
   33.88 +				AA602133176538EB00662B9C /* dynamic_mikmod.h */,
   33.89  				AA602134176538EB00662B9C /* dynamic_modplug.c */,
   33.90  				AA602135176538EB00662B9C /* dynamic_modplug.h */,
   33.91 -				04A8FCA40A19CAEC0046373F /* dynamic_mp3.c */,
   33.92 -				00938E4C108A397A0009CF19 /* dynamic_mp3.h */,
   33.93 +				04A8FCA40A19CAEC0046373F /* dynamic_smpeg.c */,
   33.94 +				00938E4C108A397A0009CF19 /* dynamic_smpeg.h */,
   33.95  				04A8FCA90A19CB070046373F /* dynamic_ogg.c */,
   33.96  				00938E4D108A397A0009CF19 /* dynamic_ogg.h */,
   33.97  				F567D63B01CD881401F3E8B9 /* effect_position.c */,
   33.98 @@ -372,8 +372,8 @@
   33.99  				00938E2E108A37800009CF19 /* music_flac.h */,
  33.100  				00938E2F108A37800009CF19 /* music_mad.c */,
  33.101  				00938E30108A37800009CF19 /* music_mad.h */,
  33.102 -				00938E31108A37800009CF19 /* music_mod.c */,
  33.103 -				00938E32108A37800009CF19 /* music_mod.h */,
  33.104 +				00938E31108A37800009CF19 /* music_mikmod.c */,
  33.105 +				00938E32108A37800009CF19 /* music_mikmod.h */,
  33.106  				AA602138176538EB00662B9C /* music_modplug.c */,
  33.107  				AA602139176538EB00662B9C /* music_modplug.h */,
  33.108  				5CC1B87C012FB8CD7F000001 /* music_ogg.c */,
  33.109 @@ -499,12 +499,12 @@
  33.110  				00938E34108A37800009CF19 /* load_flac.h in Headers */,
  33.111  				00938E36108A37800009CF19 /* music_flac.h in Headers */,
  33.112  				00938E38108A37800009CF19 /* music_mad.h in Headers */,
  33.113 -				00938E3A108A37800009CF19 /* music_mod.h in Headers */,
  33.114 +				00938E3A108A37800009CF19 /* music_mikmod.h in Headers */,
  33.115  				00938E4F108A397A0009CF19 /* dynamic_flac.h in Headers */,
  33.116 -				00938E51108A397A0009CF19 /* dynamic_mp3.h in Headers */,
  33.117 +				00938E51108A397A0009CF19 /* dynamic_smpeg.h in Headers */,
  33.118  				00938E52108A397A0009CF19 /* dynamic_ogg.h in Headers */,
  33.119  				AA60213C176538EB00662B9C /* dynamic_fluidsynth.h in Headers */,
  33.120 -				AA60213E176538EB00662B9C /* dynamic_mod.h in Headers */,
  33.121 +				AA60213E176538EB00662B9C /* dynamic_mikmod.h in Headers */,
  33.122  				AA602142176538EB00662B9C /* dynamic_modplug.h in Headers */,
  33.123  				AA602146176538EB00662B9C /* fluidsynth.h in Headers */,
  33.124  				AA60214A176538EB00662B9C /* music_modplug.h in Headers */,
  33.125 @@ -536,10 +536,10 @@
  33.126  				BE1FA91D07AF96B2004B6283 /* load_voc.h in Headers */,
  33.127  				BE1FA91E07AF96B2004B6283 /* load_ogg.h in Headers */,
  33.128  				00938E54108A397A0009CF19 /* dynamic_flac.h in Headers */,
  33.129 -				00938E56108A397A0009CF19 /* dynamic_mp3.h in Headers */,
  33.130 +				00938E56108A397A0009CF19 /* dynamic_smpeg.h in Headers */,
  33.131  				00938E57108A397A0009CF19 /* dynamic_ogg.h in Headers */,
  33.132  				AA60213D176538EB00662B9C /* dynamic_fluidsynth.h in Headers */,
  33.133 -				AA60213F176538EB00662B9C /* dynamic_mod.h in Headers */,
  33.134 +				AA60213F176538EB00662B9C /* dynamic_mikmod.h in Headers */,
  33.135  				AA602143176538EB00662B9C /* dynamic_modplug.h in Headers */,
  33.136  				AA602147176538EB00662B9C /* fluidsynth.h in Headers */,
  33.137  				AA60214B176538EB00662B9C /* music_modplug.h in Headers */,
  33.138 @@ -733,14 +733,14 @@
  33.139  				BE1FA8FC07AF96B2004B6283 /* load_aiff.c in Sources */,
  33.140  				BE1FA8FD07AF96B2004B6283 /* load_voc.c in Sources */,
  33.141  				BE1FA90007AF96B2004B6283 /* load_ogg.c in Sources */,
  33.142 -				04A8FCA70A19CAEC0046373F /* dynamic_mp3.c in Sources */,
  33.143 +				04A8FCA70A19CAEC0046373F /* dynamic_smpeg.c in Sources */,
  33.144  				04A8FCAC0A19CB070046373F /* dynamic_ogg.c in Sources */,
  33.145  				00938E33108A37800009CF19 /* load_flac.c in Sources */,
  33.146  				00938E35108A37800009CF19 /* music_flac.c in Sources */,
  33.147  				00938E37108A37800009CF19 /* music_mad.c in Sources */,
  33.148 -				00938E39108A37800009CF19 /* music_mod.c in Sources */,
  33.149 +				00938E39108A37800009CF19 /* music_mikmod.c in Sources */,
  33.150  				00938E4E108A397A0009CF19 /* dynamic_flac.c in Sources */,
  33.151 -				00938E50108A397A0009CF19 /* dynamic_mod.c in Sources */,
  33.152 +				00938E50108A397A0009CF19 /* dynamic_mikmod.c in Sources */,
  33.153  				0448E8AE108B937A00C9D3EA /* native_midi_macosx.c in Sources */,
  33.154  				AA60213A176538EB00662B9C /* dynamic_fluidsynth.c in Sources */,
  33.155  				AA602140176538EB00662B9C /* dynamic_modplug.c in Sources */,
  33.156 @@ -778,10 +778,10 @@
  33.157  				BE1FA94D07AF96B2004B6283 /* load_aiff.c in Sources */,
  33.158  				BE1FA94E07AF96B2004B6283 /* load_voc.c in Sources */,
  33.159  				BE1FA94F07AF96B2004B6283 /* load_ogg.c in Sources */,
  33.160 -				04A8FCA60A19CAEC0046373F /* dynamic_mp3.c in Sources */,
  33.161 +				04A8FCA60A19CAEC0046373F /* dynamic_smpeg.c in Sources */,
  33.162  				04A8FCAB0A19CB070046373F /* dynamic_ogg.c in Sources */,
  33.163  				00938E53108A397A0009CF19 /* dynamic_flac.c in Sources */,
  33.164 -				00938E55108A397A0009CF19 /* dynamic_mod.c in Sources */,
  33.165 +				00938E55108A397A0009CF19 /* dynamic_mikmod.c in Sources */,
  33.166  				0448E8AF108B937A00C9D3EA /* native_midi_macosx.c in Sources */,
  33.167  				AA60213B176538EB00662B9C /* dynamic_fluidsynth.c in Sources */,
  33.168  				AA602141176538EB00662B9C /* dynamic_modplug.c in Sources */,
  33.169 @@ -815,15 +815,15 @@
  33.170  					"$(PROJECT_DIR)/Frameworks",
  33.171  				);
  33.172  				GCC_PREPROCESSOR_DEFINITIONS = (
  33.173 -					CMD_MUSIC,
  33.174 -					WAV_MUSIC,
  33.175 -					MODPLUG_MUSIC,
  33.176 +					MUSIC_CMD,
  33.177 +					MUSIC_WAV,
  33.178 +					MUSIC_MOD_MODPLUG,
  33.179  					"MODPLUG_HEADER=\"<modplug.h>\"",
  33.180 -					MP3_MUSIC,
  33.181 -					MID_MUSIC,
  33.182 -					USE_NATIVE_MIDI,
  33.183 -					OGG_MUSIC,
  33.184 -					FLAC_MUSIC,
  33.185 +					MUSIC_MP3_SMPEG,
  33.186 +					MUSIC_MID,
  33.187 +					MUSIC_MID_NATIVE,
  33.188 +					MUSIC_OGG,
  33.189 +					MUSIC_FLAC,
  33.190  				);
  33.191  				INFOPLIST_FILE = "Info-Framework.plist";
  33.192  				INSTALL_PATH = "@rpath";
  33.193 @@ -856,15 +856,15 @@
  33.194  					"$(PROJECT_DIR)/Frameworks",
  33.195  				);
  33.196  				GCC_PREPROCESSOR_DEFINITIONS = (
  33.197 -					CMD_MUSIC,
  33.198 -					WAV_MUSIC,
  33.199 -					MODPLUG_MUSIC,
  33.200 +					MUSIC_CMD,
  33.201 +					MUSIC_WAV,
  33.202 +					MUSIC_MOD_MODPLUG,
  33.203  					"MODPLUG_HEADER=\"<modplug.h>\"",
  33.204 -					MP3_MUSIC,
  33.205 -					MID_MUSIC,
  33.206 -					USE_NATIVE_MIDI,
  33.207 -					OGG_MUSIC,
  33.208 -					FLAC_MUSIC,
  33.209 +					MUSIC_MP3_SMPEG,
  33.210 +					MUSIC_MID,
  33.211 +					MUSIC_MID_NATIVE,
  33.212 +					MUSIC_OGG,
  33.213 +					MUSIC_FLAC,
  33.214  				);
  33.215  				INFOPLIST_FILE = "Info-Framework.plist";
  33.216  				INSTALL_PATH = "@rpath";
  33.217 @@ -889,11 +889,11 @@
  33.218  			buildSettings = {
  33.219  				COMBINE_HIDPI_IMAGES = YES;
  33.220  				GCC_PREPROCESSOR_DEFINITIONS = (
  33.221 -					CMD_MUSIC,
  33.222 -					WAV_MUSIC,
  33.223 -					MID_MUSIC,
  33.224 -					USE_NATIVE_MIDI,
  33.225 -					MP3_MUSIC_DISABLED,
  33.226 +					MUSIC_CMD,
  33.227 +					MUSIC_WAV,
  33.228 +					MUSIC_MID,
  33.229 +					MUSIC_MID_NATIVE,
  33.230 +					MUSIC_MP3_DISABLED,
  33.231  				);
  33.232  				LIBRARY_STYLE = STATIC;
  33.233  				OTHER_LIBTOOL_FLAGS = "";
  33.234 @@ -909,11 +909,11 @@
  33.235  				COMBINE_HIDPI_IMAGES = YES;
  33.236  				DEBUGGING_SYMBOLS = YES;
  33.237  				GCC_PREPROCESSOR_DEFINITIONS = (
  33.238 -					CMD_MUSIC,
  33.239 -					WAV_MUSIC,
  33.240 -					MID_MUSIC,
  33.241 -					USE_NATIVE_MIDI,
  33.242 -					MP3_MUSIC_DISABLED,
  33.243 +					MUSIC_CMD,
  33.244 +					MUSIC_WAV,
  33.245 +					MUSIC_MID,
  33.246 +					MUSIC_MID_NATIVE,
  33.247 +					MUSIC_MP3_DISABLED,
  33.248  				);
  33.249  				LIBRARY_STYLE = STATIC;
  33.250  				OTHER_LIBTOOL_FLAGS = "";
  33.251 @@ -978,14 +978,14 @@
  33.252  				FRAMEWORK_SEARCH_PATHS_QUOTED = "\"$(SRCROOT)/Frameworks\"";
  33.253  				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
  33.254  				GCC_PREPROCESSOR_DEFINITIONS = (
  33.255 -					CMD_MUSIC,
  33.256 -					WAV_MUSIC,
  33.257 -					MOD_MUSIC,
  33.258 -					MP3_MUSIC,
  33.259 -					MID_MUSIC,
  33.260 -					USE_NATIVE_MIDI,
  33.261 -					OGG_MUSIC,
  33.262 -					FLAC_MUSIC,
  33.263 +					MUSIC_CMD,
  33.264 +					MUSIC_WAV,
  33.265 +					MUSIC_MOD,
  33.266 +					MUSIC_MP3_SMPEG,
  33.267 +					MUSIC_MID,
  33.268 +					MUSIC_MID_NATIVE,
  33.269 +					MUSIC_OGG,
  33.270 +					MUSIC_FLAC,
  33.271  				);
  33.272  				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
  33.273  				HEADER_SEARCH_PATHS = (
  33.274 @@ -1013,14 +1013,14 @@
  33.275  				FRAMEWORK_SEARCH_PATHS_QUOTED = "\"$(SRCROOT)/Frameworks\"";
  33.276  				GCC_OPTIMIZATION_LEVEL = 0;
  33.277  				GCC_PREPROCESSOR_DEFINITIONS = (
  33.278 -					CMD_MUSIC,
  33.279 -					WAV_MUSIC,
  33.280 -					MOD_MUSIC,
  33.281 -					MP3_MUSIC,
  33.282 -					MID_MUSIC,
  33.283 -					USE_NATIVE_MIDI,
  33.284 -					OGG_MUSIC,
  33.285 -					FLAC_MUSIC,
  33.286 +					MUSIC_CMD,
  33.287 +					MUSIC_WAV,
  33.288 +					MUSIC_MOD,
  33.289 +					MUSIC_MP3_SMPEG,
  33.290 +					MUSIC_MID,
  33.291 +					MUSIC_MID_NATIVE,
  33.292 +					MUSIC_OGG,
  33.293 +					MUSIC_FLAC,
  33.294  				);
  33.295  				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
  33.296  				HEADER_SEARCH_PATHS = (
    34.1 --- a/configure.in	Mon Oct 16 02:16:47 2017 -0700
    34.2 +++ b/configure.in	Tue Oct 17 02:33:47 2017 -0700
    34.3 @@ -230,7 +230,7 @@
    34.4      fi
    34.5      if test "x$enable_music_cmd" != xno; then
    34.6          SOURCES="$SOURCES $srcdir/music_cmd.c"
    34.7 -        EXTRA_CFLAGS="$EXTRA_CFLAGS -DCMD_MUSIC"
    34.8 +        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_CMD"
    34.9      fi
   34.10  fi
   34.11  
   34.12 @@ -239,7 +239,7 @@
   34.13                [], [enable_music_wave=yes])
   34.14  if test x$enable_music_wave = xyes; then
   34.15      SOURCES="$SOURCES $srcdir/wavestream.c"
   34.16 -    EXTRA_CFLAGS="$EXTRA_CFLAGS -DWAV_MUSIC"
   34.17 +    EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_WAV"
   34.18  fi
   34.19  
   34.20  AC_ARG_ENABLE([music-mod],
   34.21 @@ -278,7 +278,7 @@
   34.22                  ;;
   34.23          esac
   34.24          SOURCES="$SOURCES $srcdir/*_modplug.c"
   34.25 -        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMODPLUG_MUSIC $MODPLUG_CFLAGS"
   34.26 +        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MOD_MODPLUG $MODPLUG_CFLAGS"
   34.27          if test x$enable_music_mod_modplug_shared = xyes && test x$modplug_lib != x; then
   34.28              echo "-- dynamic libmodplug -> $modplug_lib"
   34.29              EXTRA_CFLAGS="$EXTRA_CFLAGS -DMODPLUG_DYNAMIC=\\\"$modplug_lib\\\""
   34.30 @@ -307,7 +307,7 @@
   34.31          
   34.32          CFLAGS_SAVED="$CFLAGS"
   34.33          LIBS_SAVED="$LIBS"
   34.34 -        CFLAGS="$CFLAGS -DLIBMIKMOD_MUSIC `$LIBMIKMOD_CONFIG --cflags`"
   34.35 +        CFLAGS="$CFLAGS `$LIBMIKMOD_CONFIG --cflags`"
   34.36          LIBS="$LIBS `$LIBMIKMOD_CONFIG --libs`"
   34.37          have_libmikmod=yes
   34.38          AC_MSG_CHECKING([for libmikmod - version >= $libmikmod_ver])
   34.39 @@ -345,8 +345,8 @@
   34.40                  fi
   34.41                  ;;
   34.42          esac
   34.43 -        SOURCES="$SOURCES $srcdir/*_mod.c"
   34.44 -        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMOD_MUSIC `$LIBMIKMOD_CONFIG --cflags`"
   34.45 +        SOURCES="$SOURCES $srcdir/*_mikmod.c"
   34.46 +        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MOD_MIKMOD `$LIBMIKMOD_CONFIG --cflags`"
   34.47          if test x$enable_music_mod_mikmod_shared = xyes && test x$mikmod_lib != x; then
   34.48              echo "-- dynamic libmikmod -> $mikmod_lib"
   34.49              EXTRA_CFLAGS="$EXTRA_CFLAGS -DMOD_DYNAMIC=\\\"$mikmod_lib\\\""
   34.50 @@ -366,12 +366,12 @@
   34.51  AC_HELP_STRING([--enable-music-midi], [enable MIDI music [[default=yes]]]),
   34.52                [], [enable_music_midi=yes])
   34.53  if test x$enable_music_midi = xyes; then
   34.54 -    EXTRA_CFLAGS="$EXTRA_CFLAGS -DMID_MUSIC"
   34.55 +    EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID"
   34.56      AC_ARG_ENABLE([music-midi-timidity],
   34.57  AC_HELP_STRING([--enable-music-midi-timidity], [enable timidity MIDI output [[default=yes]]]),
   34.58                    [], [enable_music_midi_timidity=yes])
   34.59      if test x$enable_music_midi_timidity = xyes; then
   34.60 -        EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_TIMIDITY_MIDI -I\$(srcdir)/timidity"
   34.61 +        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID_TIMIDITY -I\$(srcdir)/timidity"
   34.62          SOURCES="$SOURCES $srcdir/timidity/*.c"
   34.63      fi
   34.64      AC_ARG_ENABLE([music-midi-native],
   34.65 @@ -397,10 +397,10 @@
   34.66                  ;;
   34.67          esac
   34.68          if test x$use_music_midi_native = xyes; then
   34.69 -            EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_NATIVE_MIDI -I\$(srcdir)/native_midi"
   34.70 +            EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID_NATIVE -I\$(srcdir)/native_midi"
   34.71              SOURCES="$SOURCES $srcdir/native_midi/*.c"
   34.72          elif test x$use_music_midi_native = xyes_cpp; then
   34.73 -            EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_NATIVE_MIDI -I\$(srcdir)/native_midi"
   34.74 +            EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID_NATIVE -I\$(srcdir)/native_midi"
   34.75              SOURCES="$SOURCES $srcdir/native_midi/*.c"
   34.76              SOURCES_CXX="$SOURCES_CXX $srcdir/native_midi/*.cpp"
   34.77          fi
   34.78 @@ -431,7 +431,7 @@
   34.79                      ;;
   34.80              esac
   34.81              SOURCES="$SOURCES $srcdir/dynamic_fluidsynth.c $srcdir/fluidsynth.c"
   34.82 -            EXTRA_CFLAGS="$EXTRA_CFLAGS -DUSE_FLUIDSYNTH_MIDI"
   34.83 +            EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MID_FLUIDSYNTH"
   34.84              if test x$enable_music_midi_fluidsynth_shared = xyes && test x$fluidsynth_lib != x; then
   34.85                  echo "-- dynamic libfluidsyth -> $fluidsynth_lib"
   34.86                  EXTRA_CFLAGS="$EXTRA_CFLAGS -DFLUIDSYNTH_DYNAMIC=\\\"$fluidsynth_lib\\\""
   34.87 @@ -480,7 +480,7 @@
   34.88                      ;;
   34.89              esac
   34.90              SOURCES="$SOURCES $srcdir/*_ogg.c"
   34.91 -            EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_MUSIC -DOGG_USE_TREMOR"
   34.92 +            EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_OGG -DOGG_USE_TREMOR"
   34.93              if test x$enable_music_ogg_shared = xyes && test x$ogg_lib != x; then
   34.94                  echo "-- dynamic libvorbisidec -> $ogg_lib"
   34.95                  EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
   34.96 @@ -510,7 +510,7 @@
   34.97                      ;;
   34.98              esac
   34.99              SOURCES="$SOURCES $srcdir/*_ogg.c"
  34.100 -            EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_MUSIC"
  34.101 +            EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_OGG"
  34.102              if test x$enable_music_ogg_shared = xyes && test x$ogg_lib != x; then
  34.103                  echo "-- dynamic libvorbisfile -> $ogg_lib"
  34.104                  EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
  34.105 @@ -570,7 +570,7 @@
  34.106                      ;;
  34.107              esac
  34.108              SOURCES="$SOURCES $srcdir/*_flac.c"
  34.109 -            EXTRA_CFLAGS="$EXTRA_CFLAGS -DFLAC_MUSIC"
  34.110 +            EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_FLAC"
  34.111              if test x$enable_music_flac_shared = xyes && test x$flac_lib != x; then
  34.112                  echo "-- dynamic libFLAC -> $flac_lib"
  34.113                  EXTRA_CFLAGS="$EXTRA_CFLAGS -DFLAC_DYNAMIC=\\\"$flac_lib\\\""
  34.114 @@ -609,10 +609,10 @@
  34.115                  smpeg_lib=[`find_lib "libsmpeg2*.so.*"`]
  34.116                  ;;
  34.117          esac
  34.118 -        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_MUSIC $SMPEG_CFLAGS"
  34.119 +        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MP3_SMPEG $SMPEG_CFLAGS"
  34.120          if test x$enable_music_mp3_smpeg_shared = xyes && test x$smpeg_lib != x; then
  34.121              echo "-- dynamic libsmpeg -> $smpeg_lib"
  34.122 -            EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_DYNAMIC=\\\"$smpeg_lib\\\""
  34.123 +            EXTRA_CFLAGS="$EXTRA_CFLAGS -DSMPEG_DYNAMIC=\\\"$smpeg_lib\\\""
  34.124          else
  34.125              EXTRA_LDFLAGS="$EXTRA_LDFLAGS $SMPEG_LIBS"
  34.126          fi
  34.127 @@ -636,7 +636,7 @@
  34.128      AC_MSG_RESULT($have_libmad)
  34.129      if test x$have_libmad = xyes; then
  34.130          SOURCES="$SOURCES $srcdir/music_mad.c"
  34.131 -        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_MAD_MUSIC"
  34.132 +        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MP3_MAD"
  34.133          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmad"
  34.134      else
  34.135          AC_MSG_WARN([*** Unable to find MAD library (http://www.underbit.com/products/mad/)])
  34.136 @@ -658,7 +658,7 @@
  34.137      AC_MSG_RESULT($have_libmpg123)
  34.138      if test x$have_libmpg123 = xyes; then
  34.139          SOURCES="$SOURCES $srcdir/music_mpg.c"
  34.140 -        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_MPG_MUSIC"
  34.141 +        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MP3_MPG123"
  34.142          EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmpg123"
  34.143      else
  34.144          AC_MSG_WARN([*** Unable to find mpg123 library (https://www.mpg123.de)])
  34.145 @@ -666,7 +666,7 @@
  34.146  fi
  34.147  
  34.148  if test x$have_smpeg = xyes -o x$have_libmad = xyes -o x$have_libmpg123; then
  34.149 -	SOURCES="$SOURCES $srcdir/*_mp3.c"
  34.150 +    SOURCES="$SOURCES $srcdir/load_mp3.c"
  34.151  else
  34.152      AC_MSG_WARN([MP3 support disabled])
  34.153  fi
    35.1 --- a/dynamic_flac.c	Mon Oct 16 02:16:47 2017 -0700
    35.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    35.3 @@ -1,187 +0,0 @@
    35.4 -/*
    35.5 -  SDL_mixer:  An audio mixer library based on the SDL library
    35.6 -  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
    35.7 -
    35.8 -  This software is provided 'as-is', without any express or implied
    35.9 -  warranty.  In no event will the authors be held liable for any damages
   35.10 -  arising from the use of this software.
   35.11 -
   35.12 -  Permission is granted to anyone to use this software for any purpose,
   35.13 -  including commercial applications, and to alter it and redistribute it
   35.14 -  freely, subject to the following restrictions:
   35.15 -
   35.16 -  1. The origin of this software must not be misrepresented; you must not
   35.17 -     claim that you wrote the original software. If you use this software
   35.18 -     in a product, an acknowledgment in the product documentation would be
   35.19 -     appreciated but is not required.
   35.20 -  2. Altered source versions must be plainly marked as such, and must not be
   35.21 -     misrepresented as being the original software.
   35.22 -  3. This notice may not be removed or altered from any source distribution.
   35.23 -
   35.24 -  Implementation of the dynamic loading functionality for libFLAC.
   35.25 -    ~ Austen Dicken (admin@cvpcs.org)
   35.26 -*/
   35.27 -
   35.28 -#ifdef FLAC_MUSIC
   35.29 -
   35.30 -#include "SDL_loadso.h"
   35.31 -#include "SDL_mixer.h"
   35.32 -#include "dynamic_flac.h"
   35.33 -
   35.34 -flac_loader flac = {
   35.35 -    0, NULL
   35.36 -};
   35.37 -
   35.38 -#ifdef FLAC_DYNAMIC
   35.39 -int Mix_InitFLAC()
   35.40 -{
   35.41 -    if ( flac.loaded == 0 ) {
   35.42 -        flac.handle = SDL_LoadObject(FLAC_DYNAMIC);
   35.43 -        if ( flac.handle == NULL ) {
   35.44 -            return -1;
   35.45 -        }
   35.46 -        flac.FLAC__stream_decoder_new =
   35.47 -            (FLAC__StreamDecoder *(*)())
   35.48 -            SDL_LoadFunction(flac.handle, "FLAC__stream_decoder_new");
   35.49 -        if ( flac.FLAC__stream_decoder_new == NULL ) {
   35.50 -            SDL_UnloadObject(flac.handle);
   35.51 -            return -1;
   35.52 -        }
   35.53 -        flac.FLAC__stream_decoder_delete =
   35.54 -            (void (*)(FLAC__StreamDecoder *))
   35.55 -            SDL_LoadFunction(flac.handle, "FLAC__stream_decoder_delete");
   35.56 -        if ( flac.FLAC__stream_decoder_delete == NULL ) {
   35.57 -            SDL_UnloadObject(flac.handle);
   35.58 -            return -1;
   35.59 -        }
   35.60 -        flac.FLAC__stream_decoder_init_stream =
   35.61 -            (FLAC__StreamDecoderInitStatus (*)(
   35.62 -                        FLAC__StreamDecoder *,
   35.63 -                        FLAC__StreamDecoderReadCallback,
   35.64 -                        FLAC__StreamDecoderSeekCallback,
   35.65 -                        FLAC__StreamDecoderTellCallback,
   35.66 -                        FLAC__StreamDecoderLengthCallback,
   35.67 -                        FLAC__StreamDecoderEofCallback,
   35.68 -                        FLAC__StreamDecoderWriteCallback,
   35.69 -                        FLAC__StreamDecoderMetadataCallback,
   35.70 -                        FLAC__StreamDecoderErrorCallback,
   35.71 -                        void *))
   35.72 -            SDL_LoadFunction(flac.handle, "FLAC__stream_decoder_init_stream");
   35.73 -        if ( flac.FLAC__stream_decoder_init_stream == NULL ) {
   35.74 -            SDL_UnloadObject(flac.handle);
   35.75 -            return -1;
   35.76 -        }
   35.77 -        flac.FLAC__stream_decoder_finish =
   35.78 -            (FLAC__bool (*)(FLAC__StreamDecoder *))
   35.79 -            SDL_LoadFunction(flac.handle, "FLAC__stream_decoder_finish");
   35.80 -        if ( flac.FLAC__stream_decoder_finish == NULL ) {
   35.81 -            SDL_UnloadObject(flac.handle);
   35.82 -            return -1;
   35.83 -        }
   35.84 -        flac.FLAC__stream_decoder_flush =
   35.85 -            (FLAC__bool (*)(FLAC__StreamDecoder *))
   35.86 -            SDL_LoadFunction(flac.handle, "FLAC__stream_decoder_flush");
   35.87 -        if ( flac.FLAC__stream_decoder_flush == NULL ) {
   35.88 -            SDL_UnloadObject(flac.handle);
   35.89 -            return -1;
   35.90 -        }
   35.91 -        flac.FLAC__stream_decoder_process_single =
   35.92 -            (FLAC__bool (*)(FLAC__StreamDecoder *))
   35.93 -            SDL_LoadFunction(flac.handle,
   35.94 -                        "FLAC__stream_decoder_process_single");
   35.95 -        if ( flac.FLAC__stream_decoder_process_single == NULL ) {
   35.96 -            SDL_UnloadObject(flac.handle);
   35.97 -            return -1;
   35.98 -        }
   35.99 -        flac.FLAC__stream_decoder_process_until_end_of_metadata =
  35.100 -            (FLAC__bool (*)(FLAC__StreamDecoder *))
  35.101 -            SDL_LoadFunction(flac.handle,
  35.102 -                        "FLAC__stream_decoder_process_until_end_of_metadata");
  35.103 -        if ( flac.FLAC__stream_decoder_process_until_end_of_metadata == NULL ) {
  35.104 -            SDL_UnloadObject(flac.handle);
  35.105 -            return -1;
  35.106 -        }
  35.107 -        flac.FLAC__stream_decoder_process_until_end_of_stream =
  35.108 -            (FLAC__bool (*)(FLAC__StreamDecoder *))
  35.109 -            SDL_LoadFunction(flac.handle,
  35.110 -                        "FLAC__stream_decoder_process_until_end_of_stream");
  35.111 -        if ( flac.FLAC__stream_decoder_process_until_end_of_stream == NULL ) {
  35.112 -            SDL_UnloadObject(flac.handle);
  35.113 -            return -1;
  35.114 -        }
  35.115 -        flac.FLAC__stream_decoder_seek_absolute =
  35.116 -            (FLAC__bool (*)(FLAC__StreamDecoder *, FLAC__uint64))
  35.117 -            SDL_LoadFunction(flac.handle, "FLAC__stream_decoder_seek_absolute");
  35.118 -        if ( flac.FLAC__stream_decoder_seek_absolute == NULL ) {
  35.119 -            SDL_UnloadObject(flac.handle);
  35.120 -            return -1;
  35.121 -        }
  35.122 -        flac.FLAC__stream_decoder_get_state =
  35.123 -            (FLAC__StreamDecoderState (*)(const FLAC__StreamDecoder *decoder))
  35.124 -            SDL_LoadFunction(flac.handle, "FLAC__stream_decoder_get_state");
  35.125 -        if ( flac.FLAC__stream_decoder_get_state == NULL ) {
  35.126 -            SDL_UnloadObject(flac.handle);
  35.127 -            return -1;
  35.128 -        }
  35.129 -    }
  35.130 -    ++flac.loaded;
  35.131 -
  35.132 -    return 0;
  35.133 -}
  35.134 -void Mix_QuitFLAC()
  35.135 -{
  35.136 -    if ( flac.loaded == 0 ) {
  35.137 -        return;
  35.138 -    }
  35.139 -    if ( flac.loaded == 1 ) {
  35.140 -        SDL_UnloadObject(flac.handle);
  35.141 -    }
  35.142 -    --flac.loaded;
  35.143 -}
  35.144 -#else
  35.145 -int Mix_InitFLAC()
  35.146 -{
  35.147 -    if ( flac.loaded == 0 ) {
  35.148 -#ifdef __MACOSX__
  35.149 -        extern FLAC__StreamDecoder *FLAC__stream_decoder_new(void) __attribute__((weak_import));
  35.150 -        if ( FLAC__stream_decoder_new == NULL )
  35.151 -        {
  35.152 -            /* Missing weakly linked framework */
  35.153 -            Mix_SetError("Missing FLAC.framework");
  35.154 -            return -1;
  35.155 -        }
  35.156 -#endif // __MACOSX__
  35.157 -
  35.158 -        flac.FLAC__stream_decoder_new = FLAC__stream_decoder_new;
  35.159 -        flac.FLAC__stream_decoder_delete = FLAC__stream_decoder_delete;
  35.160 -        flac.FLAC__stream_decoder_init_stream =
  35.161 -                            FLAC__stream_decoder_init_stream;
  35.162 -        flac.FLAC__stream_decoder_finish = FLAC__stream_decoder_finish;
  35.163 -        flac.FLAC__stream_decoder_flush = FLAC__stream_decoder_flush;
  35.164 -        flac.FLAC__stream_decoder_process_single =
  35.165 -                            FLAC__stream_decoder_process_single;
  35.166 -        flac.FLAC__stream_decoder_process_until_end_of_metadata =
  35.167 -                            FLAC__stream_decoder_process_until_end_of_metadata;
  35.168 -        flac.FLAC__stream_decoder_process_until_end_of_stream =
  35.169 -                            FLAC__stream_decoder_process_until_end_of_stream;
  35.170 -        flac.FLAC__stream_decoder_seek_absolute =
  35.171 -                            FLAC__stream_decoder_seek_absolute;
  35.172 -        flac.FLAC__stream_decoder_get_state =
  35.173 -                            FLAC__stream_decoder_get_state;
  35.174 -    }
  35.175 -    ++flac.loaded;
  35.176 -
  35.177 -    return 0;
  35.178 -}
  35.179 -void Mix_QuitFLAC()
  35.180 -{
  35.181 -    if ( flac.loaded == 0 ) {
  35.182 -        return;
  35.183 -    }
  35.184 -    if ( flac.loaded == 1 ) {
  35.185 -    }
  35.186 -    --flac.loaded;
  35.187 -}
  35.188 -#endif /* FLAC_DYNAMIC */
  35.189 -
  35.190 -#endif /* FLAC_MUSIC */
    36.1 --- a/dynamic_flac.h	Mon Oct 16 02:16:47 2017 -0700
    36.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    36.3 @@ -1,66 +0,0 @@
    36.4 -/*
    36.5 -  SDL_mixer:  An audio mixer library based on the SDL library
    36.6 -  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
    36.7 -
    36.8 -  This software is provided 'as-is', without any express or implied
    36.9 -  warranty.  In no event will the authors be held liable for any damages
   36.10 -  arising from the use of this software.
   36.11 -
   36.12 -  Permission is granted to anyone to use this software for any purpose,
   36.13 -  including commercial applications, and to alter it and redistribute it
   36.14 -  freely, subject to the following restrictions:
   36.15 -
   36.16 -  1. The origin of this software must not be misrepresented; you must not
   36.17 -     claim that you wrote the original software. If you use this software
   36.18 -     in a product, an acknowledgment in the product documentation would be
   36.19 -     appreciated but is not required.
   36.20 -  2. Altered source versions must be plainly marked as such, and must not be
   36.21 -     misrepresented as being the original software.
   36.22 -  3. This notice may not be removed or altered from any source distribution.
   36.23 -
   36.24 -  The following file defines all of the functions/objects used to dynamically
   36.25 -  link to the libFLAC library.
   36.26 -    ~ Austen Dicken (admin@cvpcs.org)
   36.27 -*/
   36.28 -
   36.29 -#ifdef FLAC_MUSIC
   36.30 -
   36.31 -#include <FLAC/stream_decoder.h>
   36.32 -
   36.33 -typedef struct {
   36.34 -    int loaded;
   36.35 -    void *handle;
   36.36 -    FLAC__StreamDecoder *(*FLAC__stream_decoder_new)();
   36.37 -    void (*FLAC__stream_decoder_delete)(FLAC__StreamDecoder *decoder);
   36.38 -    FLAC__StreamDecoderInitStatus (*FLAC__stream_decoder_init_stream)(
   36.39 -                        FLAC__StreamDecoder *decoder,
   36.40 -                        FLAC__StreamDecoderReadCallback read_callback,
   36.41 -                        FLAC__StreamDecoderSeekCallback seek_callback,
   36.42 -                        FLAC__StreamDecoderTellCallback tell_callback,
   36.43 -                        FLAC__StreamDecoderLengthCallback length_callback,
   36.44 -                        FLAC__StreamDecoderEofCallback eof_callback,
   36.45 -                        FLAC__StreamDecoderWriteCallback write_callback,
   36.46 -                        FLAC__StreamDecoderMetadataCallback metadata_callback,
   36.47 -                        FLAC__StreamDecoderErrorCallback error_callback,
   36.48 -                        void *client_data);
   36.49 -    FLAC__bool (*FLAC__stream_decoder_finish)(FLAC__StreamDecoder *decoder);
   36.50 -    FLAC__bool (*FLAC__stream_decoder_flush)(FLAC__StreamDecoder *decoder);
   36.51 -    FLAC__bool (*FLAC__stream_decoder_process_single)(
   36.52 -                        FLAC__StreamDecoder *decoder);
   36.53 -    FLAC__bool (*FLAC__stream_decoder_process_until_end_of_metadata)(
   36.54 -                        FLAC__StreamDecoder *decoder);
   36.55 -    FLAC__bool (*FLAC__stream_decoder_process_until_end_of_stream)(
   36.56 -                        FLAC__StreamDecoder *decoder);
   36.57 -    FLAC__bool (*FLAC__stream_decoder_seek_absolute)(
   36.58 -                        FLAC__StreamDecoder *decoder,
   36.59 -                        FLAC__uint64 sample);
   36.60 -    FLAC__StreamDecoderState (*FLAC__stream_decoder_get_state)(
   36.61 -                        const FLAC__StreamDecoder *decoder);
   36.62 -} flac_loader;
   36.63 -
   36.64 -extern flac_loader flac;
   36.65 -
   36.66 -#endif /* FLAC_MUSIC */
   36.67 -
   36.68 -extern int Mix_InitFLAC();
   36.69 -extern void Mix_QuitFLAC();
    37.1 --- a/dynamic_fluidsynth.c	Mon Oct 16 02:16:47 2017 -0700
    37.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    37.3 @@ -1,87 +0,0 @@
    37.4 -/*
    37.5 -  SDL_mixer:  An audio mixer library based on the SDL library
    37.6 -  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
    37.7 -
    37.8 -  This software is provided 'as-is', without any express or implied
    37.9 -  warranty.  In no event will the authors be held liable for any damages
   37.10 -  arising from the use of this software.
   37.11 -
   37.12 -  Permission is granted to anyone to use this software for any purpose,
   37.13 -  including commercial applications, and to alter it and redistribute it
   37.14 -  freely, subject to the following restrictions:
   37.15 -
   37.16 -  1. The origin of this software must not be misrepresented; you must not
   37.17 -     claim that you wrote the original software. If you use this software
   37.18 -     in a product, an acknowledgment in the product documentation would be
   37.19 -     appreciated but is not required.
   37.20 -  2. Altered source versions must be plainly marked as such, and must not be
   37.21 -     misrepresented as being the original software.
   37.22 -  3. This notice may not be removed or altered from any source distribution.
   37.23 -
   37.24 -  James Le Cuirot
   37.25 -  chewi@aura-online.co.uk
   37.26 -*/
   37.27 -
   37.28 -#ifdef USE_FLUIDSYNTH_MIDI
   37.29 -
   37.30 -#include "SDL_loadso.h"
   37.31 -#include "dynamic_fluidsynth.h"
   37.32 -
   37.33 -fluidsynth_loader fluidsynth = {
   37.34 -    0, NULL
   37.35 -};
   37.36 -
   37.37 -#ifdef FLUIDSYNTH_DYNAMIC
   37.38 -#define FLUIDSYNTH_LOADER(FUNC, SIG) \
   37.39 -    fluidsynth.FUNC = (SIG) SDL_LoadFunction(fluidsynth.handle, #FUNC); \
   37.40 -    if (fluidsynth.FUNC == NULL) { SDL_UnloadObject(fluidsynth.handle); return -1; }
   37.41 -#else
   37.42 -#define FLUIDSYNTH_LOADER(FUNC, SIG) \
   37.43 -    fluidsynth.FUNC = FUNC;
   37.44 -#endif
   37.45 -
   37.46 -int Mix_InitFluidSynth()
   37.47 -{
   37.48 -    if ( fluidsynth.loaded == 0 ) {
   37.49 -#ifdef FLUIDSYNTH_DYNAMIC
   37.50 -        fluidsynth.handle = SDL_LoadObject(FLUIDSYNTH_DYNAMIC);
   37.51 -        if ( fluidsynth.handle == NULL ) return -1;
   37.52 -#endif
   37.53 -
   37.54 -        FLUIDSYNTH_LOADER(delete_fluid_player, int (*)(fluid_player_t*));
   37.55 -        FLUIDSYNTH_LOADER(delete_fluid_settings, void (*)(fluid_settings_t*));
   37.56 -        FLUIDSYNTH_LOADER(delete_fluid_synth, int (*)(fluid_synth_t*));
   37.57 -        FLUIDSYNTH_LOADER(fluid_player_add, int (*)(fluid_player_t*, const char*));
   37.58 -        FLUIDSYNTH_LOADER(fluid_player_add_mem, int (*)(fluid_player_t*, const void*, size_t));
   37.59 -        FLUIDSYNTH_LOADER(fluid_player_get_status, int (*)(fluid_player_t*));
   37.60 -        FLUIDSYNTH_LOADER(fluid_player_play, int (*)(fluid_player_t*));
   37.61 -        FLUIDSYNTH_LOADER(fluid_player_set_loop, int (*)(fluid_player_t*, int));
   37.62 -        FLUIDSYNTH_LOADER(fluid_player_stop, int (*)(fluid_player_t*));
   37.63 -        FLUIDSYNTH_LOADER(fluid_settings_setnum, int (*)(fluid_settings_t*, const char*, double));
   37.64 -        FLUIDSYNTH_LOADER(fluid_synth_get_settings, fluid_settings_t* (*)(fluid_synth_t*));
   37.65 -        FLUIDSYNTH_LOADER(fluid_synth_set_gain, void (*)(fluid_synth_t*, float));
   37.66 -        FLUIDSYNTH_LOADER(fluid_synth_sfload, int(*)(fluid_synth_t*, const char*, int));
   37.67 -        FLUIDSYNTH_LOADER(fluid_synth_write_s16, int(*)(fluid_synth_t*, int, void*, int, int, void*, int, int));
   37.68 -        FLUIDSYNTH_LOADER(new_fluid_player, fluid_player_t* (*)(fluid_synth_t*));
   37.69 -        FLUIDSYNTH_LOADER(new_fluid_settings, fluid_settings_t* (*)(void));
   37.70 -        FLUIDSYNTH_LOADER(new_fluid_synth, fluid_synth_t* (*)(fluid_settings_t*));
   37.71 -    }
   37.72 -    ++fluidsynth.loaded;
   37.73 -
   37.74 -    return 0;
   37.75 -}
   37.76 -
   37.77 -void Mix_QuitFluidSynth()
   37.78 -{
   37.79 -    if ( fluidsynth.loaded == 0 ) {
   37.80 -        return;
   37.81 -    }
   37.82 -    if ( fluidsynth.loaded == 1 ) {
   37.83 -#ifdef FLUIDSYNTH_DYNAMIC
   37.84 -        SDL_UnloadObject(fluidsynth.handle);
   37.85 -#endif
   37.86 -    }
   37.87 -    --fluidsynth.loaded;
   37.88 -}
   37.89 -
   37.90 -#endif /* USE_FLUIDSYNTH_MIDI */
    38.1 --- a/dynamic_fluidsynth.h	Mon Oct 16 02:16:47 2017 -0700
    38.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    38.3 @@ -1,57 +0,0 @@
    38.4 -/*
    38.5 -  SDL_mixer:  An audio mixer library based on the SDL library
    38.6 -  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
    38.7 -
    38.8 -  This software is provided 'as-is', without any express or implied
    38.9 -  warranty.  In no event will the authors be held liable for any damages
   38.10 -  arising from the use of this software.
   38.11 -
   38.12 -  Permission is granted to anyone to use this software for any purpose,
   38.13 -  including commercial applications, and to alter it and redistribute it
   38.14 -  freely, subject to the following restrictions:
   38.15 -
   38.16 -  1. The origin of this software must not be misrepresented; you must not
   38.17 -     claim that you wrote the original software. If you use this software
   38.18 -     in a product, an acknowledgment in the product documentation would be
   38.19 -     appreciated but is not required.
   38.20 -  2. Altered source versions must be plainly marked as such, and must not be
   38.21 -     misrepresented as being the original software.
   38.22 -  3. This notice may not be removed or altered from any source distribution.
   38.23 -
   38.24 -  James Le Cuirot
   38.25 -  chewi@aura-online.co.uk
   38.26 -*/
   38.27 -
   38.28 -#ifdef USE_FLUIDSYNTH_MIDI
   38.29 -
   38.30 -#include <fluidsynth.h>
   38.31 -
   38.32 -typedef struct {
   38.33 -    int loaded;
   38.34 -    void *handle;
   38.35 -
   38.36 -    int (*delete_fluid_player)(fluid_player_t*);
   38.37 -    void (*delete_fluid_settings)(fluid_settings_t*);
   38.38 -    int (*delete_fluid_synth)(fluid_synth_t*);
   38.39 -    int (*fluid_player_add)(fluid_player_t*, const char*);
   38.40 -    int (*fluid_player_add_mem)(fluid_player_t*, const void*, size_t);
   38.41 -    int (*fluid_player_get_status)(fluid_player_t*);
   38.42 -    int (*fluid_player_play)(fluid_player_t*);
   38.43 -    int (*fluid_player_set_loop)(fluid_player_t*, int);
   38.44 -    int (*fluid_player_stop)(fluid_player_t*);
   38.45 -    int (*fluid_settings_setnum)(fluid_settings_t*, const char*, double);
   38.46 -    fluid_settings_t* (*fluid_synth_get_settings)(fluid_synth_t*);
   38.47 -    void (*fluid_synth_set_gain)(fluid_synth_t*, float);
   38.48 -    int (*fluid_synth_sfload)(fluid_synth_t*, const char*, int);
   38.49 -    int (*fluid_synth_write_s16)(fluid_synth_t*, int, void*, int, int, void*, int, int);
   38.50 -    fluid_player_t* (*new_fluid_player)(fluid_synth_t*);
   38.51 -    fluid_settings_t* (*new_fluid_settings)(void);
   38.52 -    fluid_synth_t* (*new_fluid_synth)(fluid_settings_t*);
   38.53 -} fluidsynth_loader;
   38.54 -
   38.55 -extern fluidsynth_loader fluidsynth;
   38.56 -
   38.57 -#endif /* USE_FLUIDSYNTH_MIDI */
   38.58 -
   38.59 -extern int Mix_InitFluidSynth();
   38.60 -extern void Mix_QuitFluidSynth();
    39.1 --- a/dynamic_mod.c	Mon Oct 16 02:16:47 2017 -0700
    39.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    39.3 @@ -1,297 +0,0 @@
    39.4 -/*
    39.5 -  SDL_mixer:  An audio mixer library based on the SDL library
    39.6 -  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
    39.7 -
    39.8 -  This software is provided 'as-is', without any express or implied
    39.9 -  warranty.  In no event will the authors be held liable for any damages
   39.10 -  arising from the use of this software.
   39.11 -
   39.12 -  Permission is granted to anyone to use this software for any purpose,
   39.13 -  including commercial applications, and to alter it and redistribute it
   39.14 -  freely, subject to the following restrictions:
   39.15 -
   39.16 -  1. The origin of this software must not be misrepresented; you must not
   39.17 -     claim that you wrote the original software. If you use this software
   39.18 -     in a product, an acknowledgment in the product documentation would be
   39.19 -     appreciated but is not required.
   39.20 -  2. Altered source versions must be plainly marked as such, and must not be
   39.21 -     misrepresented as being the original software.
   39.22 -  3. This notice may not be removed or altered from any source distribution.
   39.23 -*/
   39.24 -
   39.25 -#ifdef MOD_MUSIC
   39.26 -
   39.27 -#include "SDL_loadso.h"
   39.28 -#include "SDL_mixer.h"
   39.29 -#include "dynamic_mod.h"
   39.30 -
   39.31 -mikmod_loader mikmod = {
   39.32 -    0, NULL
   39.33 -};
   39.34 -
   39.35 -#ifdef MOD_DYNAMIC
   39.36 -int Mix_InitMOD()
   39.37 -{
   39.38 -    if ( mikmod.loaded == 0 ) {
   39.39 -        mikmod.handle = SDL_LoadObject(MOD_DYNAMIC);
   39.40 -        if ( mikmod.handle == NULL ) {
   39.41 -            return -1;
   39.42 -        }
   39.43 -        mikmod.MikMod_Exit =
   39.44 -            (void (*)(void))
   39.45 -            SDL_LoadFunction(mikmod.handle, "MikMod_Exit");
   39.46 -        if ( mikmod.MikMod_Exit == NULL ) {
   39.47 -            SDL_UnloadObject(mikmod.handle);
   39.48 -            return -1;
   39.49 -        }
   39.50 -        mikmod.MikMod_InfoDriver =
   39.51 -            (CHAR* (*)(void))
   39.52 -            SDL_LoadFunction(mikmod.handle, "MikMod_InfoDriver");
   39.53 -        if ( mikmod.MikMod_InfoDriver == NULL ) {
   39.54 -            SDL_UnloadObject(mikmod.handle);
   39.55 -            return -1;
   39.56 -        }
   39.57 -        mikmod.MikMod_InfoLoader =
   39.58 -            (CHAR* (*)(void))
   39.59 -            SDL_LoadFunction(mikmod.handle, "MikMod_InfoLoader");
   39.60 -        if ( mikmod.MikMod_InfoLoader == NULL ) {
   39.61 -            SDL_UnloadObject(mikmod.handle);
   39.62 -            return -1;
   39.63 -        }
   39.64 -        mikmod.MikMod_Init =
   39.65 -            (int (*)(MIKMOD3_CONST CHAR*))
   39.66 -            SDL_LoadFunction(mikmod.handle, "MikMod_Init");
   39.67 -        if ( mikmod.MikMod_Init == NULL ) {
   39.68 -            SDL_UnloadObject(mikmod.handle);
   39.69 -            return -1;
   39.70 -        }
   39.71 -        mikmod.MikMod_RegisterAllLoaders =
   39.72 -            (void (*)(void))
   39.73 -            SDL_LoadFunction(mikmod.handle, "MikMod_RegisterAllLoaders");
   39.74 -        if ( mikmod.MikMod_RegisterAllLoaders == NULL ) {
   39.75 -            SDL_UnloadObject(mikmod.handle);
   39.76 -            return -1;
   39.77 -        }
   39.78 -        mikmod.MikMod_RegisterDriver =
   39.79 -            (void (*)(struct MDRIVER*))
   39.80 -            SDL_LoadFunction(mikmod.handle, "MikMod_RegisterDriver");
   39.81 -        if ( mikmod.MikMod_RegisterDriver == NULL ) {
   39.82 -            SDL_UnloadObject(mikmod.handle);
   39.83 -            return -1;
   39.84 -        }
   39.85 -        mikmod.MikMod_errno =
   39.86 -            (int*)
   39.87 -            SDL_LoadFunction(mikmod.handle, "MikMod_errno");
   39.88 -        if ( mikmod.MikMod_errno == NULL ) {
   39.89 -            SDL_UnloadObject(mikmod.handle);
   39.90 -            return -1;
   39.91 -        }
   39.92 -        mikmod.MikMod_strerror =
   39.93 -            (MIKMOD3_CONST char* (*)(int))
   39.94 -            SDL_LoadFunction(mikmod.handle, "MikMod_strerror");
   39.95 -        if ( mikmod.MikMod_strerror == NULL ) {
   39.96 -            SDL_UnloadObject(mikmod.handle);
   39.97 -            return -1;
   39.98 -        }
   39.99 -        mikmod.MikMod_free =
  39.100 -            (void (*)(void*))
  39.101 -            SDL_LoadFunction(mikmod.handle, "MikMod_free");
  39.102 -        if ( mikmod.MikMod_free == NULL ) {
  39.103 -            /* libmikmod 3.1 and earlier doesn't have it */
  39.104 -            mikmod.MikMod_free = free;
  39.105 -        }
  39.106 -        mikmod.Player_Active =
  39.107 -            (BOOL (*)(void))
  39.108 -            SDL_LoadFunction(mikmod.handle, "Player_Active");
  39.109 -        if ( mikmod.Player_Active == NULL ) {
  39.110 -            SDL_UnloadObject(mikmod.handle);
  39.111 -            return -1;
  39.112 -        }
  39.113 -        mikmod.Player_Free =
  39.114 -            (void (*)(MODULE*))
  39.115 -            SDL_LoadFunction(mikmod.handle, "Player_Free");
  39.116 -        if ( mikmod.Player_Free == NULL ) {
  39.117 -            SDL_UnloadObject(mikmod.handle);
  39.118 -            return -1;
  39.119 -        }
  39.120 -        mikmod.Player_LoadGeneric =
  39.121 -            (MODULE* (*)(MREADER*,int,BOOL))
  39.122 -            SDL_LoadFunction(mikmod.handle, "Player_LoadGeneric");
  39.123 -        if ( mikmod.Player_LoadGeneric == NULL ) {
  39.124 -            SDL_UnloadObject(mikmod.handle);
  39.125 -            return -1;
  39.126 -        }
  39.127 -        mikmod.Player_SetPosition =
  39.128 -            (void (*)(UWORD))
  39.129 -            SDL_LoadFunction(mikmod.handle, "Player_SetPosition");
  39.130 -        if ( mikmod.Player_SetPosition == NULL ) {
  39.131 -            SDL_UnloadObject(mikmod.handle);
  39.132 -            return -1;
  39.133 -        }
  39.134 -        mikmod.Player_SetVolume =
  39.135 -            (void (*)(SWORD))
  39.136 -            SDL_LoadFunction(mikmod.handle, "Player_SetVolume");
  39.137 -        if ( mikmod.Player_SetVolume == NULL ) {
  39.138 -            SDL_UnloadObject(mikmod.handle);
  39.139 -            return -1;
  39.140 -        }
  39.141 -        mikmod.Player_Start =
  39.142 -            (void (*)(MODULE*))
  39.143 -            SDL_LoadFunction(mikmod.handle, "Player_Start");
  39.144 -        if ( mikmod.Player_Start == NULL ) {
  39.145 -            SDL_UnloadObject(mikmod.handle);
  39.146 -            return -1;
  39.147 -        }
  39.148 -        mikmod.Player_Stop =
  39.149 -            (void (*)(void))
  39.150 -            SDL_LoadFunction(mikmod.handle, "Player_Stop");
  39.151 -        if ( mikmod.Player_Stop == NULL ) {
  39.152 -            SDL_UnloadObject(mikmod.handle);
  39.153 -            return -1;
  39.154 -        }
  39.155 -        mikmod.VC_WriteBytes =
  39.156 -            (ULONG (*)(SBYTE*,ULONG))
  39.157 -            SDL_LoadFunction(mikmod.handle, "VC_WriteBytes");
  39.158 -        if ( mikmod.VC_WriteBytes == NULL ) {
  39.159 -            SDL_UnloadObject(mikmod.handle);
  39.160 -            return -1;
  39.161 -        }
  39.162 -        mikmod.drv_nos =
  39.163 -            (MDRIVER*)
  39.164 -            SDL_LoadFunction(mikmod.handle, "drv_nos");
  39.165 -        if ( mikmod.drv_nos == NULL ) {
  39.166 -            SDL_UnloadObject(mikmod.handle);
  39.167 -            return -1;
  39.168 -        }
  39.169 -        mikmod.md_device =
  39.170 -            (UWORD*)
  39.171 -            SDL_LoadFunction(mikmod.handle, "md_device");
  39.172 -        if ( mikmod.md_device == NULL ) {
  39.173 -            SDL_UnloadObject(mikmod.handle);
  39.174 -            return -1;
  39.175 -        }
  39.176 -        mikmod.md_mixfreq =
  39.177 -            (UWORD*)
  39.178 -            SDL_LoadFunction(mikmod.handle, "md_mixfreq");
  39.179 -        if ( mikmod.md_mixfreq == NULL ) {
  39.180 -            SDL_UnloadObject(mikmod.handle);
  39.181 -            return -1;
  39.182 -        }
  39.183 -        mikmod.md_mode =
  39.184 -            (UWORD*)
  39.185 -            SDL_LoadFunction(mikmod.handle, "md_mode");
  39.186 -        if ( mikmod.md_mode == NULL ) {
  39.187 -            SDL_UnloadObject(mikmod.handle);
  39.188 -            return -1;
  39.189 -        }
  39.190 -        mikmod.md_musicvolume =
  39.191 -            (UBYTE*)
  39.192 -            SDL_LoadFunction(mikmod.handle, "md_musicvolume");
  39.193 -        if ( mikmod.md_musicvolume == NULL ) {
  39.194 -            SDL_UnloadObject(mikmod.handle);
  39.195 -            return -1;
  39.196 -        }
  39.197 -        mikmod.md_pansep =
  39.198 -            (UBYTE*)
  39.199 -            SDL_LoadFunction(mikmod.handle, "md_pansep");
  39.200 -        if ( mikmod.md_pansep == NULL ) {
  39.201 -            SDL_UnloadObject(mikmod.handle);
  39.202 -            return -1;
  39.203 -        }
  39.204 -        mikmod.md_reverb =
  39.205 -            (UBYTE*)
  39.206 -            SDL_LoadFunction(mikmod.handle, "md_reverb");
  39.207 -        if ( mikmod.md_reverb == NULL ) {
  39.208 -            SDL_UnloadObject(mikmod.handle);
  39.209 -            return -1;
  39.210 -        }
  39.211 -        mikmod.md_sndfxvolume =
  39.212 -            (UBYTE*)
  39.213 -            SDL_LoadFunction(mikmod.handle, "md_sndfxvolume");
  39.214 -        if ( mikmod.md_sndfxvolume == NULL ) {
  39.215 -            SDL_UnloadObject(mikmod.handle);
  39.216 -            return -1;
  39.217 -        }
  39.218 -        mikmod.md_volume =
  39.219 -            (UBYTE*)
  39.220 -            SDL_LoadFunction(mikmod.handle, "md_volume");
  39.221 -        if ( mikmod.md_volume == NULL ) {
  39.222 -            SDL_UnloadObject(mikmod.handle);
  39.223 -            return -1;
  39.224 -        }
  39.225 -    }
  39.226 -    ++mikmod.loaded;
  39.227 -
  39.228 -    return 0;
  39.229 -}
  39.230 -void Mix_QuitMOD()
  39.231 -{
  39.232 -    if ( mikmod.loaded == 0 ) {
  39.233 -        return;
  39.234 -    }
  39.235 -    if ( mikmod.loaded == 1 ) {
  39.236 -        SDL_UnloadObject(mikmod.handle);
  39.237 -    }
  39.238 -    --mikmod.loaded;
  39.239 -}
  39.240 -#else
  39.241 -int Mix_InitMOD()
  39.242 -{
  39.243 -    if ( mikmod.loaded == 0 ) {
  39.244 -#ifdef __MACOSX__
  39.245 -        extern void Player_Start(MODULE*) __attribute__((weak_import));
  39.246 -        if ( Player_Start == NULL )
  39.247 -        {
  39.248 -            /* Missing weakly linked framework */
  39.249 -            Mix_SetError("Missing mikmod.framework");
  39.250 -            return -1;
  39.251 -        }
  39.252 -#endif // __MACOSX__
  39.253 -
  39.254 -        mikmod.MikMod_Exit = MikMod_Exit;
  39.255 -        mikmod.MikMod_InfoDriver = MikMod_InfoDriver;
  39.256 -        mikmod.MikMod_InfoLoader = MikMod_InfoLoader;
  39.257 -        mikmod.MikMod_Init = MikMod_Init;
  39.258 -        mikmod.MikMod_RegisterAllLoaders = MikMod_RegisterAllLoaders;
  39.259 -        mikmod.MikMod_RegisterDriver = MikMod_RegisterDriver;
  39.260 -        mikmod.MikMod_errno = &MikMod_errno;
  39.261 -        mikmod.MikMod_strerror = MikMod_strerror;
  39.262 -#if LIBMIKMOD_VERSION < ((3<<16)|(2<<8))
  39.263 -        mikmod.MikMod_free = free;
  39.264 -#else
  39.265 -        mikmod.MikMod_free = MikMod_free;
  39.266 -#endif
  39.267 -        mikmod.Player_Active = Player_Active;
  39.268 -        mikmod.Player_Free = Player_Free;
  39.269 -        mikmod.Player_LoadGeneric = Player_LoadGeneric;
  39.270 -        mikmod.Player_SetPosition = Player_SetPosition;
  39.271 -        mikmod.Player_SetVolume = Player_SetVolume;
  39.272 -        mikmod.Player_Start = Player_Start;
  39.273 -        mikmod.Player_Stop = Player_Stop;
  39.274 -        mikmod.VC_WriteBytes = VC_WriteBytes;
  39.275 -        mikmod.drv_nos = &drv_nos;
  39.276 -        mikmod.md_device = &md_device;
  39.277 -        mikmod.md_mixfreq = &md_mixfreq;
  39.278 -        mikmod.md_mode = &md_mode;
  39.279 -        mikmod.md_musicvolume = &md_musicvolume;
  39.280 -        mikmod.md_pansep = &md_pansep;
  39.281 -        mikmod.md_reverb = &md_reverb;
  39.282 -        mikmod.md_sndfxvolume = &md_sndfxvolume;
  39.283 -        mikmod.md_volume = &md_volume;
  39.284 -    }
  39.285 -    ++mikmod.loaded;
  39.286 -
  39.287 -    return 0;
  39.288 -}
  39.289 -void Mix_QuitMOD()
  39.290 -{
  39.291 -    if ( mikmod.loaded == 0 ) {
  39.292 -        return;
  39.293 -    }
  39.294 -    if ( mikmod.loaded == 1 ) {
  39.295 -    }
  39.296 -    --mikmod.loaded;
  39.297 -}
  39.298 -#endif /* MOD_DYNAMIC */
  39.299 -
  39.300 -#endif /* MOD_MUSIC */
    40.1 --- a/dynamic_mod.h	Mon Oct 16 02:16:47 2017 -0700
    40.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    40.3 @@ -1,70 +0,0 @@
    40.4 -/*
    40.5 -  SDL_mixer:  An audio mixer library based on the SDL library
    40.6 -  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
    40.7 -
    40.8 -  This software is provided 'as-is', without any express or implied
    40.9 -  warranty.  In no event will the authors be held liable for any damages
   40.10 -  arising from the use of this software.
   40.11 -
   40.12 -  Permission is granted to anyone to use this software for any purpose,
   40.13 -  including commercial applications, and to alter it and redistribute it
   40.14 -  freely, subject to the following restrictions:
   40.15 -
   40.16 -  1. The origin of this software must not be misrepresented; you must not
   40.17 -     claim that you wrote the original software. If you use this software
   40.18 -     in a product, an acknowledgment in the product documentation would be
   40.19 -     appreciated but is not required.
   40.20 -  2. Altered source versions must be plainly marked as such, and must not be
   40.21 -     misrepresented as being the original software.
   40.22 -  3. This notice may not be removed or altered from any source distribution.
   40.23 -*/
   40.24 -
   40.25 -#ifdef MOD_MUSIC
   40.26 -
   40.27 -#include "mikmod.h"
   40.28 -
   40.29 -/* libmikmod >= 3.3.2 constified several funcs */
   40.30 -#if (LIBMIKMOD_VERSION < 0x030302)
   40.31 -#define MIKMOD3_CONST
   40.32 -#else
   40.33 -#define MIKMOD3_CONST const
   40.34 -#endif
   40.35 -
   40.36 -typedef struct {
   40.37 -    int loaded;
   40.38 -    void *handle;
   40.39 -
   40.40 -    void (*MikMod_Exit)(void);
   40.41 -    CHAR* (*MikMod_InfoDriver)(void);
   40.42 -    CHAR* (*MikMod_InfoLoader)(void);
   40.43 -    int (*MikMod_Init)(MIKMOD3_CONST CHAR*);
   40.44 -    void (*MikMod_RegisterAllLoaders)(void);
   40.45 -    void (*MikMod_RegisterDriver)(struct MDRIVER*);
   40.46 -    int* MikMod_errno;
   40.47 -    MIKMOD3_CONST char* (*MikMod_strerror)(int);
   40.48 -    void (*MikMod_free)(void*);
   40.49 -    BOOL (*Player_Active)(void);
   40.50 -    void (*Player_Free)(MODULE*);
   40.51 -    MODULE* (*Player_LoadGeneric)(MREADER*,int,BOOL);
   40.52 -    void (*Player_SetPosition)(UWORD);
   40.53 -    void (*Player_SetVolume)(SWORD);
   40.54 -    void (*Player_Start)(MODULE*);
   40.55 -    void (*Player_Stop)(void);
   40.56 -    ULONG (*VC_WriteBytes)(SBYTE*,ULONG);
   40.57 -    struct MDRIVER* drv_nos;
   40.58 -    UWORD* md_device;
   40.59 -    UWORD* md_mixfreq;
   40.60 -    UWORD* md_mode;
   40.61 -    UBYTE* md_musicvolume;
   40.62 -    UBYTE* md_pansep;
   40.63 -    UBYTE* md_reverb;
   40.64 -    UBYTE* md_sndfxvolume;
   40.65 -    UBYTE* md_volume;
   40.66 -} mikmod_loader;
   40.67 -
   40.68 -extern mikmod_loader mikmod;
   40.69 -
   40.70 -#endif /* MOD_MUSIC */
   40.71 -
   40.72 -extern int Mix_InitMOD();
   40.73 -extern void Mix_QuitMOD();
    41.1 --- a/dynamic_modplug.c	Mon Oct 16 02:16:47 2017 -0700
    41.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    41.3 @@ -1,121 +0,0 @@
    41.4 -/*
    41.5 -  SDL_mixer:  An audio mixer library based on the SDL library
    41.6 -  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
    41.7 -
    41.8 -  This software is provided 'as-is', without any express or implied
    41.9 -  warranty.  In no event will the authors be held liable for any damages
   41.10 -  arising from the use of this software.
   41.11 -
   41.12 -  Permission is granted to anyone to use this software for any purpose,
   41.13 -  including commercial applications, and to alter it and redistribute it
   41.14 -  freely, subject to the following restrictions:
   41.15 -
   41.16 -  1. The origin of this software must not be misrepresented; you must not
   41.17 -     claim that you wrote the original software. If you use this software
   41.18 -     in a product, an acknowledgment in the product documentation would be
   41.19 -     appreciated but is not required.
   41.20 -  2. Altered source versions must be plainly marked as such, and must not be
   41.21 -     misrepresented as being the original software.
   41.22 -  3. This notice may not be removed or altered from any source distribution.
   41.23 -*/
   41.24 -
   41.25 -#ifdef MODPLUG_MUSIC
   41.26 -
   41.27 -#include "SDL_loadso.h"
   41.28 -#include "SDL_mixer.h"
   41.29 -#include "dynamic_modplug.h"
   41.30 -
   41.31 -modplug_loader modplug = {
   41.32 -    0, NULL
   41.33 -};
   41.34 -
   41.35 -#ifdef MODPLUG_DYNAMIC
   41.36 -int Mix_InitModPlug()
   41.37 -{
   41.38 -    if ( modplug.loaded == 0 ) {
   41.39 -        modplug.handle = SDL_LoadObject(MODPLUG_DYNAMIC);
   41.40 -        if ( modplug.handle == NULL ) {
   41.41 -            return -1;
   41.42 -        }
   41.43 -
   41.44 -        modplug.ModPlug_Load =
   41.45 -            (ModPlugFile* (*)(const void* data, int size))
   41.46 -            SDL_LoadFunction(modplug.handle, "ModPlug_Load");
   41.47 -
   41.48 -        modplug.ModPlug_Unload =
   41.49 -            (void (*)(ModPlugFile* file))
   41.50 -            SDL_LoadFunction(modplug.handle, "ModPlug_Unload");
   41.51 -
   41.52 -        modplug.ModPlug_Read =
   41.53 -            (int  (*)(ModPlugFile* file, void* buffer, int size))
   41.54 -            SDL_LoadFunction(modplug.handle, "ModPlug_Read");
   41.55 -
   41.56 -        modplug.ModPlug_Seek =
   41.57 -            (void (*)(ModPlugFile* file, int millisecond))
   41.58 -            SDL_LoadFunction(modplug.handle, "ModPlug_Seek");
   41.59 -
   41.60 -        modplug.ModPlug_GetSettings =
   41.61 -            (void (*)(ModPlug_Settings* settings))
   41.62 -            SDL_LoadFunction(modplug.handle, "ModPlug_GetSettings");
   41.63 -
   41.64 -        modplug.ModPlug_SetSettings =
   41.65 -            (void (*)(const ModPlug_Settings* settings))
   41.66 -            SDL_LoadFunction(modplug.handle, "ModPlug_SetSettings");
   41.67 -
   41.68 -        modplug.ModPlug_SetMasterVolume =
   41.69 -            (void (*)(ModPlugFile* file,unsigned int cvol))
   41.70 -            SDL_LoadFunction(modplug.handle, "ModPlug_SetMasterVolume");
   41.71 -    }
   41.72 -    ++modplug.loaded;
   41.73 -
   41.74 -    return 0;
   41.75 -}
   41.76 -
   41.77 -void Mix_QuitModPlug()
   41.78 -{
   41.79 -    if ( modplug.loaded == 0 ) {
   41.80 -        return;
   41.81 -    }
   41.82 -    if ( modplug.loaded == 1 ) {
   41.83 -        SDL_UnloadObject(modplug.handle);
   41.84 -    }
   41.85 -    --modplug.loaded;
   41.86 -}
   41.87 -#else
   41.88 -int Mix_InitModPlug()
   41.89 -{
   41.90 -    if ( modplug.loaded == 0 ) {
   41.91 -#ifdef __MACOSX__
   41.92 -        extern ModPlugFile* ModPlug_Load(const void* data, int size) __attribute__((weak_import));
   41.93 -        if ( ModPlug_Load == NULL )
   41.94 -        {
   41.95 -            /* Missing weakly linked framework */
   41.96 -            Mix_SetError("Missing modplug.framework");
   41.97 -            return -1;
   41.98 -        }
   41.99 -#endif // __MACOSX__
  41.100 -
  41.101 -        modplug.ModPlug_Load = ModPlug_Load;
  41.102 -        modplug.ModPlug_Unload = ModPlug_Unload;
  41.103 -        modplug.ModPlug_Read = ModPlug_Read;
  41.104 -        modplug.ModPlug_Seek = ModPlug_Seek;
  41.105 -        modplug.ModPlug_GetSettings = ModPlug_GetSettings;
  41.106 -        modplug.ModPlug_SetSettings = ModPlug_SetSettings;
  41.107 -        modplug.ModPlug_SetMasterVolume = ModPlug_SetMasterVolume;
  41.108 -    }
  41.109 -    ++modplug.loaded;
  41.110 -
  41.111 -    return 0;
  41.112 -}
  41.113 -void Mix_QuitModPlug()
  41.114 -{
  41.115 -    if ( modplug.loaded == 0 ) {
  41.116 -        return;
  41.117 -    }
  41.118 -    if ( modplug.loaded == 1 ) {
  41.119 -    }
  41.120 -    --modplug.loaded;
  41.121 -}
  41.122 -#endif /* MODPLUG_DYNAMIC */
  41.123 -
  41.124 -#endif /* MODPLUG_MUSIC */
    42.1 --- a/dynamic_modplug.h	Mon Oct 16 02:16:47 2017 -0700
    42.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    42.3 @@ -1,48 +0,0 @@
    42.4 -/*
    42.5 -  SDL_mixer:  An audio mixer library based on the SDL library
    42.6 -  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
    42.7 -
    42.8 -  This software is provided 'as-is', without any express or implied
    42.9 -  warranty.  In no event will the authors be held liable for any damages
   42.10 -  arising from the use of this software.
   42.11 -
   42.12 -  Permission is granted to anyone to use this software for any purpose,
   42.13 -  including commercial applications, and to alter it and redistribute it
   42.14 -  freely, subject to the following restrictions:
   42.15 -
   42.16 -  1. The origin of this software must not be misrepresented; you must not
   42.17 -     claim that you wrote the original software. If you use this software
   42.18 -     in a product, an acknowledgment in the product documentation would be
   42.19 -     appreciated but is not required.
   42.20 -  2. Altered source versions must be plainly marked as such, and must not be
   42.21 -     misrepresented as being the original software.
   42.22 -  3. This notice may not be removed or altered from any source distribution.
   42.23 -*/
   42.24 -
   42.25 -#ifdef MODPLUG_MUSIC
   42.26 -
   42.27 -#ifdef MODPLUG_HEADER
   42.28 -#include MODPLUG_HEADER
   42.29 -#else
   42.30 -#include <libmodplug/modplug.h>
   42.31 -#endif
   42.32 -
   42.33 -typedef struct {
   42.34 -    int loaded;
   42.35 -    void *handle;
   42.36 -
   42.37 -    ModPlugFile* (*ModPlug_Load)(const void* data, int size);
   42.38 -    void (*ModPlug_Unload)(ModPlugFile* file);
   42.39 -    int  (*ModPlug_Read)(ModPlugFile* file, void* buffer, int size);
   42.40 -    void (*ModPlug_Seek)(ModPlugFile* file, int millisecond);
   42.41 -    void (*ModPlug_GetSettings)(ModPlug_Settings* settings);
   42.42 -    void (*ModPlug_SetSettings)(const ModPlug_Settings* settings);
   42.43 -    void (*ModPlug_SetMasterVolume)(ModPlugFile* file,unsigned int cvol) ;
   42.44 -} modplug_loader;
   42.45 -
   42.46 -extern modplug_loader modplug;
   42.47 -
   42.48 -#endif /* MODPLUG_MUSIC */
   42.49 -
   42.50 -extern int Mix_InitModPlug();
   42.51 -extern void Mix_QuitModPlug();
    43.1 --- a/dynamic_mp3.c	Mon Oct 16 02:16:47 2017 -0700
    43.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    43.3 @@ -1,200 +0,0 @@
    43.4 -/*
    43.5 -  SDL_mixer:  An audio mixer library based on the SDL library
    43.6 -  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
    43.7 -
    43.8 -  This software is provided 'as-is', without any express or implied
    43.9 -  warranty.  In no event will the authors be held liable for any damages
   43.10 -  arising from the use of this software.
   43.11 -
   43.12 -  Permission is granted to anyone to use this software for any purpose,
   43.13 -  including commercial applications, and to alter it and redistribute it
   43.14 -  freely, subject to the following restrictions:
   43.15 -
   43.16 -  1. The origin of this software must not be misrepresented; you must not
   43.17 -     claim that you wrote the original software. If you use this software
   43.18 -     in a product, an acknowledgment in the product documentation would be
   43.19 -     appreciated but is not required.
   43.20 -  2. Altered source versions must be plainly marked as such, and must not be
   43.21 -     misrepresented as being the original software.
   43.22 -  3. This notice may not be removed or altered from any source distribution.
   43.23 -*/
   43.24 -
   43.25 -#ifdef MP3_MUSIC
   43.26 -
   43.27 -#include "SDL_loadso.h"
   43.28 -#include "SDL_mixer.h"
   43.29 -#include "dynamic_mp3.h"
   43.30 -
   43.31 -smpeg_loader smpeg = {
   43.32 -    0, NULL
   43.33 -};
   43.34 -
   43.35 -#ifdef MP3_DYNAMIC
   43.36 -int Mix_InitMP3()
   43.37 -{
   43.38 -    if ( smpeg.loaded == 0 ) {
   43.39 -        smpeg.handle = SDL_LoadObject(MP3_DYNAMIC);
   43.40 -        if ( smpeg.handle == NULL ) {
   43.41 -            return -1;
   43.42 -        }
   43.43 -        smpeg.SMPEG_actualSpec =
   43.44 -            (void (*)( SMPEG *, SDL_AudioSpec * ))
   43.45 -            SDL_LoadFunction(smpeg.handle, "SMPEG_actualSpec");
   43.46 -        if ( smpeg.SMPEG_actualSpec == NULL ) {
   43.47 -            SDL_UnloadObject(smpeg.handle);
   43.48 -            return -1;
   43.49 -        }
   43.50 -        smpeg.SMPEG_delete =
   43.51 -            (void (*)( SMPEG* ))
   43.52 -            SDL_LoadFunction(smpeg.handle, "SMPEG_delete");
   43.53 -        if ( smpeg.SMPEG_delete == NULL ) {
   43.54 -            SDL_UnloadObject(smpeg.handle);
   43.55 -            return -1;
   43.56 -        }
   43.57 -        smpeg.SMPEG_enableaudio =
   43.58 -            (void (*)( SMPEG*, int ))
   43.59 -            SDL_LoadFunction(smpeg.handle, "SMPEG_enableaudio");
   43.60 -        if ( smpeg.SMPEG_enableaudio == NULL ) {
   43.61 -            SDL_UnloadObject(smpeg.handle);
   43.62 -            return -1;
   43.63 -        }
   43.64 -        smpeg.SMPEG_enablevideo =
   43.65 -            (void (*)( SMPEG*, int ))
   43.66 -            SDL_LoadFunction(smpeg.handle, "SMPEG_enablevideo");
   43.67 -        if ( smpeg.SMPEG_enablevideo == NULL ) {
   43.68 -            SDL_UnloadObject(smpeg.handle);
   43.69 -            return -1;
   43.70 -        }
   43.71 -        smpeg.SMPEG_new_rwops =
   43.72 -            (SMPEG* (*)(SDL_RWops *, SMPEG_Info*, int, int))
   43.73 -            SDL_LoadFunction(smpeg.handle, "SMPEG_new_rwops");
   43.74 -        if ( smpeg.SMPEG_new_rwops == NULL ) {
   43.75 -            SDL_UnloadObject(smpeg.handle);
   43.76 -            return -1;
   43.77 -        }
   43.78 -        smpeg.SMPEG_play =
   43.79 -            (void (*)( SMPEG* ))
   43.80 -            SDL_LoadFunction(smpeg.handle, "SMPEG_play");
   43.81 -        if ( smpeg.SMPEG_play == NULL ) {
   43.82 -            SDL_UnloadObject(smpeg.handle);
   43.83 -            return -1;
   43.84 -        }
   43.85 -        smpeg.SMPEG_playAudio =
   43.86 -            (int (*)( SMPEG *, Uint8 *, int ))
   43.87 -            SDL_LoadFunction(smpeg.handle, "SMPEG_playAudio");
   43.88 -        if ( smpeg.SMPEG_playAudio == NULL ) {
   43.89 -            SDL_UnloadObject(smpeg.handle);
   43.90 -            return -1;
   43.91 -        }
   43.92 -        smpeg.SMPEG_rewind =
   43.93 -            (void (*)( SMPEG* ))
   43.94 -            SDL_LoadFunction(smpeg.handle, "SMPEG_rewind");
   43.95 -        if ( smpeg.SMPEG_rewind == NULL ) {
   43.96 -            SDL_UnloadObject(smpeg.handle);
   43.97 -            return -1;
   43.98 -        }
   43.99 -        smpeg.SMPEG_setvolume =
  43.100 -            (void (*)( SMPEG*, int ))
  43.101 -            SDL_LoadFunction(smpeg.handle, "SMPEG_setvolume");
  43.102 -        if ( smpeg.SMPEG_setvolume == NULL ) {
  43.103 -            SDL_UnloadObject(smpeg.handle);
  43.104 -            return -1;
  43.105 -        }
  43.106 -        smpeg.SMPEG_skip =
  43.107 -            (void (*)( SMPEG*, float ))
  43.108 -            SDL_LoadFunction(smpeg.handle, "SMPEG_skip");
  43.109 -        if ( smpeg.SMPEG_skip == NULL ) {
  43.110 -            SDL_UnloadObject(smpeg.handle);
  43.111 -            return -1;
  43.112 -        }
  43.113 -        smpeg.SMPEG_status =
  43.114 -            (SMPEGstatus (*)( SMPEG* ))
  43.115 -            SDL_LoadFunction(smpeg.handle, "SMPEG_status");
  43.116 -        if ( smpeg.SMPEG_status == NULL ) {
  43.117 -            SDL_UnloadObject(smpeg.handle);
  43.118 -            return -1;
  43.119 -        }
  43.120 -        smpeg.SMPEG_stop =
  43.121 -            (void (*)( SMPEG* ))
  43.122 -            SDL_LoadFunction(smpeg.handle, "SMPEG_stop");
  43.123 -        if ( smpeg.SMPEG_stop == NULL ) {
  43.124 -            SDL_UnloadObject(smpeg.handle);
  43.125 -            return -1;
  43.126 -        }
  43.127 -    }
  43.128 -    ++smpeg.loaded;
  43.129 -
  43.130 -    return 0;
  43.131 -}
  43.132 -void Mix_QuitMP3()
  43.133 -{
  43.134 -    if ( smpeg.loaded == 0 ) {
  43.135 -        return;
  43.136 -    }
  43.137 -    if ( smpeg.loaded == 1 ) {
  43.138 -        SDL_UnloadObject(smpeg.handle);
  43.139 -    }
  43.140 -    --smpeg.loaded;
  43.141 -}
  43.142 -#else
  43.143 -int Mix_InitMP3()
  43.144 -{
  43.145 -    if ( smpeg.loaded == 0 ) {
  43.146 -#ifdef __MACOSX__
  43.147 -        extern SMPEG* SMPEG_new_rwops(SDL_RWops*, SMPEG_Info*, int, int) __attribute__((weak_import));
  43.148 -        if ( SMPEG_new_rwops == NULL )
  43.149 -        {
  43.150 -            /* Missing weakly linked framework */
  43.151 -            Mix_SetError("Missing smpeg2.framework");
  43.152 -            return -1;
  43.153 -        }
  43.154 -#endif // __MACOSX__
  43.155 -
  43.156 -        smpeg.SMPEG_actualSpec = SMPEG_actualSpec;
  43.157 -        smpeg.SMPEG_delete = SMPEG_delete;
  43.158 -        smpeg.SMPEG_enableaudio = SMPEG_enableaudio;
  43.159 -        smpeg.SMPEG_enablevideo = SMPEG_enablevideo;
  43.160 -        smpeg.SMPEG_new_rwops = SMPEG_new_rwops;
  43.161 -        smpeg.SMPEG_play = SMPEG_play;
  43.162 -        smpeg.SMPEG_playAudio = SMPEG_playAudio;
  43.163 -        smpeg.SMPEG_rewind = SMPEG_rewind;
  43.164 -        smpeg.SMPEG_setvolume = SMPEG_setvolume;
  43.165 -        smpeg.SMPEG_skip = SMPEG_skip;
  43.166 -        smpeg.SMPEG_status = SMPEG_status;
  43.167 -        smpeg.SMPEG_stop = SMPEG_stop;
  43.168 -    }
  43.169 -    ++smpeg.loaded;
  43.170 -
  43.171 -    return 0;
  43.172 -}
  43.173 -void Mix_QuitMP3()
  43.174 -{
  43.175 -    if ( smpeg.loaded == 0 ) {
  43.176 -        return;
  43.177 -    }
  43.178 -    if ( smpeg.loaded == 1 ) {
  43.179 -    }
  43.180 -    --smpeg.loaded;
  43.181 -}
  43.182 -#endif /* MP3_DYNAMIC */
  43.183 -
  43.184 -#elif defined(MP3_MPG_MUSIC)
  43.185 -#include "mpg123.h"
  43.186 -
  43.187 -int Mix_InitMP3()
  43.188 -{
  43.189 -    int result;
  43.190 -
  43.191 -    result = mpg123_init();
  43.192 -    if (result != MPG123_OK) {
  43.193 -        return 1;
  43.194 -    }
  43.195 -
  43.196 -    return 0;
  43.197 -}
  43.198 -
  43.199 -void Mix_QuitMP3() {
  43.200 -    mpg123_exit();
  43.201 -}
  43.202 -
  43.203 -#endif /* MP3_MUSIC */
    44.1 --- a/dynamic_mp3.h	Mon Oct 16 02:16:47 2017 -0700
    44.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    44.3 @@ -1,58 +0,0 @@
    44.4 -/*
    44.5 -  SDL_mixer:  An audio mixer library based on the SDL library
    44.6 -  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
    44.7 -
    44.8 -  This software is provided 'as-is', without any express or implied
    44.9 -  warranty.  In no event will the authors be held liable for any damages
   44.10 -  arising from the use of this software.
   44.11 -
   44.12 -  Permission is granted to anyone to use this software for any purpose,
   44.13 -  including commercial applications, and to alter it and redistribute it
   44.14 -  freely, subject to the following restrictions:
   44.15 -
   44.16 -  1. The origin of this software must not be misrepresented; you must not
   44.17 -     claim that you wrote the original software. If you use this software
   44.18 -     in a product, an acknowledgment in the product documentation would be
   44.19 -     appreciated but is not required.
   44.20 -  2. Altered source versions must be plainly marked as such, and must not be
   44.21 -     misrepresented as being the original software.
   44.22 -  3. This notice may not be removed or altered from any source distribution.
   44.23 -*/
   44.24 -
   44.25 -#ifdef MP3_MUSIC
   44.26 -
   44.27 -#if SDL_VERSION_ATLEAST(2, 0, 0)
   44.28 -/* Forward declaration for SDL 2.0  because struct is not available there but
   44.29 -   still used in a file included with smpeg.h. May not compile if missing. */
   44.30 -typedef struct SDL_Overlay SDL_Overlay;
   44.31 -#endif
   44.32 -
   44.33 -#include "smpeg.h"
   44.34 -
   44.35 -typedef struct {
   44.36 -    int loaded;
   44.37 -    void *handle;
   44.38 -    void (*SMPEG_actualSpec)( SMPEG *mpeg, SDL_AudioSpec *spec );
   44.39 -    void (*SMPEG_delete)( SMPEG* mpeg );
   44.40 -    void (*SMPEG_enableaudio)( SMPEG* mpeg, int enable );
   44.41 -    void (*SMPEG_enablevideo)( SMPEG* mpeg, int enable );
   44.42 -    SMPEG* (*SMPEG_new_rwops)(SDL_RWops *src, SMPEG_Info* info, int freesrc, int sdl_audio);
   44.43 -    void (*SMPEG_play)( SMPEG* mpeg );
   44.44 -    int (*SMPEG_playAudio)( SMPEG *mpeg, Uint8 *stream, int len );
   44.45 -    void (*SMPEG_rewind)( SMPEG* mpeg );
   44.46 -    void (*SMPEG_setvolume)( SMPEG* mpeg, int volume );
   44.47 -    void (*SMPEG_skip)( SMPEG* mpeg, float seconds );
   44.48 -    SMPEGstatus (*SMPEG_status)( SMPEG* mpeg );
   44.49 -    void (*SMPEG_stop)( SMPEG* mpeg );
   44.50 -} smpeg_loader;
   44.51 -
   44.52 -extern smpeg_loader smpeg;
   44.53 -
   44.54 -#elif defined(MP3_MPG_MUSIC)
   44.55 -
   44.56 -#include "mpg123.h"
   44.57 -
   44.58 -#endif /* MUSIC_MP3 */
   44.59 -
   44.60 -extern int Mix_InitMP3();
   44.61 -extern void Mix_QuitMP3();
    45.1 --- a/dynamic_ogg.c	Mon Oct 16 02:16:47 2017 -0700
    45.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    45.3 @@ -1,141 +0,0 @@
    45.4 -/*
    45.5 -  SDL_mixer:  An audio mixer library based on the SDL library
    45.6 -  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
    45.7 -
    45.8 -  This software is provided 'as-is', without any express or implied
    45.9 -  warranty.  In no event will the authors be held liable for any damages
   45.10 -  arising from the use of this software.
   45.11 -
   45.12 -  Permission is granted to anyone to use this software for any purpose,
   45.13 -  including commercial applications, and to alter it and redistribute it
   45.14 -  freely, subject to the following restrictions:
   45.15 -
   45.16 -  1. The origin of this software must not be misrepresented; you must not
   45.17 -     claim that you wrote the original software. If you use this software
   45.18 -     in a product, an acknowledgment in the product documentation would be
   45.19 -     appreciated but is not required.
   45.20 -  2. Altered source versions must be plainly marked as such, and must not be
   45.21 -     misrepresented as being the original software.
   45.22 -  3. This notice may not be removed or altered from any source distribution.
   45.23 -*/
   45.24 -
   45.25 -#ifdef OGG_MUSIC
   45.26 -
   45.27 -#include "SDL_loadso.h"
   45.28 -#include "SDL_mixer.h"
   45.29 -#include "dynamic_ogg.h"
   45.30 -
   45.31 -vorbis_loader vorbis = {
   45.32 -    0, NULL
   45.33 -};
   45.34 -
   45.35 -#ifdef OGG_DYNAMIC
   45.36 -int Mix_InitOgg()
   45.37 -{
   45.38 -    if ( vorbis.loaded == 0 ) {
   45.39 -        vorbis.handle = SDL_LoadObject(OGG_DYNAMIC);
   45.40 -        if ( vorbis.handle == NULL ) {
   45.41 -            return -1;
   45.42 -        }
   45.43 -        vorbis.ov_clear =
   45.44 -            (int (*)(OggVorbis_File *))
   45.45 -            SDL_LoadFunction(vorbis.handle, "ov_clear");
   45.46 -        if ( vorbis.ov_clear == NULL ) {
   45.47 -            SDL_UnloadObject(vorbis.handle);
   45.48 -            return -1;
   45.49 -        }
   45.50 -        vorbis.ov_info =
   45.51 -            (vorbis_info *(*)(OggVorbis_File *,int))
   45.52 -            SDL_LoadFunction(vorbis.handle, "ov_info");
   45.53 -        if ( vorbis.ov_info == NULL ) {
   45.54 -            SDL_UnloadObject(vorbis.handle);
   45.55 -            return -1;
   45.56 -        }
   45.57 -        vorbis.ov_open_callbacks =
   45.58 -            (int (*)(void *, OggVorbis_File *, const char *, long, ov_callbacks))
   45.59 -            SDL_LoadFunction(vorbis.handle, "ov_open_callbacks");
   45.60 -        if ( vorbis.ov_open_callbacks == NULL ) {
   45.61 -            SDL_UnloadObject(vorbis.handle);
   45.62 -            return -1;
   45.63 -        }
   45.64 -        vorbis.ov_pcm_total =
   45.65 -            (ogg_int64_t (*)(OggVorbis_File *,int))
   45.66 -            SDL_LoadFunction(vorbis.handle, "ov_pcm_total");
   45.67 -        if ( vorbis.ov_pcm_total == NULL ) {
   45.68 -            SDL_UnloadObject(vorbis.handle);
   45.69 -            return -1;
   45.70 -        }
   45.71 -        vorbis.ov_read =
   45.72 -#ifdef OGG_USE_TREMOR
   45.73 -            (long (*)(OggVorbis_File *,char *,int,int *))
   45.74 -#else
   45.75 -            (long (*)(OggVorbis_File *,char *,int,int,int,int,int *))
   45.76 -#endif
   45.77 -            SDL_LoadFunction(vorbis.handle, "ov_read");
   45.78 -        if ( vorbis.ov_read == NULL ) {
   45.79 -            SDL_UnloadObject(vorbis.handle);
   45.80 -            return -1;
   45.81 -        }
   45.82 -        vorbis.ov_time_seek =
   45.83 -#ifdef OGG_USE_TREMOR
   45.84 -            (long (*)(OggVorbis_File *,ogg_int64_t))
   45.85 -#else
   45.86 -            (int (*)(OggVorbis_File *,double))
   45.87 -#endif
   45.88 -            SDL_LoadFunction(vorbis.handle, "ov_time_seek");
   45.89 -        if ( vorbis.ov_time_seek == NULL ) {
   45.90 -            SDL_UnloadObject(vorbis.handle);
   45.91 -            return -1;
   45.92 -        }
   45.93 -    }
   45.94 -    ++vorbis.loaded;
   45.95 -
   45.96 -    return 0;
   45.97 -}
   45.98 -void Mix_QuitOgg()
   45.99 -{
  45.100 -    if ( vorbis.loaded == 0 ) {
  45.101 -        return;
  45.102 -    }
  45.103 -    if ( vorbis.loaded == 1 ) {
  45.104 -        SDL_UnloadObject(vorbis.handle);
  45.105 -    }
  45.106 -    --vorbis.loaded;
  45.107 -}
  45.108 -#else
  45.109 -int Mix_InitOgg()
  45.110 -{
  45.111 -    if ( vorbis.loaded == 0 ) {
  45.112 -#ifdef __MACOSX__
  45.113 -        extern int ov_open_callbacks(void*, OggVorbis_File*, const char*, long, ov_callbacks) __attribute__((weak_import));
  45.114 -        if ( ov_open_callbacks == NULL )
  45.115 -        {
  45.116 -            /* Missing weakly linked framework */
  45.117 -            Mix_SetError("Missing Vorbis.framework");
  45.118 -            return -1;
  45.119 -        }
  45.120 -#endif // __MACOSX__
  45.121 -
  45.122 -        vorbis.ov_clear = ov_clear;
  45.123 -        vorbis.ov_info = ov_info;
  45.124 -        vorbis.ov_open_callbacks = ov_open_callbacks;
  45.125 -        vorbis.ov_pcm_total = ov_pcm_total;
  45.126 -        vorbis.ov_read = ov_read;
  45.127 -        vorbis.ov_time_seek = ov_time_seek;
  45.128 -    }
  45.129 -    ++vorbis.loaded;
  45.130 -
  45.131 -    return 0;
  45.132 -}
  45.133 -void Mix_QuitOgg()
  45.134 -{
  45.135 -    if ( vorbis.loaded == 0 ) {
  45.136 -        return;
  45.137 -    }
  45.138 -    if ( vorbis.loaded == 1 ) {
  45.139 -    }
  45.140 -    --vorbis.loaded;
  45.141 -}
  45.142 -#endif /* OGG_DYNAMIC */
  45.143 -
  45.144 -#endif /* OGG_MUSIC */
    46.1 --- a/dynamic_ogg.h	Mon Oct 16 02:16:47 2017 -0700
    46.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    46.3 @@ -1,55 +0,0 @@
    46.4 -/*
    46.5 -  SDL_mixer:  An audio mixer library based on the SDL library
    46.6 -  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
    46.7 -
    46.8 -  This software is provided 'as-is', without any express or implied
    46.9 -  warranty.  In no event will the authors be held liable for any damages
   46.10 -  arising from the use of this software.
   46.11 -
   46.12 -  Permission is granted to anyone to use this software for any purpose,
   46.13 -  including commercial applications, and to alter it and redistribute it
   46.14 -  freely, subject to the following restrictions:
   46.15 -
   46.16 -  1. The origin of this software must not be misrepresented; you must not
   46.17 -     claim that you wrote the original software. If you use this software
   46.18 -     in a product, an acknowledgment in the product documentation would be
   46.19 -     appreciated but is not required.
   46.20 -  2. Altered source versions must be plainly marked as such, and must not be
   46.21 -     misrepresented as being the original software.
   46.22 -  3. This notice may not be removed or altered from any source distribution.
   46.23 -*/
   46.24 -
   46.25 -#ifdef OGG_MUSIC
   46.26 -#if defined(OGG_HEADER)
   46.27 -#include OGG_HEADER
   46.28 -#elif defined(OGG_USE_TREMOR)
   46.29 -#include <tremor/ivorbisfile.h>
   46.30 -#else
   46.31 -#include <vorbis/vorbisfile.h>
   46.32 -#endif
   46.33 -
   46.34 -typedef struct {
   46.35 -    int loaded;
   46.36 -    void *handle;
   46.37 -    int (*ov_clear)(OggVorbis_File *vf);
   46.38 -    vorbis_info *(*ov_info)(OggVorbis_File *vf,int link);
   46.39 -    int (*ov_open_callbacks)(void *datasource, OggVorbis_File *vf, const char *initial, long ibytes, ov_callbacks callbacks);
   46.40 -    ogg_int64_t (*ov_pcm_total)(OggVorbis_File *vf,int i);
   46.41 -#ifdef OGG_USE_TREMOR
   46.42 -    long (*ov_read)(OggVorbis_File *vf,char *buffer,int length, int *bitstream);
   46.43 -#else
   46.44 -    long (*ov_read)(OggVorbis_File *vf,char *buffer,int length, int bigendianp,int word,int sgned,int *bitstream);
   46.45 -#endif
   46.46 -#ifdef OGG_USE_TREMOR
   46.47 -    int (*ov_time_seek)(OggVorbis_File *vf,ogg_int64_t pos);
   46.48 -#else
   46.49 -    int (*ov_time_seek)(OggVorbis_File *vf,double pos);
   46.50 -#endif
   46.51 -} vorbis_loader;
   46.52 -
   46.53 -extern vorbis_loader vorbis;
   46.54 -
   46.55 -#endif /* OGG_MUSIC */
   46.56 -
   46.57 -extern int Mix_InitOgg();
   46.58 -extern void Mix_QuitOgg();
    47.1 --- a/effect_position.c	Mon Oct 16 02:16:47 2017 -0700
    47.2 +++ b/effect_position.c	Tue Oct 17 02:33:47 2017 -0700
    47.3 @@ -395,12 +395,12 @@
    47.4          *p = (d[l[(*p & 0xFF000000) >> 24]] << 24) |
    47.5               (d[r[(*p & 0x00FF0000) >> 16]] << 16) |
    47.6               (d[l[(*p & 0x0000FF00) >>  8]] <<  8) |
    47.7 -             (d[r[(*p & 0x000000FF)      ]]      ) ;
    47.8 +             (d[r[(*p & 0x000000FF)      ]]     ) ;
    47.9  #else
   47.10          *p = (d[r[(*p & 0xFF000000) >> 24]] << 24) |
   47.11               (d[l[(*p & 0x00FF0000) >> 16]] << 16) |
   47.12               (d[r[(*p & 0x0000FF00) >>  8]] <<  8) |
   47.13 -             (d[l[(*p & 0x000000FF)      ]]      ) ;
   47.14 +             (d[l[(*p & 0x000000FF)      ]]     ) ;
   47.15  #endif
   47.16          ++p;
   47.17      }
   47.18 @@ -586,12 +586,12 @@
   47.19          *p = (d[l[((Sint16)(Sint8)((*p & 0xFF000000) >> 24))+128]] << 24) |
   47.20               (d[r[((Sint16)(Sint8)((*p & 0x00FF0000) >> 16))+128]] << 16) |
   47.21               (d[l[((Sint16)(Sint8)((*p & 0x0000FF00) >>  8))+128]] <<  8) |
   47.22 -             (d[r[((Sint16)(Sint8)((*p & 0x000000FF)      ))+128]]      ) ;
   47.23 +             (d[r[((Sint16)(Sint8)((*p & 0x000000FF)     ))+128]]     ) ;
   47.24  #else
   47.25          *p = (d[r[((Sint16)(Sint8)((*p & 0xFF000000) >> 24))+128]] << 24) |
   47.26               (d[l[((Sint16)(Sint8)((*p & 0x00FF0000) >> 16))+128]] << 16) |
   47.27               (d[r[((Sint16)(Sint8)((*p & 0x0000FF00) >>  8))+128]] <<  8) |
   47.28 -             (d[l[((Sint16)(Sint8)((*p & 0x000000FF)      ))+128]]      ) ;
   47.29 +             (d[l[((Sint16)(Sint8)((*p & 0x000000FF)     ))+128]]     ) ;
   47.30  #endif
   47.31          ++p;
   47.32      }
   47.33 @@ -1875,7 +1875,7 @@
   47.34          angle = -angle;
   47.35              angle = angle * 90 / 128; /* Make it larger for more effect? */
   47.36          }
   47.37 -        return( Mix_SetPosition(channel, angle, 0) );
   47.38 +        return(Mix_SetPosition(channel, angle, 0));
   47.39      }
   47.40  
   47.41      f = get_position_effect_func(format, channels);
   47.42 @@ -2046,3 +2046,4 @@
   47.43  
   47.44  /* end of effects_position.c ... */
   47.45  
   47.46 +/* vi: set ts=4 sw=4 expandtab: */
    48.1 --- a/effect_stereoreverse.c	Mon Oct 16 02:16:47 2017 -0700
    48.2 +++ b/effect_stereoreverse.c	Tue Oct 17 02:33:47 2017 -0700
    48.3 @@ -143,3 +143,4 @@
    48.4  
    48.5  /* end of effect_stereoreverse.c ... */
    48.6  
    48.7 +/* vi: set ts=4 sw=4 expandtab: */
    49.1 --- a/effects_internal.c	Mon Oct 16 02:16:47 2017 -0700
    49.2 +++ b/effects_internal.c	Tue Oct 17 02:33:47 2017 -0700
    49.3 @@ -122,3 +122,4 @@
    49.4  
    49.5  /* end of effects.c ... */
    49.6  
    49.7 +/* vi: set ts=4 sw=4 expandtab: */
    50.1 --- a/effects_internal.h	Mon Oct 16 02:16:47 2017 -0700
    50.2 +++ b/effects_internal.h	Tue Oct 17 02:33:47 2017 -0700
    50.3 @@ -30,11 +30,6 @@
    50.4  
    50.5  #include "SDL_mixer.h"
    50.6  
    50.7 -/* Set up for C function definitions, even when using C++ */
    50.8 -#ifdef __cplusplus
    50.9 -extern "C" {
   50.10 -#endif
   50.11 -
   50.12  extern int _Mix_effects_max_speed;
   50.13  extern void *_Eff_volume_table;
   50.14  void *_Eff_build_volume_table_u8(void);
   50.15 @@ -49,12 +44,6 @@
   50.16  int _Mix_UnregisterEffect_locked(int channel, Mix_EffectFunc_t f);
   50.17  int _Mix_UnregisterAllEffects_locked(int channel);
   50.18  
   50.19 +#endif /* _INCLUDE_EFFECTS_INTERNAL_H_ */
   50.20  
   50.21 -/* Set up for C function definitions, even when using C++ */
   50.22 -#ifdef __cplusplus
   50.23 -}
   50.24 -#endif
   50.25 -
   50.26 -
   50.27 -#endif
   50.28 -
   50.29 +/* vi: set ts=4 sw=4 expandtab: */
    51.1 --- a/fluidsynth.c	Mon Oct 16 02:16:47 2017 -0700
    51.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    51.3 @@ -1,223 +0,0 @@
    51.4 -/*
    51.5 -  SDL_mixer:  An audio mixer library based on the SDL library
    51.6 -  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
    51.7 -
    51.8 -  This software is provided 'as-is', without any express or implied
    51.9 -  warranty.  In no event will the authors be held liable for any damages
   51.10 -  arising from the use of this software.
   51.11 -
   51.12 -  Permission is granted to anyone to use this software for any purpose,
   51.13 -  including commercial applications, and to alter it and redistribute it
   51.14 -  freely, subject to the following restrictions:
   51.15 -
   51.16 -  1. The origin of this software must not be misrepresented; you must not
   51.17 -     claim that you wrote the original software. If you use this software
   51.18 -     in a product, an acknowledgment in the product documentation would be
   51.19 -     appreciated but is not required.
   51.20 -  2. Altered source versions must be plainly marked as such, and must not be
   51.21 -     misrepresented as being the original software.
   51.22 -  3. This notice may not be removed or altered from any source distribution.
   51.23 -
   51.24 -  James Le Cuirot
   51.25 -  chewi@aura-online.co.uk
   51.26 -*/
   51.27 -
   51.28 -#ifdef USE_FLUIDSYNTH_MIDI
   51.29 -
   51.30 -#include <stdio.h>
   51.31 -#include <sys/types.h>
   51.32 -
   51.33 -#include "SDL_mixer.h"
   51.34 -#include "fluidsynth.h"
   51.35 -
   51.36 -static Uint16 format;
   51.37 -static Uint8 channels;
   51.38 -static int freq;
   51.39 -
   51.40 -int fluidsynth_check_soundfont(const char *path, void *data)
   51.41 -{
   51.42 -    FILE *file = fopen(path, "r");
   51.43 -
   51.44 -    if (file) {
   51.45 -        fclose(file);
   51.46 -        return 1;
   51.47 -    } else {
   51.48 -        Mix_SetError("Failed to access the SoundFont %s", path);
   51.49 -        return 0;
   51.50 -    }
   51.51 -}
   51.52 -
   51.53 -int fluidsynth_load_soundfont(const char *path, void *data)
   51.54 -{
   51.55 -    /* If this fails, it's too late to try Timidity so pray that at least one works. */
   51.56 -    fluidsynth.fluid_synth_sfload((fluid_synth_t*) data, path, 1);
   51.57 -    return 1;
   51.58 -}
   51.59 -
   51.60 -int fluidsynth_init(SDL_AudioSpec *mixer)
   51.61 -{
   51.62 -    if (!Mix_EachSoundFont(fluidsynth_check_soundfont, NULL))
   51.63 -        return -1;
   51.64 -
   51.65 -    format = mixer->format;
   51.66 -    channels = mixer->channels;
   51.67 -    freq = mixer->freq;
   51.68 -
   51.69 -    return 0;
   51.70 -}
   51.71 -
   51.72 -static FluidSynthMidiSong *fluidsynth_loadsong_common(int (*function)(FluidSynthMidiSong*, void*), void *data)
   51.73 -{
   51.74 -    FluidSynthMidiSong *song;
   51.75 -    fluid_settings_t *settings = NULL;
   51.76 -
   51.77 -    if (!Mix_Init(MIX_INIT_FLUIDSYNTH)) {
   51.78 -        return NULL;
   51.79 -    }
   51.80 -
   51.81 -    if ((song = SDL_malloc(sizeof(FluidSynthMidiSong)))) {
   51.82 -        SDL_memset(song, 0, sizeof(FluidSynthMidiSong));
   51.83 -
   51.84 -        if (SDL_BuildAudioCVT(&song->convert, AUDIO_S16, 2, freq, format, channels, freq) >= 0) {
   51.85 -            if ((settings = fluidsynth.new_fluid_settings())) {
   51.86 -                fluidsynth.fluid_settings_setnum(settings, "synth.sample-rate", (double) freq);
   51.87 -
   51.88 -                if ((song->synth = fluidsynth.new_fluid_synth(settings))) {
   51.89 -                    if (Mix_EachSoundFont(fluidsynth_load_soundfont, (void*) song->synth)) {
   51.90 -                        if ((song->player = fluidsynth.new_fluid_player(song->synth))) {
   51.91 -                            if (function(song, data)) return song;
   51.92 -                            fluidsynth.delete_fluid_player(song->player);
   51.93 -                        } else {
   51.94 -                            Mix_SetError("Failed to create FluidSynth player");
   51.95 -                        }
   51.96 -                    }
   51.97 -                    fluidsynth.delete_fluid_synth(song->synth);
   51.98 -                } else {
   51.99 -                    Mix_SetError("Failed to create FluidSynth synthesizer");
  51.100 -                }
  51.101 -                fluidsynth.delete_fluid_settings(settings);
  51.102 -            } else {
  51.103 -                Mix_SetError("Failed to create FluidSynth settings");
  51.104 -            }
  51.105 -        } else {
  51.106 -            Mix_SetError("Failed to set up audio conversion");
  51.107 -        }
  51.108 -        SDL_free(song);
  51.109 -    } else {
  51.110 -        Mix_SetError("Insufficient memory for song");
  51.111 -    }
  51.112 -    return NULL;
  51.113 -}
  51.114 -
  51.115 -static int fluidsynth_loadsong_RW_internal(FluidSynthMidiSong *song, void *data)
  51.116 -{
  51.117 -    Sint64 offset;
  51.118 -    size_t size;
  51.119 -    char *buffer;
  51.120 -    SDL_RWops *src = (SDL_RWops*) data;
  51.121 -
  51.122 -    offset = SDL_RWtell(src);
  51.123 -    SDL_RWseek(src, 0, RW_SEEK_END);
  51.124 -    size = (size_t)(SDL_RWtell(src) - offset);
  51.125 -    SDL_RWseek(src, offset, RW_SEEK_SET);
  51.126 -
  51.127 -    if ((buffer = (char*) SDL_malloc(size))) {
  51.128 -        if(SDL_RWread(src, buffer, size, 1) == 1) {
  51.129 -            if (fluidsynth.fluid_player_add_mem(song->player, buffer, size) == FLUID_OK) {
  51.130 -                SDL_free(buffer);
  51.131 -                return 1;
  51.132 -            } else {
  51.133 -                Mix_SetError("FluidSynth failed to load in-memory song");
  51.134 -            }
  51.135 -        } else {
  51.136 -            Mix_SetError("Failed to read in-memory song");
  51.137 -        }
  51.138 -        SDL_free(buffer);
  51.139 -    } else {
  51.140 -        Mix_SetError("Insufficient memory for song");
  51.141 -    }
  51.142 -    return 0;
  51.143 -}
  51.144 -
  51.145 -FluidSynthMidiSong *fluidsynth_loadsong_RW(SDL_RWops *src, int freesrc)
  51.146 -{
  51.147 -    FluidSynthMidiSong *song;
  51.148 -
  51.149 -    song = fluidsynth_loadsong_common(fluidsynth_loadsong_RW_internal, (void*) src);
  51.150 -    if (song && freesrc) {
  51.151 -        SDL_RWclose(src);
  51.152 -    }
  51.153 -    return song;
  51.154 -}
  51.155 -
  51.156 -void fluidsynth_freesong(FluidSynthMidiSong *song)
  51.157 -{
  51.158 -    if (!song) return;
  51.159 -    fluidsynth.delete_fluid_player(song->player);
  51.160 -    fluidsynth.delete_fluid_settings(fluidsynth.fluid_synth_get_settings(song->synth));
  51.161 -    fluidsynth.delete_fluid_synth(song->synth);
  51.162 -    SDL_free(song);
  51.163 -}
  51.164 -
  51.165 -void fluidsynth_start(FluidSynthMidiSong *song)
  51.166 -{
  51.167 -    fluidsynth.fluid_player_set_loop(song->player, 1);
  51.168 -    fluidsynth.fluid_player_play(song->player);
  51.169 -}
  51.170 -
  51.171 -void fluidsynth_stop(FluidSynthMidiSong *song)
  51.172 -{
  51.173 -    fluidsynth.fluid_player_stop(song->player);
  51.174 -}
  51.175 -
  51.176 -int fluidsynth_active(FluidSynthMidiSong *song)
  51.177 -{
  51.178 -    return fluidsynth.fluid_player_get_status(song->player) == FLUID_PLAYER_PLAYING ? 1 : 0;
  51.179 -}
  51.180 -
  51.181 -void fluidsynth_setvolume(FluidSynthMidiSong *song, int volume)
  51.182 -{
  51.183 -    /* FluidSynth's default is 0.2. Make 1.2 the maximum. */
  51.184 -    fluidsynth.fluid_synth_set_gain(song->synth, (float) (volume * 1.2 / MIX_MAX_VOLUME));
  51.185 -}
  51.186 -
  51.187 -int fluidsynth_playsome(FluidSynthMidiSong *song, void *dest, int dest_len)
  51.188 -{
  51.189 -    int result = -1;
  51.190 -    int frames = dest_len / channels / ((format & 0xFF) / 8);
  51.191 -    int src_len = frames * 4; /* 16-bit stereo */
  51.192 -    void *src = dest;
  51.193 -
  51.194 -    if (dest_len < src_len) {
  51.195 -        if (!(src = SDL_malloc(src_len))) {
  51.196 -            Mix_SetError("Insufficient memory for audio conversion");
  51.197 -            return result;
  51.198 -        }
  51.199 -    }
  51.200 -
  51.201 -    if (fluidsynth.fluid_synth_write_s16(song->synth, frames, src, 0, 2, src, 1, 2) != FLUID_OK) {
  51.202 -        Mix_SetError("Error generating FluidSynth audio");
  51.203 -        goto finish;
  51.204 -    }
  51.205 -
  51.206 -    song->convert.buf = src;
  51.207 -    song->convert.len = src_len;
  51.208 -
  51.209 -    if (SDL_ConvertAudio(&song->convert) < 0) {
  51.210 -        Mix_SetError("Error during audio conversion");
  51.211 -        goto finish;
  51.212 -    }
  51.213 -
  51.214 -    if (src != dest)
  51.215 -        SDL_memcpy(dest, src, dest_len);
  51.216 -
  51.217 -    result = 0;
  51.218 -
  51.219 -finish:
  51.220 -    if (src != dest)
  51.221 -        SDL_free(src);
  51.222 -
  51.223 -    return result;
  51.224 -}
  51.225 -
  51.226 -#endif /* USE_FLUIDSYNTH_MIDI */
    52.1 --- a/fluidsynth.h	Mon Oct 16 02:16:47 2017 -0700
    52.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    52.3 @@ -1,51 +0,0 @@
    52.4 -/*
    52.5 -  SDL_mixer:  An audio mixer library based on the SDL library
    52.6 -  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
    52.7 -
    52.8 -  This software is provided 'as-is', without any express or implied
    52.9 -  warranty.  In no event will the authors be held liable for any damages
   52.10 -  arising from the use of this software.
   52.11 -
   52.12 -  Permission is granted to anyone to use this software for any purpose,
   52.13 -  including commercial applications, and to alter it and redistribute it
   52.14 -  freely, subject to the following restrictions:
   52.15 -
   52.16 -  1. The origin of this software must not be misrepresented; you must not
   52.17 -     claim that you wrote the original software. If you use this software
   52.18 -     in a product, an acknowledgment in the product documentation would be
   52.19 -     appreciated but is not required.
   52.20 -  2. Altered source versions must be plainly marked as such, and must not be
   52.21 -     misrepresented as being the original software.
   52.22 -  3. This notice may not be removed or altered from any source distribution.
   52.23 -
   52.24 -  James Le Cuirot
   52.25 -  chewi@aura-online.co.uk
   52.26 -*/
   52.27 -
   52.28 -#ifndef _FLUIDSYNTH_H_
   52.29 -#define _FLUIDSYNTH_H_
   52.30 -
   52.31 -#ifdef USE_FLUIDSYNTH_MIDI
   52.32 -
   52.33 -#include "dynamic_fluidsynth.h"
   52.34 -#include <SDL_rwops.h>
   52.35 -#include <SDL_audio.h>
   52.36 -
   52.37 -typedef struct {
   52.38 -    SDL_AudioCVT convert;
   52.39 -    fluid_synth_t *synth;
   52.40 -    fluid_player_t* player;
   52.41 -} FluidSynthMidiSong;
   52.42 -
   52.43 -int fluidsynth_init(SDL_AudioSpec *mixer);
   52.44 -FluidSynthMidiSong *fluidsynth_loadsong_RW(SDL_RWops *rw, int freerw);
   52.45 -void fluidsynth_freesong(FluidSynthMidiSong *song);
   52.46 -void fluidsynth_start(FluidSynthMidiSong *song);
   52.47 -void fluidsynth_stop(FluidSynthMidiSong *song);
   52.48 -int fluidsynth_active(FluidSynthMidiSong *song);
   52.49 -void fluidsynth_setvolume(FluidSynthMidiSong *song, int volume);
   52.50 -int fluidsynth_playsome(FluidSynthMidiSong *song, void *stream, int len);
   52.51 -
   52.52 -#endif /* USE_FLUIDSYNTH_MIDI */
   52.53 -
   52.54 -#endif /* _FLUIDSYNTH_H_ */
    53.1 --- a/load_aiff.c	Mon Oct 16 02:16:47 2017 -0700
    53.2 +++ b/load_aiff.c	Tue Oct 17 02:33:47 2017 -0700
    53.3 @@ -28,11 +28,6 @@
    53.4    in december 2002.
    53.5  */
    53.6  
    53.7 -/* $Id$ */
    53.8 -
    53.9 -#include <stdlib.h>
   53.10 -#include <string.h>
   53.11 -
   53.12  #include "SDL_endian.h"
   53.13  #include "SDL_mixer.h"
   53.14  #include "load_aiff.h"
   53.15 @@ -57,8 +52,8 @@
   53.16  static Uint32 SANE_to_Uint32 (Uint8 *sanebuf)
   53.17  {
   53.18      /* Is the frequency outside of what we can represent with Uint32? */
   53.19 -    if ( (sanebuf[0] & 0x80) || (sanebuf[0] <= 0x3F) || (sanebuf[0] > 0x40)
   53.20 -        || (sanebuf[0] == 0x40 && sanebuf[1] > 0x1C) )
   53.21 +    if ((sanebuf[0] & 0x80) || (sanebuf[0] <= 0x3F) || (sanebuf[0] > 0x40)
   53.22 +        || (sanebuf[0] == 0x40 && sanebuf[1] > 0x1C))
   53.23          return 0;
   53.24  
   53.25      return ((sanebuf[2] << 23) | (sanebuf[3] << 15) | (sanebuf[4] << 7)
   53.26 @@ -98,21 +93,21 @@
   53.27  
   53.28      /* Make sure we are passed a valid data source */
   53.29      was_error = 0;
   53.30 -    if ( src == NULL ) {
   53.31 +    if (src == NULL) {
   53.32          was_error = 1;
   53.33          goto done;
   53.34      }
   53.35  
   53.36      FORMchunk   = SDL_ReadLE32(src);
   53.37      chunk_length    = SDL_ReadBE32(src);
   53.38 -    if ( chunk_length == AIFF ) { /* The FORMchunk has already been read */
   53.39 +    if (chunk_length == AIFF) { /* The FORMchunk has already been read */
   53.40          AIFFmagic    = chunk_length;
   53.41          chunk_length = FORMchunk;
   53.42          FORMchunk    = FORM;
   53.43      } else {
   53.44          AIFFmagic    = SDL_ReadLE32(src);
   53.45      }
   53.46 -    if ( (FORMchunk != FORM) || ( (AIFFmagic != AIFF) && (AIFFmagic != _8SVX) ) ) {
   53.47 +    if ((FORMchunk != FORM) || ((AIFFmagic != AIFF) && (AIFFmagic != _8SVX))) {
   53.48          SDL_SetError("Unrecognized file type (not AIFF nor 8SVX)");
   53.49          was_error = 1;
   53.50          goto done;
   53.51 @@ -177,29 +172,29 @@
   53.52          /* a 0 pad byte can be stored for any odd-length chunk */
   53.53          if (chunk_length&1)
   53.54              next_chunk++;
   53.55 -    } while ( ( ( (AIFFmagic == AIFF) && ( !found_SSND || !found_COMM ) )
   53.56 -          || ( (AIFFmagic == _8SVX ) && ( !found_VHDR || !found_BODY ) ) )
   53.57 -          && SDL_RWseek(src, next_chunk, RW_SEEK_SET) != 1 );
   53.58 +    } while ((((AIFFmagic == AIFF) && (!found_SSND || !found_COMM))
   53.59 +          || ((AIFFmagic == _8SVX) && (!found_VHDR || !found_BODY)))
   53.60 +          && SDL_RWseek(src, next_chunk, RW_SEEK_SET) != 1);
   53.61  
   53.62 -    if ( (AIFFmagic == AIFF) && !found_SSND ) {
   53.63 +    if ((AIFFmagic == AIFF) && !found_SSND) {
   53.64          SDL_SetError("Bad AIFF (no SSND chunk)");
   53.65          was_error = 1;
   53.66          goto done;
   53.67      }
   53.68  
   53.69 -    if ( (AIFFmagic == AIFF) && !found_COMM ) {
   53.70 +    if ((AIFFmagic == AIFF) && !found_COMM) {
   53.71          SDL_SetError("Bad AIFF (no COMM chunk)");
   53.72          was_error = 1;
   53.73          goto done;
   53.74      }
   53.75  
   53.76 -    if ( (AIFFmagic == _8SVX) && !found_VHDR ) {
   53.77 +    if ((AIFFmagic == _8SVX) && !found_VHDR) {
   53.78          SDL_SetError("Bad 8SVX (no VHDR chunk)");
   53.79          was_error = 1;
   53.80          goto done;
   53.81      }
   53.82  
   53.83 -    if ( (AIFFmagic == _8SVX) && !found_BODY ) {
   53.84 +    if ((AIFFmagic == _8SVX) && !found_BODY) {
   53.85          SDL_SetError("Bad 8SVX (no BODY chunk)");
   53.86          was_error = 1;
   53.87          goto done;
   53.88 @@ -225,12 +220,12 @@
   53.89  
   53.90      *audio_len = channels * numsamples * (samplesize / 8);
   53.91      *audio_buf = (Uint8 *)SDL_malloc(*audio_len);
   53.92 -    if ( *audio_buf == NULL ) {
   53.93 +    if (*audio_buf == NULL) {
   53.94          SDL_SetError("Out of memory");
   53.95          return(NULL);
   53.96      }
   53.97      SDL_RWseek(src, start, RW_SEEK_SET);
   53.98 -    if ( SDL_RWread(src, *audio_buf, *audio_len, 1) != 1 ) {
   53.99 +    if (SDL_RWread(src, *audio_buf, *audio_len, 1) != 1) {
  53.100          SDL_SetError("Unable to read audio data");
  53.101          return(NULL);
  53.102      }
  53.103 @@ -248,3 +243,4 @@
  53.104      return(spec);
  53.105  }
  53.106  
  53.107 +/* vi: set ts=4 sw=4 expandtab: */
    54.1 --- a/load_aiff.h	Mon Oct 16 02:16:47 2017 -0700
    54.2 +++ b/load_aiff.h	Tue Oct 17 02:33:47 2017 -0700
    54.3 @@ -26,8 +26,8 @@
    54.4      This file by Torbjrn Andersson (torbjorn.andersson@eurotime.se)
    54.5  */
    54.6  
    54.7 -/* $Id$ */
    54.8 -
    54.9  /* Don't call this directly; use Mix_LoadWAV_RW() for now. */
   54.10  SDL_AudioSpec *Mix_LoadAIFF_RW (SDL_RWops *src, int freesrc,
   54.11      SDL_AudioSpec *spec, Uint8 **audio_buf, Uint32 *audio_len);
   54.12 +
   54.13 +/* vi: set ts=4 sw=4 expandtab: */
    55.1 --- a/load_flac.c	Mon Oct 16 02:16:47 2017 -0700
    55.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    55.3 @@ -1,329 +0,0 @@
    55.4 -/*
    55.5 -  SDL_mixer:  An audio mixer library based on the SDL library
    55.6 -  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
    55.7 -
    55.8 -  This software is provided 'as-is', without any express or implied
    55.9 -  warranty.  In no event will the authors be held liable for any damages
   55.10 -  arising from the use of this software.
   55.11 -
   55.12 -  Permission is granted to anyone to use this software for any purpose,
   55.13 -  including commercial applications, and to alter it and redistribute it
   55.14 -  freely, subject to the following restrictions:
   55.15 -
   55.16 -  1. The origin of this software must not be misrepresented; you must not
   55.17 -     claim that you wrote the original software. If you use this software
   55.18 -     in a product, an acknowledgment in the product documentation would be
   55.19 -     appreciated but is not required.
   55.20 -  2. Altered source versions must be plainly marked as such, and must not be
   55.21 -     misrepresented as being the original software.
   55.22 -  3. This notice may not be removed or altered from any source distribution.
   55.23 -
   55.24 -  This is the source needed to decode a FLAC into a waveform.
   55.25 -    ~ Austen Dicken (admin@cvpcs.org).
   55.26 -*/
   55.27 -
   55.28 -#ifdef FLAC_MUSIC
   55.29 -
   55.30 -#include <stdio.h>
   55.31 -#include <stdlib.h>
   55.32 -#include <string.h>
   55.33 -
   55.34 -#include "SDL_mutex.h"
   55.35 -#include "SDL_endian.h"
   55.36 -#include "SDL_timer.h"
   55.37 -
   55.38 -#include "SDL_mixer.h"
   55.39 -#include "dynamic_flac.h"
   55.40 -#include "load_flac.h"
   55.41 -
   55.42 -#include <FLAC/stream_decoder.h>
   55.43 -
   55.44 -typedef struct {
   55.45 -    SDL_RWops* sdl_src;
   55.46 -    SDL_AudioSpec* sdl_spec;
   55.47 -    Uint8** sdl_audio_buf;
   55.48 -    Uint32* sdl_audio_len;
   55.49 -    int sdl_audio_read;
   55.50 -    FLAC__uint64 flac_total_samples;
   55.51 -    unsigned flac_bps;
   55.52 -} FLAC_SDL_Data;
   55.53 -
   55.54 -static FLAC__StreamDecoderReadStatus flac_read_load_cb(
   55.55 -                                    const FLAC__StreamDecoder *decoder,
   55.56 -                                    FLAC__byte buffer[],
   55.57 -                                    size_t *bytes,
   55.58 -                                    void *client_data)
   55.59 -{
   55.60 -    // make sure there is something to be reading
   55.61 -    if (*bytes > 0) {
   55.62 -        FLAC_SDL_Data *data = (FLAC_SDL_Data *)client_data;
   55.63 -
   55.64 -        *bytes = SDL_RWread (data->sdl_src, buffer, sizeof (FLAC__byte),
   55.65 -                                *bytes);
   55.66 -
   55.67 -        if (*bytes == 0) { // error or no data was read (EOF)
   55.68 -            return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
   55.69 -        } else { // data was read, continue
   55.70 -            return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
   55.71 -        }
   55.72 -    } else {
   55.73 -        return FLAC__STREAM_DECODER_READ_STATUS_ABORT;
   55.74 -    }
   55.75 -}
   55.76 -
   55.77 -static FLAC__StreamDecoderSeekStatus flac_seek_load_cb(
   55.78 -                                    const FLAC__StreamDecoder *decoder,
   55.79 -                                    FLAC__uint64 absolute_byte_offset,
   55.80 -                                    void *client_data)
   55.81 -{
   55.82 -    FLAC_SDL_Data *data = (FLAC_SDL_Data *)client_data;
   55.83 -
   55.84 -    if (SDL_RWseek (data->sdl_src, absolute_byte_offset, RW_SEEK_SET) < 0) {
   55.85 -        return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR;
   55.86 -    } else {
   55.87 -        return FLAC__STREAM_DECODER_SEEK_STATUS_OK;
   55.88 -    }
   55.89 -}
   55.90 -
   55.91 -static FLAC__StreamDecoderTellStatus flac_tell_load_cb(
   55.92 -                                    const FLAC__StreamDecoder *decoder,
   55.93 -                                    FLAC__uint64 *absolute_byte_offset,
   55.94 -                                    void *client_data)
   55.95 -{
   55.96 -    FLAC_SDL_Data *data = (FLAC_SDL_Data *)client_data;
   55.97 -
   55.98 -    Sint64 pos = SDL_RWtell (data->sdl_src);
   55.99 -
  55.100 -    if (pos < 0) {
  55.101 -        return FLAC__STREAM_DECODER_TELL_STATUS_ERROR;
  55.102 -    } else {
  55.103 -        *absolute_byte_offset = (FLAC__uint64)pos;
  55.104 -        return FLAC__STREAM_DECODER_TELL_STATUS_OK;
  55.105 -    }
  55.106 -}
  55.107 -
  55.108 -static FLAC__StreamDecoderLengthStatus flac_length_load_cb(
  55.109 -                                    const FLAC__StreamDecoder *decoder,
  55.110 -                                    FLAC__uint64 *stream_length,
  55.111 -                                    void *client_data)
  55.112 -{
  55.113 -    FLAC_SDL_Data *data = (FLAC_SDL_Data *)client_data;
  55.114 -
  55.115 -    Sint64 pos = SDL_RWtell (data->sdl_src);
  55.116 -    Sint64 length = SDL_RWseek (data->sdl_src, 0, RW_SEEK_END);
  55.117 -
  55.118 -    if (SDL_RWseek (data->sdl_src, pos, RW_SEEK_SET) != pos || length < 0) {
  55.119 -        /* there was an error attempting to return the stream to the original
  55.120 -         * position, or the length was invalid. */
  55.121 -        return FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR;
  55.122 -    } else {
  55.123 -        *stream_length = (FLAC__uint64)length;
  55.124 -        return FLAC__STREAM_DECODER_LENGTH_STATUS_OK;
  55.125 -    }
  55.126 -}
  55.127 -
  55.128 -static FLAC__bool flac_eof_load_cb(const FLAC__StreamDecoder *decoder,
  55.129 -                                    void *client_data)
  55.130 -{
  55.131 -    FLAC_SDL_Data *data = (FLAC_SDL_Data *)client_data;
  55.132 -
  55.133 -    Sint64 pos = SDL_RWtell (data->sdl_src);
  55.134 -    Sint64 end = SDL_RWseek (data->sdl_src, 0, RW_SEEK_END);
  55.135 -
  55.136 -    // was the original position equal to the end (a.k.a. the seek didn't move)?
  55.137 -    if (pos == end) {
  55.138 -        // must be EOF
  55.139 -        return true;
  55.140 -    } else {
  55.141 -        // not EOF, return to the original position
  55.142 -        SDL_RWseek (data->sdl_src, pos, RW_SEEK_SET);
  55.143 -        return false;
  55.144 -    }
  55.145 -}
  55.146 -
  55.147 -static FLAC__StreamDecoderWriteStatus flac_write_load_cb(
  55.148 -                                    const FLAC__StreamDecoder *decoder,
  55.149 -                                    const FLAC__Frame *frame,
  55.150 -                                    const FLAC__int32 *const buffer[],
  55.151 -                                    void *client_data)
  55.152 -{
  55.153 -    FLAC_SDL_Data *data = (FLAC_SDL_Data *)client_data;
  55.154 -    size_t i;
  55.155 -    Uint8 *buf;
  55.156 -
  55.157 -    if (data->flac_total_samples == 0) {
  55.158 -        SDL_SetError ("Given FLAC file does not specify its sample count.");
  55.159 -        return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
  55.160 -    }
  55.161 -
  55.162 -    if (data->sdl_spec->channels != 2 || data->flac_bps != 16) {
  55.163 -        SDL_SetError ("Current FLAC support is only for 16 bit Stereo files.");
  55.164 -        return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
  55.165 -    }
  55.166 -
  55.167 -    // check if it is the first audio frame so we can initialize the output
  55.168 -    // buffer
  55.169 -    if (frame->header.number.sample_number == 0) {
  55.170 -        *(data->sdl_audio_len) = data->sdl_spec->size;
  55.171 -        data->sdl_audio_read = 0;
  55.172 -        *(data->sdl_audio_buf) = SDL_malloc (*(data->sdl_audio_len));
  55.173 -
  55.174 -        if (*(data->sdl_audio_buf) == NULL) {
  55.175 -            SDL_SetError
  55.176 -                    ("Unable to allocate memory to store the FLAC stream.");
  55.177 -            return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
  55.178 -        }
  55.179 -    }
  55.180 -
  55.181 -    buf = *(data->sdl_audio_buf);
  55.182 -
  55.183 -    for (i = 0; i < frame->header.blocksize; i++) {
  55.184 -        FLAC__int16 i16;
  55.185 -        FLAC__uint16 ui16;
  55.186 -
  55.187 -        i16 = (FLAC__int16)buffer[0][i];
  55.188 -        ui16 = (FLAC__uint16)i16;
  55.189 -
  55.190 -        *(buf + (data->sdl_audio_read++)) = (char)(ui16);
  55.191 -        *(buf + (data->sdl_audio_read++)) = (char)(ui16 >> 8);
  55.192 -
  55.193 -        i16 = (FLAC__int16)buffer[1][i];
  55.194 -        ui16 = (FLAC__uint16)i16;
  55.195 -
  55.196 -        *(buf + (data->sdl_audio_read++)) = (char)(ui16);
  55.197 -        *(buf + (data->sdl_audio_read++)) = (char)(ui16 >> 8);
  55.198 -    }
  55.199 -
  55.200 -    return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
  55.201 -}
  55.202 -
  55.203 -static void flac_metadata_load_cb(
  55.204 -                    const FLAC__StreamDecoder *decoder,
  55.205 -                    const FLAC__StreamMetadata *metadata,
  55.206 -                    void *client_data)
  55.207 -{
  55.208 -    FLAC_SDL_Data *data = (FLAC_SDL_Data *)client_data;
  55.209 -    FLAC__uint64 total_samples;
  55.210 -    unsigned bps;
  55.211 -
  55.212 -    if (metadata->type == FLAC__METADATA_TYPE_STREAMINFO) {
  55.213 -        // save the metadata right now for use later on
  55.214 -        *(data->sdl_audio_buf) = NULL;
  55.215 -        *(data->sdl_audio_len) = 0;
  55.216 -        memset (data->sdl_spec, '\0', sizeof (SDL_AudioSpec));
  55.217 -
  55.218 -        data->sdl_spec->format = AUDIO_S16;
  55.219 -        data->sdl_spec->freq = (int)(metadata->data.stream_info.sample_rate);
  55.220 -        data->sdl_spec->channels = (Uint8)(metadata->data.stream_info.channels);
  55.221 -        data->sdl_spec->samples = 8192; /* buffer size */
  55.222 -
  55.223 -        total_samples = metadata->data.stream_info.total_samples;
  55.224 -        bps = metadata->data.stream_info.bits_per_sample;
  55.225 -
  55.226 -        data->sdl_spec->size = (Uint32)(total_samples * data->sdl_spec->channels * (bps / 8));
  55.227 -        data->flac_total_samples = total_samples;
  55.228 -        data->flac_bps = bps;
  55.229 -    }
  55.230 -}
  55.231 -
  55.232 -static void flac_error_load_cb(
  55.233 -                const FLAC__StreamDecoder *decoder,
  55.234 -                FLAC__StreamDecoderErrorStatus status,
  55.235 -                void *client_data)
  55.236 -{
  55.237 -    // print an SDL error based on the error status
  55.238 -    switch (status) {
  55.239 -        case FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC:
  55.240 -            SDL_SetError ("Error processing the FLAC file [LOST_SYNC].");
  55.241 -        break;
  55.242 -        case FLAC__STREAM_DECODER_ERROR_STATUS_BAD_HEADER:
  55.243 -            SDL_SetError ("Error processing the FLAC file [BAD_HEADER].");
  55.244 -        break;
  55.245 -        case FLAC__STREAM_DECODER_ERROR_STATUS_FRAME_CRC_MISMATCH:
  55.246 -            SDL_SetError ("Error processing the FLAC file [CRC_MISMATCH].");
  55.247 -        break;
  55.248 -        case FLAC__STREAM_DECODER_ERROR_STATUS_UNPARSEABLE_STREAM:
  55.249 -            SDL_SetError ("Error processing the FLAC file [UNPARSEABLE].");
  55.250 -        break;
  55.251 -        default:
  55.252 -            SDL_SetError ("Error processing the FLAC file [UNKNOWN].");
  55.253 -        break;
  55.254 -    }
  55.255 -}
  55.256 -
  55.257 -/* don't call this directly; use Mix_LoadWAV_RW() for now. */
  55.258 -SDL_AudioSpec *Mix_LoadFLAC_RW (SDL_RWops *src, int freesrc,
  55.259 -        SDL_AudioSpec *spec, Uint8 **audio_buf, Uint32 *audio_len)
  55.260 -{
  55.261 -    FLAC__StreamDecoder *decoder = 0;
  55.262 -    FLAC__StreamDecoderInitStatus init_status;
  55.263 -    int was_error = 1;
  55.264 -    int was_init = 0;
  55.265 -    Uint32 samplesize;
  55.266 -
  55.267 -    // create the client data passing information
  55.268 -    FLAC_SDL_Data* client_data;
  55.269 -    client_data = (FLAC_SDL_Data *)SDL_malloc (sizeof (FLAC_SDL_Data));
  55.270 -
  55.271 -    if ((!src) || (!audio_buf) || (!audio_len))   /* sanity checks. */
  55.272 -        goto done;
  55.273 -
  55.274 -    if (!Mix_Init(MIX_INIT_FLAC))
  55.275 -        goto done;
  55.276 -
  55.277 -    if ((decoder = flac.FLAC__stream_decoder_new ()) == NULL) {
  55.278 -        SDL_SetError ("Unable to allocate FLAC decoder.");
  55.279 -        goto done;
  55.280 -    }
  55.281 -
  55.282 -    init_status = flac.FLAC__stream_decoder_init_stream (decoder,
  55.283 -                                flac_read_load_cb, flac_seek_load_cb,
  55.284 -                                flac_tell_load_cb, flac_length_load_cb,
  55.285 -                                flac_eof_load_cb, flac_write_load_cb,
  55.286 -                                flac_metadata_load_cb, flac_error_load_cb,
  55.287 -                                client_data);
  55.288 -
  55.289 -    if (init_status != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
  55.290 -        SDL_SetError ("Unable to initialize FLAC stream decoder.");
  55.291 -        goto done;
  55.292 -    }
  55.293 -
  55.294 -    was_init = 1;
  55.295 -
  55.296 -    client_data->sdl_src = src;
  55.297 -    client_data->sdl_spec = spec;
  55.298 -    client_data->sdl_audio_buf = audio_buf;
  55.299 -    client_data->sdl_audio_len = audio_len;
  55.300 -
  55.301 -    if (!flac.FLAC__stream_decoder_process_until_end_of_stream (decoder)) {
  55.302 -        SDL_SetError ("Unable to process FLAC file.");
  55.303 -        goto done;
  55.304 -    }
  55.305 -
  55.306 -    was_error = 0;
  55.307 -
  55.308 -    /* Don't return a buffer that isn't a multiple of samplesize */
  55.309 -    samplesize = ((spec->format & 0xFF) / 8) * spec->channels;
  55.310 -    *audio_len &= ~(samplesize - 1);
  55.311 -
  55.312 -done:
  55.313 -    if (was_init && decoder) {
  55.314 -        flac.FLAC__stream_decoder_finish (decoder);
  55.315 -    }
  55.316 -
  55.317 -    if (decoder) {
  55.318 -        flac.FLAC__stream_decoder_delete (decoder);
  55.319 -    }
  55.320 -
  55.321 -    if (freesrc && src) {
  55.322 -        SDL_RWclose (src);
  55.323 -    }
  55.324 -
  55.325 -    if (was_error) {
  55.326 -        spec = NULL;
  55.327 -    }
  55.328 -
  55.329 -    return spec;
  55.330 -}
  55.331 -
  55.332 -#endif // FLAC_MUSIC
    56.1 --- a/load_flac.h	Mon Oct 16 02:16:47 2017 -0700
    56.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    56.3 @@ -1,31 +0,0 @@
    56.4 -/*
    56.5 -  SDL_mixer:  An audio mixer library based on the SDL library
    56.6 -  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
    56.7 -
    56.8 -  This software is provided 'as-is', without any express or implied
    56.9 -  warranty.  In no event will the authors be held liable for any damages
   56.10 -  arising from the use of this software.
   56.11 -
   56.12 -  Permission is granted to anyone to use this software for any purpose,
   56.13 -  including commercial applications, and to alter it and redistribute it
   56.14 -  freely, subject to the following restrictions:
   56.15 -
   56.16 -  1. The origin of this software must not be misrepresented; you must not
   56.17 -     claim that you wrote the original software. If you use this software
   56.18 -     in a product, an acknowledgment in the product documentation would be
   56.19 -     appreciated but is not required.
   56.20 -  2. Altered source versions must be plainly marked as such, and must not be
   56.21 -     misrepresented as being the original software.
   56.22 -  3. This notice may not be removed or altered from any source distribution.
   56.23 -
   56.24 -  This is the source needed to decode a FLAC into a waveform.
   56.25 -    ~ Austen Dicken (admin@cvpcs.org).
   56.26 -*/
   56.27 -
   56.28 -/* $Id: $ */
   56.29 -
   56.30 -#ifdef FLAC_MUSIC
   56.31 -/* Don't call this directly; use Mix_LoadWAV_RW() for now. */
   56.32 -SDL_AudioSpec *Mix_LoadFLAC_RW (SDL_RWops *src, int freesrc,
   56.33 -        SDL_AudioSpec *spec, Uint8 **audio_buf, Uint32 *audio_len);
   56.34 -#endif
    57.1 --- a/load_mp3.c	Mon Oct 16 02:16:47 2017 -0700
    57.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    57.3 @@ -1,226 +0,0 @@
    57.4 -/*
    57.5 -  SDL_mixer:  An audio mixer library based on the SDL library
    57.6 -  Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
    57.7 -
    57.8 -  This software is provided 'as-is', without any express or implied
    57.9 -  warranty.  In no event will the authors be held liable for any damages
   57.10 -  arising from the use of this software.
   57.11 -
   57.12 -  Permission is granted to anyone to use this software for any purpose,
   57.13 -  including commercial applications, and to alter it and redistribute it
   57.14 -  freely, subject to the following restrictions:
   57.15 -
   57.16 -  1. The origin of this software must not be misrepresented; you must not
   57.17 -	 claim that you wrote the original software. If you use this software
   57.18 -	 in a product, an acknowledgment in the product documentation would be
   57.19 -	 appreciated but is not required.
   57.20 -  2. Altered source versions must be plainly marked as such, and must not be
   57.21 -	 misrepresented as being the original software.
   57.22 -  3. This notice may not be removed or altered from any source distribution.
   57.23 -
   57.24 -  This is the source needed to decode an MP3 into a waveform.
   57.25 -*/
   57.26 -
   57.27 -/* $Id$ */
   57.28 -
   57.29 -#if defined(MP3_MUSIC) || defined(MP3_MAD_MUSIC) || defined(MP3_MPG_MUSIC)
   57.30 -
   57.31 -#include "SDL_mixer.h"
   57.32 -
   57.33 -#include "load_mp3.h"
   57.34 -
   57.35 -#if defined(MP3_MUSIC)
   57.36 -#include "dynamic_mp3.h"
   57.37 -#elif defined(MP3_MAD_MUSIC)
   57.38 -#include "music_mad.h"
   57.39 -#elif defined(MP3_MPG_MUSIC)
   57.40 -#include "music_mpg.h"
   57.41 -#endif
   57.42 -
   57.43 -SDL_AudioSpec *Mix_LoadMP3_RW(SDL_RWops *src, int freesrc, SDL_AudioSpec *spec, Uint8 **audio_buf, Uint32 *audio_len)
   57.44 -{
   57.45 -	/* note: spec is initialized to mixer spec */
   57.46 -
   57.47 -#if defined(MP3_MUSIC)
   57.48 -	SMPEG* mp3;
   57.49 -	SMPEG_Info info;
   57.50 -#elif defined(MP3_MAD_MUSIC)
   57.51 -	mad_data *mp3_mad;
   57.52 -#elif defined(MP3_MPG_MUSIC)
   57.53 -	mpg_data *mp3_mpg;
   57.54 -#endif
   57.55 -	long samplesize;
   57.56 -	int read_len;
   57.57 -	const Uint32 chunk_len = 4096;
   57.58 -	int err = 0;
   57.59 -
   57.60 -	if ((!src) || (!spec) || (!audio_buf) || (!audio_len))
   57.61 -	{
   57.62 -		return NULL;
   57.63 -	}
   57.64 -
   57.65 -	if (!err)
   57.66 -	{
   57.67 -		*audio_len = 0;
   57.68 -		*audio_buf = (Uint8*) SDL_malloc(chunk_len);
   57.69 -		err = (*audio_buf == NULL);
   57.70 -	}
   57.71 -
   57.72 -	if (!err)
   57.73 -	{
   57.74 -		err = ((Mix_Init(MIX_INIT_MP3) & MIX_INIT_MP3) == 0);
   57.75 -	}
   57.76 -
   57.77 -	if (!err)
   57.78 -	{
   57.79 -#if defined(MP3_MUSIC)
   57.80 -		mp3 = smpeg.SMPEG_new_rwops(src, &info, freesrc, 0);
   57.81 -		err = (mp3 == NULL);
   57.82 -#elif defined(MP3_MAD_MUSIC)
   57.83 -        mp3_mad = mad_openFileRW(src, spec, freesrc);
   57.84 -		err = (mp3_mad == NULL);
   57.85 -#elif defined(MP3_MPG_MUSIC)
   57.86 -		mp3_mpg = mpg_new_rw(src, spec, freesrc);
   57.87 -        err = (mp3_mpg == NULL);
   57.88 -#endif
   57.89 -	}
   57.90 -
   57.91 -#if defined(MP3_MUSIC)
   57.92 -	if (!err)
   57.93 -	{
   57.94 -		err = !info.has_audio;
   57.95 -	}
   57.96 -#endif
   57.97 -