Updated Xcode project and fixed warnings
authorSam Lantinga <slouken@libsdl.org>
Tue, 17 Oct 2017 02:54:52 -0700
changeset 779a2b494c054d5
parent 778 05c93f7af403
child 780 74df2aa47195
Updated Xcode project and fixed warnings
Xcode-iOS/SDL_mixer.xcodeproj/project.pbxproj
Xcode/Info-Framework.plist
Xcode/SDL_mixer.xcodeproj/project.pbxproj
effect_stereoreverse.c
music.c
music_cmd.c
music_ogg.c
music_wav.c
native_midi/native_midi.h
native_midi/native_midi_haiku.cpp
native_midi/native_midi_mac.c
native_midi/native_midi_macosx.c
native_midi/native_midi_win32.c
     1.1 --- a/Xcode-iOS/SDL_mixer.xcodeproj/project.pbxproj	Tue Oct 17 02:39:45 2017 -0700
     1.2 +++ b/Xcode-iOS/SDL_mixer.xcodeproj/project.pbxproj	Tue Oct 17 02:54:52 2017 -0700
     1.3 @@ -7,22 +7,6 @@
     1.4  	objects = {
     1.5  
     1.6  /* Begin PBXBuildFile section */
     1.7 -		00938E53108A397A0009CF19 /* dynamic_flac.c in Sources */ = {isa = PBXBuildFile; fileRef = 00938E49108A397A0009CF19 /* dynamic_flac.c */; };
     1.8 -		00938E54108A397A0009CF19 /* dynamic_flac.h in Headers */ = {isa = PBXBuildFile; fileRef = 00938E4A108A397A0009CF19 /* dynamic_flac.h */; };
     1.9 -		00938E55108A397A0009CF19 /* dynamic_mikmod.c in Sources */ = {isa = PBXBuildFile; fileRef = 00938E4B108A397A0009CF19 /* dynamic_mikmod.c */; };
    1.10 -		00938E56108A397A0009CF19 /* dynamic_smpeg.h in Headers */ = {isa = PBXBuildFile; fileRef = 00938E4C108A397A0009CF19 /* dynamic_smpeg.h */; };
    1.11 -		00938E57108A397A0009CF19 /* dynamic_ogg.h in Headers */ = {isa = PBXBuildFile; fileRef = 00938E4D108A397A0009CF19 /* dynamic_ogg.h */; };
    1.12 -		04939B4A17E607250015E4E3 /* load_mp3.c in Sources */ = {isa = PBXBuildFile; fileRef = 04939B4817E607250015E4E3 /* load_mp3.c */; };
    1.13 -		04939B4B17E607250015E4E3 /* load_mp3.h in Headers */ = {isa = PBXBuildFile; fileRef = 04939B4917E607250015E4E3 /* load_mp3.h */; };
    1.14 -		04A8FCA60A19CAEC0046373F /* dynamic_smpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 04A8FCA40A19CAEC0046373F /* dynamic_smpeg.c */; };
    1.15 -		04A8FCAB0A19CB070046373F /* dynamic_ogg.c in Sources */ = {isa = PBXBuildFile; fileRef = 04A8FCA90A19CB070046373F /* dynamic_ogg.c */; };
    1.16 -		AA5F0F0914B6A6490036992F /* dynamic_fluidsynth.c in Sources */ = {isa = PBXBuildFile; fileRef = AA5F0F0214B6A6490036992F /* dynamic_fluidsynth.c */; };
    1.17 -		AA5F0F0A14B6A6490036992F /* dynamic_fluidsynth.h in Headers */ = {isa = PBXBuildFile; fileRef = AA5F0F0314B6A6490036992F /* dynamic_fluidsynth.h */; };
    1.18 -		AA5F0F0B14B6A6490036992F /* dynamic_mikmod.h in Headers */ = {isa = PBXBuildFile; fileRef = AA5F0F0414B6A6490036992F /* dynamic_mikmod.h */; };
    1.19 -		AA5F0F0C14B6A6490036992F /* fluidsynth.c in Sources */ = {isa = PBXBuildFile; fileRef = AA5F0F0514B6A6490036992F /* fluidsynth.c */; };
    1.20 -		AA5F0F0D14B6A6490036992F /* fluidsynth.h in Headers */ = {isa = PBXBuildFile; fileRef = AA5F0F0614B6A6490036992F /* fluidsynth.h */; };
    1.21 -		AA5F0F0E14B6A6490036992F /* music_modplug.c in Sources */ = {isa = PBXBuildFile; fileRef = AA5F0F0714B6A6490036992F /* music_modplug.c */; };
    1.22 -		AA5F0F0F14B6A6490036992F /* music_modplug.h in Headers */ = {isa = PBXBuildFile; fileRef = AA5F0F0814B6A6490036992F /* music_modplug.h */; };
    1.23  		AA60217217653A9800662B9C /* fastmix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60214D17653A9800662B9C /* fastmix.cpp */; };
    1.24  		AA60217317653A9800662B9C /* load_669.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60214E17653A9800662B9C /* load_669.cpp */; };
    1.25  		AA60217417653A9800662B9C /* load_abc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60214F17653A9800662B9C /* load_abc.cpp */; };
    1.26 @@ -37,7 +21,6 @@
    1.27  		AA60217D17653A9800662B9C /* load_mdl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60215817653A9800662B9C /* load_mdl.cpp */; };
    1.28  		AA60217E17653A9800662B9C /* load_med.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60215917653A9800662B9C /* load_med.cpp */; };
    1.29  		AA60217F17653A9800662B9C /* load_mid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60215A17653A9800662B9C /* load_mid.cpp */; };
    1.30 -		AA60218017653A9800662B9C /* load_mikmod.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60215B17653A9800662B9C /* load_mikmod.cpp */; };
    1.31  		AA60218117653A9800662B9C /* load_mt2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60215C17653A9800662B9C /* load_mt2.cpp */; };
    1.32  		AA60218217653A9800662B9C /* load_mtm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60215D17653A9800662B9C /* load_mtm.cpp */; };
    1.33  		AA60218317653A9800662B9C /* load_okt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60215E17653A9800662B9C /* load_okt.cpp */; };
    1.34 @@ -60,8 +43,6 @@
    1.35  		AA60219417653A9800662B9C /* sndfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60216F17653A9800662B9C /* sndfile.cpp */; };
    1.36  		AA60219517653A9800662B9C /* sndmix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA60217017653A9800662B9C /* sndmix.cpp */; };
    1.37  		AA60219617653A9800662B9C /* tables.h in Headers */ = {isa = PBXBuildFile; fileRef = AA60217117653A9800662B9C /* tables.h */; };
    1.38 -		AA60219917653B8700662B9C /* dynamic_modplug.c in Sources */ = {isa = PBXBuildFile; fileRef = AA60219717653B8700662B9C /* dynamic_modplug.c */; };
    1.39 -		AA60219A17653B8700662B9C /* dynamic_modplug.h in Headers */ = {isa = PBXBuildFile; fileRef = AA60219817653B8700662B9C /* dynamic_modplug.h */; };
    1.40  		AA644294175B0E0600A2125A /* bitwise.c in Sources */ = {isa = PBXBuildFile; fileRef = AA644292175B0E0600A2125A /* bitwise.c */; };
    1.41  		AA644295175B0E0600A2125A /* framing.c in Sources */ = {isa = PBXBuildFile; fileRef = AA644293175B0E0600A2125A /* framing.c */; };
    1.42  		AA64429E175B0E2500A2125A /* asm_arm.h in Headers */ = {isa = PBXBuildFile; fileRef = AA644296175B0E2500A2125A /* asm_arm.h */; };
    1.43 @@ -93,8 +74,38 @@
    1.44  		AA6442CD175B0E5000A2125A /* window_lookup.h in Headers */ = {isa = PBXBuildFile; fileRef = AA6442B8175B0E5000A2125A /* window_lookup.h */; };
    1.45  		AA6442CE175B0E5000A2125A /* window.c in Sources */ = {isa = PBXBuildFile; fileRef = AA6442B9175B0E5000A2125A /* window.c */; };
    1.46  		AA6442CF175B0E5000A2125A /* window.h in Headers */ = {isa = PBXBuildFile; fileRef = AA6442BA175B0E5000A2125A /* window.h */; };
    1.47 -		BE1FA90C07AF96B2004B6283 /* music_cmd.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CC1B87B012FB8CD7F000001 /* music_cmd.h */; };
    1.48 -		BE1FA90D07AF96B2004B6283 /* music_ogg.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CC1B87D012FB8CD7F000001 /* music_ogg.h */; };
    1.49 +		AAE406261F9609BD00EDAF53 /* load_aiff.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE406061F9609B900EDAF53 /* load_aiff.c */; };
    1.50 +		AAE406271F9609BD00EDAF53 /* music_fluidsynth.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE406071F9609B900EDAF53 /* music_fluidsynth.h */; };
    1.51 +		AAE406281F9609BD00EDAF53 /* mixer.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE406081F9609B900EDAF53 /* mixer.h */; };
    1.52 +		AAE406291F9609BD00EDAF53 /* mixer.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE406091F9609B900EDAF53 /* mixer.c */; };
    1.53 +		AAE4062A1F9609BD00EDAF53 /* music.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE4060A1F9609B900EDAF53 /* music.h */; };
    1.54 +		AAE4062B1F9609BD00EDAF53 /* load_voc.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE4060B1F9609B900EDAF53 /* load_voc.h */; };
    1.55 +		AAE4062C1F9609BD00EDAF53 /* music_modplug.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE4060C1F9609B900EDAF53 /* music_modplug.c */; };
    1.56 +		AAE4062D1F9609BD00EDAF53 /* music_modplug.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE4060D1F9609B900EDAF53 /* music_modplug.h */; };
    1.57 +		AAE4062E1F9609BD00EDAF53 /* music_fluidsynth.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE4060E1F9609B900EDAF53 /* music_fluidsynth.c */; };
    1.58 +		AAE4062F1F9609BD00EDAF53 /* music_flac.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE4060F1F9609B900EDAF53 /* music_flac.h */; };
    1.59 +		AAE406301F9609BD00EDAF53 /* music_wav.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE406101F9609BA00EDAF53 /* music_wav.h */; };
    1.60 +		AAE406311F9609BD00EDAF53 /* music_wav.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE406111F9609BA00EDAF53 /* music_wav.c */; };
    1.61 +		AAE406321F9609BD00EDAF53 /* music_mad.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE406121F9609BA00EDAF53 /* music_mad.c */; };
    1.62 +		AAE406331F9609BD00EDAF53 /* music_smpeg.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE406131F9609BA00EDAF53 /* music_smpeg.h */; };
    1.63 +		AAE406341F9609BD00EDAF53 /* load_voc.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE406141F9609BA00EDAF53 /* load_voc.c */; };
    1.64 +		AAE406351F9609BD00EDAF53 /* music.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE406151F9609BA00EDAF53 /* music.c */; };
    1.65 +		AAE406361F9609BD00EDAF53 /* music_mikmod.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE406161F9609BA00EDAF53 /* music_mikmod.h */; };
    1.66 +		AAE406371F9609BD00EDAF53 /* music_ogg.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE406171F9609BA00EDAF53 /* music_ogg.h */; };
    1.67 +		AAE406381F9609BD00EDAF53 /* load_aiff.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE406181F9609BA00EDAF53 /* load_aiff.h */; };
    1.68 +		AAE406391F9609BD00EDAF53 /* music_mpg123.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE406191F9609BB00EDAF53 /* music_mpg123.h */; };
    1.69 +		AAE4063A1F9609BD00EDAF53 /* music_flac.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE4061A1F9609BB00EDAF53 /* music_flac.c */; };
    1.70 +		AAE4063B1F9609BD00EDAF53 /* music_nativemidi.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE4061B1F9609BB00EDAF53 /* music_nativemidi.c */; };
    1.71 +		AAE4063C1F9609BD00EDAF53 /* music_timidity.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE4061C1F9609BB00EDAF53 /* music_timidity.h */; };
    1.72 +		AAE4063D1F9609BD00EDAF53 /* music_timidity.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE4061D1F9609BB00EDAF53 /* music_timidity.c */; };
    1.73 +		AAE4063E1F9609BD00EDAF53 /* music_mikmod.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE4061E1F9609BB00EDAF53 /* music_mikmod.c */; };
    1.74 +		AAE4063F1F9609BD00EDAF53 /* music_ogg.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE4061F1F9609BB00EDAF53 /* music_ogg.c */; };
    1.75 +		AAE406401F9609BD00EDAF53 /* music_nativemidi.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE406201F9609BC00EDAF53 /* music_nativemidi.h */; };
    1.76 +		AAE406411F9609BD00EDAF53 /* music_cmd.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE406211F9609BC00EDAF53 /* music_cmd.h */; };
    1.77 +		AAE406421F9609BD00EDAF53 /* music_smpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE406221F9609BC00EDAF53 /* music_smpeg.c */; };
    1.78 +		AAE406431F9609BD00EDAF53 /* music_cmd.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE406231F9609BC00EDAF53 /* music_cmd.c */; };
    1.79 +		AAE406441F9609BD00EDAF53 /* music_mad.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE406241F9609BC00EDAF53 /* music_mad.h */; };
    1.80 +		AAE406451F9609BD00EDAF53 /* music_mpg123.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE406251F9609BC00EDAF53 /* music_mpg123.c */; };
    1.81  		BE1FA90E07AF96B2004B6283 /* common.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CC1B881012FB8CD7F000001 /* common.h */; };
    1.82  		BE1FA90F07AF96B2004B6283 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CC1B882012FB8CD7F000001 /* config.h */; };
    1.83  		BE1FA91007AF96B2004B6283 /* ctrlmode.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CC1B884012FB8CD7F000001 /* ctrlmode.h */; };
    1.84 @@ -107,15 +118,6 @@
    1.85  		BE1FA91707AF96B2004B6283 /* resample.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CC1B892012FB8CD7F000001 /* resample.h */; };
    1.86  		BE1FA91807AF96B2004B6283 /* tables.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CC1B896012FB8CD7F000001 /* tables.h */; };
    1.87  		BE1FA91907AF96B2004B6283 /* timidity.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CC1B898012FB8CD7F000001 /* timidity.h */; };
    1.88 -		BE1FA91A07AF96B2004B6283 /* wavestream.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CC1B89C012FB8CD7F000001 /* wavestream.h */; };
    1.89 -		BE1FA91B07AF96B2004B6283 /* effects_internal.h in Headers */ = {isa = PBXBuildFile; fileRef = F567D63E01CD881401F3E8B9 /* effects_internal.h */; };
    1.90 -		BE1FA91C07AF96B2004B6283 /* load_aiff.h in Headers */ = {isa = PBXBuildFile; fileRef = F567D64801CD88A701F3E8B9 /* load_aiff.h */; };
    1.91 -		BE1FA91D07AF96B2004B6283 /* load_voc.h in Headers */ = {isa = PBXBuildFile; fileRef = F567D64A01CD88A701F3E8B9 /* load_voc.h */; };
    1.92 -		BE1FA91E07AF96B2004B6283 /* load_ogg.h in Headers */ = {isa = PBXBuildFile; fileRef = B2A42D0F03FAC6A400A8000A /* load_ogg.h */; };
    1.93 -		BE1FA93807AF96B2004B6283 /* mixer.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B879012FB8CD7F000001 /* mixer.c */; };
    1.94 -		BE1FA93907AF96B2004B6283 /* music_cmd.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B87A012FB8CD7F000001 /* music_cmd.c */; };
    1.95 -		BE1FA93A07AF96B2004B6283 /* music_ogg.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B87C012FB8CD7F000001 /* music_ogg.c */; };
    1.96 -		BE1FA93B07AF96B2004B6283 /* music.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B87E012FB8CD7F000001 /* music.c */; };
    1.97  		BE1FA93C07AF96B2004B6283 /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B880012FB8CD7F000001 /* common.c */; };
    1.98  		BE1FA93D07AF96B2004B6283 /* ctrlmode.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B883012FB8CD7F000001 /* ctrlmode.c */; };
    1.99  		BE1FA93E07AF96B2004B6283 /* filter.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B885012FB8CD7F000001 /* filter.c */; };
   1.100 @@ -129,40 +131,10 @@
   1.101  		BE1FA94607AF96B2004B6283 /* sdl_c.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B894012FB8CD7F000001 /* sdl_c.c */; };
   1.102  		BE1FA94707AF96B2004B6283 /* tables.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B895012FB8CD7F000001 /* tables.c */; };
   1.103  		BE1FA94807AF96B2004B6283 /* timidity.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B897012FB8CD7F000001 /* timidity.c */; };
   1.104 -		BE1FA94907AF96B2004B6283 /* wavestream.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B89B012FB8CD7F000001 /* wavestream.c */; };
   1.105 -		BE1FA94A07AF96B2004B6283 /* effect_position.c in Sources */ = {isa = PBXBuildFile; fileRef = F567D63B01CD881401F3E8B9 /* effect_position.c */; };
   1.106 -		BE1FA94B07AF96B2004B6283 /* effect_stereoreverse.c in Sources */ = {isa = PBXBuildFile; fileRef = F567D63C01CD881401F3E8B9 /* effect_stereoreverse.c */; };
   1.107 -		BE1FA94C07AF96B2004B6283 /* effects_internal.c in Sources */ = {isa = PBXBuildFile; fileRef = F567D63D01CD881401F3E8B9 /* effects_internal.c */; };
   1.108 -		BE1FA94D07AF96B2004B6283 /* load_aiff.c in Sources */ = {isa = PBXBuildFile; fileRef = F567D64701CD88A701F3E8B9 /* load_aiff.c */; };
   1.109 -		BE1FA94E07AF96B2004B6283 /* load_voc.c in Sources */ = {isa = PBXBuildFile; fileRef = F567D64901CD88A701F3E8B9 /* load_voc.c */; };
   1.110 -		BE1FA94F07AF96B2004B6283 /* load_ogg.c in Sources */ = {isa = PBXBuildFile; fileRef = B2A42D0E03FAC6A400A8000A /* load_ogg.c */; };
   1.111  /* End PBXBuildFile section */
   1.112  
   1.113  /* Begin PBXFileReference section */
   1.114 -		00938E2B108A37800009CF19 /* load_flac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = load_flac.c; path = ../load_flac.c; sourceTree = SOURCE_ROOT; };
   1.115 -		00938E2C108A37800009CF19 /* load_flac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = load_flac.h; path = ../load_flac.h; sourceTree = SOURCE_ROOT; };
   1.116 -		00938E2D108A37800009CF19 /* music_flac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_flac.c; path = ../music_flac.c; sourceTree = SOURCE_ROOT; };
   1.117 -		00938E2E108A37800009CF19 /* music_flac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_flac.h; path = ../music_flac.h; sourceTree = SOURCE_ROOT; };
   1.118 -		00938E2F108A37800009CF19 /* music_mad.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_mad.c; path = ../music_mad.c; sourceTree = SOURCE_ROOT; };
   1.119 -		00938E30108A37800009CF19 /* music_mad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_mad.h; path = ../music_mad.h; sourceTree = SOURCE_ROOT; };
   1.120 -		00938E31108A37800009CF19 /* music_mikmod.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_mikmod.c; path = ../music_mikmod.c; sourceTree = SOURCE_ROOT; };
   1.121 -		00938E32108A37800009CF19 /* music_mikmod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_mikmod.h; path = ../music_mikmod.h; sourceTree = SOURCE_ROOT; };
   1.122 -		00938E49108A397A0009CF19 /* dynamic_flac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dynamic_flac.c; path = ../dynamic_flac.c; sourceTree = SOURCE_ROOT; };
   1.123 -		00938E4A108A397A0009CF19 /* dynamic_flac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_flac.h; path = ../dynamic_flac.h; sourceTree = SOURCE_ROOT; };
   1.124 -		00938E4B108A397A0009CF19 /* dynamic_mikmod.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dynamic_mikmod.c; path = ../dynamic_mikmod.c; sourceTree = SOURCE_ROOT; };
   1.125 -		00938E4C108A397A0009CF19 /* dynamic_smpeg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_smpeg.h; path = ../dynamic_smpeg.h; sourceTree = SOURCE_ROOT; };
   1.126 -		00938E4D108A397A0009CF19 /* dynamic_ogg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_ogg.h; path = ../dynamic_ogg.h; sourceTree = SOURCE_ROOT; };
   1.127 -		04939B4817E607250015E4E3 /* load_mp3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = load_mp3.c; path = ../load_mp3.c; sourceTree = "<group>"; };
   1.128 -		04939B4917E607250015E4E3 /* load_mp3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = load_mp3.h; path = ../load_mp3.h; sourceTree = "<group>"; };
   1.129 -		04A8FCA40A19CAEC0046373F /* dynamic_smpeg.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = dynamic_smpeg.c; path = ../dynamic_smpeg.c; sourceTree = SOURCE_ROOT; };
   1.130 -		04A8FCA90A19CB070046373F /* dynamic_ogg.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = dynamic_ogg.c; path = ../dynamic_ogg.c; sourceTree = SOURCE_ROOT; };
   1.131  		1014BAEA010A4B677F000001 /* SDL_mixer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_mixer.h; path = ../SDL_mixer.h; sourceTree = SOURCE_ROOT; };
   1.132 -		5CC1B879012FB8CD7F000001 /* mixer.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = mixer.c; path = ../mixer.c; sourceTree = "<group>"; };
   1.133 -		5CC1B87A012FB8CD7F000001 /* music_cmd.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = music_cmd.c; path = ../music_cmd.c; sourceTree = "<group>"; };
   1.134 -		5CC1B87B012FB8CD7F000001 /* music_cmd.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = music_cmd.h; path = ../music_cmd.h; sourceTree = "<group>"; };
   1.135 -		5CC1B87C012FB8CD7F000001 /* music_ogg.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = music_ogg.c; path = ../music_ogg.c; sourceTree = "<group>"; };
   1.136 -		5CC1B87D012FB8CD7F000001 /* music_ogg.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = music_ogg.h; path = ../music_ogg.h; sourceTree = "<group>"; };
   1.137 -		5CC1B87E012FB8CD7F000001 /* music.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = music.c; path = ../music.c; sourceTree = "<group>"; };
   1.138  		5CC1B880012FB8CD7F000001 /* common.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = common.c; sourceTree = "<group>"; };
   1.139  		5CC1B881012FB8CD7F000001 /* common.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = common.h; sourceTree = "<group>"; };
   1.140  		5CC1B882012FB8CD7F000001 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
   1.141 @@ -188,15 +160,6 @@
   1.142  		5CC1B896012FB8CD7F000001 /* tables.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = tables.h; sourceTree = "<group>"; };
   1.143  		5CC1B897012FB8CD7F000001 /* timidity.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = timidity.c; sourceTree = "<group>"; };
   1.144  		5CC1B898012FB8CD7F000001 /* timidity.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = timidity.h; sourceTree = "<group>"; };
   1.145 -		5CC1B89B012FB8CD7F000001 /* wavestream.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = wavestream.c; path = ../wavestream.c; sourceTree = "<group>"; };
   1.146 -		5CC1B89C012FB8CD7F000001 /* wavestream.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = wavestream.h; path = ../wavestream.h; sourceTree = "<group>"; };
   1.147 -		AA5F0F0214B6A6490036992F /* dynamic_fluidsynth.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dynamic_fluidsynth.c; path = ../dynamic_fluidsynth.c; sourceTree = "<group>"; };
   1.148 -		AA5F0F0314B6A6490036992F /* dynamic_fluidsynth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_fluidsynth.h; path = ../dynamic_fluidsynth.h; sourceTree = "<group>"; };
   1.149 -		AA5F0F0414B6A6490036992F /* dynamic_mikmod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_mikmod.h; path = ../dynamic_mikmod.h; sourceTree = "<group>"; };
   1.150 -		AA5F0F0514B6A6490036992F /* fluidsynth.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fluidsynth.c; path = ../fluidsynth.c; sourceTree = "<group>"; };
   1.151 -		AA5F0F0614B6A6490036992F /* fluidsynth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fluidsynth.h; path = ../fluidsynth.h; sourceTree = "<group>"; };
   1.152 -		AA5F0F0714B6A6490036992F /* music_modplug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_modplug.c; path = ../music_modplug.c; sourceTree = "<group>"; };
   1.153 -		AA5F0F0814B6A6490036992F /* music_modplug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_modplug.h; path = ../music_modplug.h; sourceTree = "<group>"; };
   1.154  		AA60214D17653A9800662B9C /* fastmix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = fastmix.cpp; path = src/fastmix.cpp; sourceTree = "<group>"; };
   1.155  		AA60214E17653A9800662B9C /* load_669.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = load_669.cpp; path = src/load_669.cpp; sourceTree = "<group>"; };
   1.156  		AA60214F17653A9800662B9C /* load_abc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = load_abc.cpp; path = src/load_abc.cpp; sourceTree = "<group>"; };
   1.157 @@ -211,7 +174,6 @@
   1.158  		AA60215817653A9800662B9C /* load_mdl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = load_mdl.cpp; path = src/load_mdl.cpp; sourceTree = "<group>"; };
   1.159  		AA60215917653A9800662B9C /* load_med.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = load_med.cpp; path = src/load_med.cpp; sourceTree = "<group>"; };
   1.160  		AA60215A17653A9800662B9C /* load_mid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = load_mid.cpp; path = src/load_mid.cpp; sourceTree = "<group>"; };
   1.161 -		AA60215B17653A9800662B9C /* load_mikmod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = load_mikmod.cpp; path = src/load_mikmod.cpp; sourceTree = "<group>"; };
   1.162  		AA60215C17653A9800662B9C /* load_mt2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = load_mt2.cpp; path = src/load_mt2.cpp; sourceTree = "<group>"; };
   1.163  		AA60215D17653A9800662B9C /* load_mtm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = load_mtm.cpp; path = src/load_mtm.cpp; sourceTree = "<group>"; };
   1.164  		AA60215E17653A9800662B9C /* load_okt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = load_okt.cpp; path = src/load_okt.cpp; sourceTree = "<group>"; };
   1.165 @@ -234,10 +196,8 @@
   1.166  		AA60216F17653A9800662B9C /* sndfile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sndfile.cpp; path = src/sndfile.cpp; sourceTree = "<group>"; };
   1.167  		AA60217017653A9800662B9C /* sndmix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sndmix.cpp; path = src/sndmix.cpp; sourceTree = "<group>"; };
   1.168  		AA60217117653A9800662B9C /* tables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tables.h; path = src/tables.h; sourceTree = "<group>"; };
   1.169 -		AA60219717653B8700662B9C /* dynamic_modplug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dynamic_modplug.c; path = ../dynamic_modplug.c; sourceTree = "<group>"; };
   1.170 -		AA60219817653B8700662B9C /* dynamic_modplug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_modplug.h; path = ../dynamic_modplug.h; sourceTree = "<group>"; };
   1.171 -		AA644292175B0E0600A2125A /* bitwise.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bitwise.c; path = "libogg-1.3.1/src/bitwise.c"; sourceTree = "<group>"; };
   1.172 -		AA644293175B0E0600A2125A /* framing.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = framing.c; path = "libogg-1.3.1/src/framing.c"; sourceTree = "<group>"; };
   1.173 +		AA644292175B0E0600A2125A /* bitwise.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bitwise.c; path = "libogg-1.3.2/src/bitwise.c"; sourceTree = "<group>"; };
   1.174 +		AA644293175B0E0600A2125A /* framing.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = framing.c; path = "libogg-1.3.2/src/framing.c"; sourceTree = "<group>"; };
   1.175  		AA644296175B0E2500A2125A /* asm_arm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = asm_arm.h; path = "libvorbisidec-1.2.1/asm_arm.h"; sourceTree = "<group>"; };
   1.176  		AA644297175B0E2500A2125A /* backends.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = backends.h; path = "libvorbisidec-1.2.1/backends.h"; sourceTree = "<group>"; };
   1.177  		AA644298175B0E2500A2125A /* block.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = block.c; path = "libvorbisidec-1.2.1/block.c"; sourceTree = "<group>"; };
   1.178 @@ -267,17 +227,39 @@
   1.179  		AA6442B8175B0E5000A2125A /* window_lookup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = window_lookup.h; path = "libvorbisidec-1.2.1/window_lookup.h"; sourceTree = "<group>"; };
   1.180  		AA6442B9175B0E5000A2125A /* window.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = window.c; path = "libvorbisidec-1.2.1/window.c"; sourceTree = "<group>"; };
   1.181  		AA6442BA175B0E5000A2125A /* window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = window.h; path = "libvorbisidec-1.2.1/window.h"; sourceTree = "<group>"; };
   1.182 -		B2A42D0E03FAC6A400A8000A /* load_ogg.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = load_ogg.c; path = ../load_ogg.c; sourceTree = SOURCE_ROOT; };
   1.183 -		B2A42D0F03FAC6A400A8000A /* load_ogg.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = load_ogg.h; path = ../load_ogg.h; sourceTree = SOURCE_ROOT; };
   1.184 +		AAE406061F9609B900EDAF53 /* load_aiff.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = load_aiff.c; path = ../load_aiff.c; sourceTree = "<group>"; };
   1.185 +		AAE406071F9609B900EDAF53 /* music_fluidsynth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_fluidsynth.h; path = ../music_fluidsynth.h; sourceTree = "<group>"; };
   1.186 +		AAE406081F9609B900EDAF53 /* mixer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mixer.h; path = ../mixer.h; sourceTree = "<group>"; };
   1.187 +		AAE406091F9609B900EDAF53 /* mixer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mixer.c; path = ../mixer.c; sourceTree = "<group>"; };
   1.188 +		AAE4060A1F9609B900EDAF53 /* music.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music.h; path = ../music.h; sourceTree = "<group>"; };
   1.189 +		AAE4060B1F9609B900EDAF53 /* load_voc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = load_voc.h; path = ../load_voc.h; sourceTree = "<group>"; };
   1.190 +		AAE4060C1F9609B900EDAF53 /* music_modplug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_modplug.c; path = ../music_modplug.c; sourceTree = "<group>"; };
   1.191 +		AAE4060D1F9609B900EDAF53 /* music_modplug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_modplug.h; path = ../music_modplug.h; sourceTree = "<group>"; };
   1.192 +		AAE4060E1F9609B900EDAF53 /* music_fluidsynth.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_fluidsynth.c; path = ../music_fluidsynth.c; sourceTree = "<group>"; };
   1.193 +		AAE4060F1F9609B900EDAF53 /* music_flac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_flac.h; path = ../music_flac.h; sourceTree = "<group>"; };
   1.194 +		AAE406101F9609BA00EDAF53 /* music_wav.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_wav.h; path = ../music_wav.h; sourceTree = "<group>"; };
   1.195 +		AAE406111F9609BA00EDAF53 /* music_wav.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_wav.c; path = ../music_wav.c; sourceTree = "<group>"; };
   1.196 +		AAE406121F9609BA00EDAF53 /* music_mad.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_mad.c; path = ../music_mad.c; sourceTree = "<group>"; };
   1.197 +		AAE406131F9609BA00EDAF53 /* music_smpeg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_smpeg.h; path = ../music_smpeg.h; sourceTree = "<group>"; };
   1.198 +		AAE406141F9609BA00EDAF53 /* load_voc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = load_voc.c; path = ../load_voc.c; sourceTree = "<group>"; };
   1.199 +		AAE406151F9609BA00EDAF53 /* music.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music.c; path = ../music.c; sourceTree = "<group>"; };
   1.200 +		AAE406161F9609BA00EDAF53 /* music_mikmod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_mikmod.h; path = ../music_mikmod.h; sourceTree = "<group>"; };
   1.201 +		AAE406171F9609BA00EDAF53 /* music_ogg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_ogg.h; path = ../music_ogg.h; sourceTree = "<group>"; };
   1.202 +		AAE406181F9609BA00EDAF53 /* load_aiff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = load_aiff.h; path = ../load_aiff.h; sourceTree = "<group>"; };
   1.203 +		AAE406191F9609BB00EDAF53 /* music_mpg123.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_mpg123.h; path = ../music_mpg123.h; sourceTree = "<group>"; };
   1.204 +		AAE4061A1F9609BB00EDAF53 /* music_flac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_flac.c; path = ../music_flac.c; sourceTree = "<group>"; };
   1.205 +		AAE4061B1F9609BB00EDAF53 /* music_nativemidi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_nativemidi.c; path = ../music_nativemidi.c; sourceTree = "<group>"; };
   1.206 +		AAE4061C1F9609BB00EDAF53 /* music_timidity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_timidity.h; path = ../music_timidity.h; sourceTree = "<group>"; };
   1.207 +		AAE4061D1F9609BB00EDAF53 /* music_timidity.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_timidity.c; path = ../music_timidity.c; sourceTree = "<group>"; };
   1.208 +		AAE4061E1F9609BB00EDAF53 /* music_mikmod.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_mikmod.c; path = ../music_mikmod.c; sourceTree = "<group>"; };
   1.209 +		AAE4061F1F9609BB00EDAF53 /* music_ogg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_ogg.c; path = ../music_ogg.c; sourceTree = "<group>"; };
   1.210 +		AAE406201F9609BC00EDAF53 /* music_nativemidi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_nativemidi.h; path = ../music_nativemidi.h; sourceTree = "<group>"; };
   1.211 +		AAE406211F9609BC00EDAF53 /* music_cmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_cmd.h; path = ../music_cmd.h; sourceTree = "<group>"; };
   1.212 +		AAE406221F9609BC00EDAF53 /* music_smpeg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_smpeg.c; path = ../music_smpeg.c; sourceTree = "<group>"; };
   1.213 +		AAE406231F9609BC00EDAF53 /* music_cmd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_cmd.c; path = ../music_cmd.c; sourceTree = "<group>"; };
   1.214 +		AAE406241F9609BC00EDAF53 /* music_mad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_mad.h; path = ../music_mad.h; sourceTree = "<group>"; };
   1.215 +		AAE406251F9609BC00EDAF53 /* music_mpg123.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_mpg123.c; path = ../music_mpg123.c; sourceTree = "<group>"; };
   1.216  		BE1FA95407AF96B2004B6283 /* libSDL2_mixer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSDL2_mixer.a; sourceTree = BUILT_PRODUCTS_DIR; };
   1.217 -		F567D63B01CD881401F3E8B9 /* effect_position.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = effect_position.c; path = ../effect_position.c; sourceTree = SOURCE_ROOT; };
   1.218 -		F567D63C01CD881401F3E8B9 /* effect_stereoreverse.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = effect_stereoreverse.c; path = ../effect_stereoreverse.c; sourceTree = SOURCE_ROOT; };
   1.219 -		F567D63D01CD881401F3E8B9 /* effects_internal.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = effects_internal.c; path = ../effects_internal.c; sourceTree = SOURCE_ROOT; };
   1.220 -		F567D63E01CD881401F3E8B9 /* effects_internal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = effects_internal.h; path = ../effects_internal.h; sourceTree = SOURCE_ROOT; };
   1.221 -		F567D64701CD88A701F3E8B9 /* load_aiff.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = load_aiff.c; path = ../load_aiff.c; sourceTree = SOURCE_ROOT; };
   1.222 -		F567D64801CD88A701F3E8B9 /* load_aiff.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = load_aiff.h; path = ../load_aiff.h; sourceTree = SOURCE_ROOT; };
   1.223 -		F567D64901CD88A701F3E8B9 /* load_voc.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = load_voc.c; path = ../load_voc.c; sourceTree = SOURCE_ROOT; };
   1.224 -		F567D64A01CD88A701F3E8B9 /* load_voc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = load_voc.h; path = ../load_voc.h; sourceTree = SOURCE_ROOT; };
   1.225  /* End PBXFileReference section */
   1.226  
   1.227  /* Begin PBXFrameworksBuildPhase section */
   1.228 @@ -331,50 +313,38 @@
   1.229  				AA60214C17653A5900662B9C /* modplug */,
   1.230  				5CC1B87F012FB8CD7F000001 /* timidity */,
   1.231  				AA644291175B0D6E00A2125A /* tremor */,
   1.232 -				00938E49108A397A0009CF19 /* dynamic_flac.c */,
   1.233 -				00938E4A108A397A0009CF19 /* dynamic_flac.h */,
   1.234 -				AA5F0F0214B6A6490036992F /* dynamic_fluidsynth.c */,
   1.235 -				AA5F0F0314B6A6490036992F /* dynamic_fluidsynth.h */,
   1.236 -				00938E4B108A397A0009CF19 /* dynamic_mikmod.c */,
   1.237 -				AA5F0F0414B6A6490036992F /* dynamic_mikmod.h */,
   1.238 -				AA60219717653B8700662B9C /* dynamic_modplug.c */,
   1.239 -				AA60219817653B8700662B9C /* dynamic_modplug.h */,
   1.240 -				04A8FCA40A19CAEC0046373F /* dynamic_smpeg.c */,
   1.241 -				00938E4C108A397A0009CF19 /* dynamic_smpeg.h */,
   1.242 -				04A8FCA90A19CB070046373F /* dynamic_ogg.c */,
   1.243 -				00938E4D108A397A0009CF19 /* dynamic_ogg.h */,
   1.244 -				F567D63B01CD881401F3E8B9 /* effect_position.c */,
   1.245 -				F567D63C01CD881401F3E8B9 /* effect_stereoreverse.c */,
   1.246 -				F567D63D01CD881401F3E8B9 /* effects_internal.c */,
   1.247 -				F567D63E01CD881401F3E8B9 /* effects_internal.h */,
   1.248 -				AA5F0F0514B6A6490036992F /* fluidsynth.c */,
   1.249 -				AA5F0F0614B6A6490036992F /* fluidsynth.h */,
   1.250 -				F567D64701CD88A701F3E8B9 /* load_aiff.c */,
   1.251 -				F567D64801CD88A701F3E8B9 /* load_aiff.h */,
   1.252 -				00938E2B108A37800009CF19 /* load_flac.c */,
   1.253 -				00938E2C108A37800009CF19 /* load_flac.h */,
   1.254 -				04939B4817E607250015E4E3 /* load_mp3.c */,
   1.255 -				04939B4917E607250015E4E3 /* load_mp3.h */,
   1.256 -				B2A42D0E03FAC6A400A8000A /* load_ogg.c */,
   1.257 -				B2A42D0F03FAC6A400A8000A /* load_ogg.h */,
   1.258 -				F567D64901CD88A701F3E8B9 /* load_voc.c */,
   1.259 -				F567D64A01CD88A701F3E8B9 /* load_voc.h */,
   1.260 -				5CC1B879012FB8CD7F000001 /* mixer.c */,
   1.261 -				5CC1B87E012FB8CD7F000001 /* music.c */,
   1.262 -				5CC1B87A012FB8CD7F000001 /* music_cmd.c */,
   1.263 -				5CC1B87B012FB8CD7F000001 /* music_cmd.h */,
   1.264 -				00938E2D108A37800009CF19 /* music_flac.c */,
   1.265 -				00938E2E108A37800009CF19 /* music_flac.h */,
   1.266 -				00938E2F108A37800009CF19 /* music_mad.c */,
   1.267 -				00938E30108A37800009CF19 /* music_mad.h */,
   1.268 -				00938E31108A37800009CF19 /* music_mikmod.c */,
   1.269 -				00938E32108A37800009CF19 /* music_mikmod.h */,
   1.270 -				AA5F0F0714B6A6490036992F /* music_modplug.c */,
   1.271 -				AA5F0F0814B6A6490036992F /* music_modplug.h */,
   1.272 -				5CC1B87C012FB8CD7F000001 /* music_ogg.c */,
   1.273 -				5CC1B87D012FB8CD7F000001 /* music_ogg.h */,
   1.274 -				5CC1B89B012FB8CD7F000001 /* wavestream.c */,
   1.275 -				5CC1B89C012FB8CD7F000001 /* wavestream.h */,
   1.276 +				AAE406061F9609B900EDAF53 /* load_aiff.c */,
   1.277 +				AAE406181F9609BA00EDAF53 /* load_aiff.h */,
   1.278 +				AAE406141F9609BA00EDAF53 /* load_voc.c */,
   1.279 +				AAE4060B1F9609B900EDAF53 /* load_voc.h */,
   1.280 +				AAE406091F9609B900EDAF53 /* mixer.c */,
   1.281 +				AAE406081F9609B900EDAF53 /* mixer.h */,
   1.282 +				AAE406231F9609BC00EDAF53 /* music_cmd.c */,
   1.283 +				AAE406211F9609BC00EDAF53 /* music_cmd.h */,
   1.284 +				AAE4061A1F9609BB00EDAF53 /* music_flac.c */,
   1.285 +				AAE4060F1F9609B900EDAF53 /* music_flac.h */,
   1.286 +				AAE4060E1F9609B900EDAF53 /* music_fluidsynth.c */,
   1.287 +				AAE406071F9609B900EDAF53 /* music_fluidsynth.h */,
   1.288 +				AAE406121F9609BA00EDAF53 /* music_mad.c */,
   1.289 +				AAE406241F9609BC00EDAF53 /* music_mad.h */,
   1.290 +				AAE4061E1F9609BB00EDAF53 /* music_mikmod.c */,
   1.291 +				AAE406161F9609BA00EDAF53 /* music_mikmod.h */,
   1.292 +				AAE4060C1F9609B900EDAF53 /* music_modplug.c */,
   1.293 +				AAE4060D1F9609B900EDAF53 /* music_modplug.h */,
   1.294 +				AAE406251F9609BC00EDAF53 /* music_mpg123.c */,
   1.295 +				AAE406191F9609BB00EDAF53 /* music_mpg123.h */,
   1.296 +				AAE4061B1F9609BB00EDAF53 /* music_nativemidi.c */,
   1.297 +				AAE406201F9609BC00EDAF53 /* music_nativemidi.h */,
   1.298 +				AAE4061F1F9609BB00EDAF53 /* music_ogg.c */,
   1.299 +				AAE406171F9609BA00EDAF53 /* music_ogg.h */,
   1.300 +				AAE406221F9609BC00EDAF53 /* music_smpeg.c */,
   1.301 +				AAE406131F9609BA00EDAF53 /* music_smpeg.h */,
   1.302 +				AAE4061D1F9609BB00EDAF53 /* music_timidity.c */,
   1.303 +				AAE4061C1F9609BB00EDAF53 /* music_timidity.h */,
   1.304 +				AAE406111F9609BA00EDAF53 /* music_wav.c */,
   1.305 +				AAE406101F9609BA00EDAF53 /* music_wav.h */,
   1.306 +				AAE406151F9609BA00EDAF53 /* music.c */,
   1.307 +				AAE4060A1F9609B900EDAF53 /* music.h */,
   1.308  			);
   1.309  			name = "Library Source";
   1.310  			sourceTree = "<group>";
   1.311 @@ -429,7 +399,6 @@
   1.312  				AA60215817653A9800662B9C /* load_mdl.cpp */,
   1.313  				AA60215917653A9800662B9C /* load_med.cpp */,
   1.314  				AA60215A17653A9800662B9C /* load_mid.cpp */,
   1.315 -				AA60215B17653A9800662B9C /* load_mikmod.cpp */,
   1.316  				AA60215C17653A9800662B9C /* load_mt2.cpp */,
   1.317  				AA60215D17653A9800662B9C /* load_mtm.cpp */,
   1.318  				AA60215E17653A9800662B9C /* load_okt.cpp */,
   1.319 @@ -454,7 +423,7 @@
   1.320  				AA60217117653A9800662B9C /* tables.h */,
   1.321  			);
   1.322  			name = modplug;
   1.323 -			path = "../external/libmodplug-0.8.8.4";
   1.324 +			path = "../external/libmodplug-0.8.9.0";
   1.325  			sourceTree = "<group>";
   1.326  		};
   1.327  		AA644291175B0D6E00A2125A /* tremor */ = {
   1.328 @@ -503,53 +472,53 @@
   1.329  			isa = PBXHeadersBuildPhase;
   1.330  			buildActionMask = 2147483647;
   1.331  			files = (
   1.332 -				BE1FA90C07AF96B2004B6283 /* music_cmd.h in Headers */,
   1.333 -				BE1FA90D07AF96B2004B6283 /* music_ogg.h in Headers */,
   1.334  				BE1FA90E07AF96B2004B6283 /* common.h in Headers */,
   1.335 +				AAE406411F9609BD00EDAF53 /* music_cmd.h in Headers */,
   1.336  				BE1FA90F07AF96B2004B6283 /* config.h in Headers */,
   1.337  				BE1FA91007AF96B2004B6283 /* ctrlmode.h in Headers */,
   1.338  				BE1FA91107AF96B2004B6283 /* filter.h in Headers */,
   1.339  				BE1FA91207AF96B2004B6283 /* instrum.h in Headers */,
   1.340 +				AAE406361F9609BD00EDAF53 /* music_mikmod.h in Headers */,
   1.341  				BE1FA91307AF96B2004B6283 /* mix.h in Headers */,
   1.342 +				AAE4063C1F9609BD00EDAF53 /* music_timidity.h in Headers */,
   1.343 +				AAE406281F9609BD00EDAF53 /* mixer.h in Headers */,
   1.344 +				AAE406441F9609BD00EDAF53 /* music_mad.h in Headers */,
   1.345  				BE1FA91407AF96B2004B6283 /* output.h in Headers */,
   1.346  				BE1FA91507AF96B2004B6283 /* playmidi.h in Headers */,
   1.347  				BE1FA91607AF96B2004B6283 /* readmidi.h in Headers */,
   1.348  				BE1FA91707AF96B2004B6283 /* resample.h in Headers */,
   1.349  				BE1FA91807AF96B2004B6283 /* tables.h in Headers */,
   1.350 +				AAE4062A1F9609BD00EDAF53 /* music.h in Headers */,
   1.351 +				AAE406331F9609BD00EDAF53 /* music_smpeg.h in Headers */,
   1.352  				BE1FA91907AF96B2004B6283 /* timidity.h in Headers */,
   1.353 -				BE1FA91A07AF96B2004B6283 /* wavestream.h in Headers */,
   1.354 -				BE1FA91B07AF96B2004B6283 /* effects_internal.h in Headers */,
   1.355 -				BE1FA91C07AF96B2004B6283 /* load_aiff.h in Headers */,
   1.356 -				BE1FA91D07AF96B2004B6283 /* load_voc.h in Headers */,
   1.357 -				BE1FA91E07AF96B2004B6283 /* load_ogg.h in Headers */,
   1.358 -				00938E54108A397A0009CF19 /* dynamic_flac.h in Headers */,
   1.359 -				00938E56108A397A0009CF19 /* dynamic_smpeg.h in Headers */,
   1.360 -				00938E57108A397A0009CF19 /* dynamic_ogg.h in Headers */,
   1.361 -				AA5F0F0A14B6A6490036992F /* dynamic_fluidsynth.h in Headers */,
   1.362 -				AA5F0F0B14B6A6490036992F /* dynamic_mikmod.h in Headers */,
   1.363 -				AA5F0F0D14B6A6490036992F /* fluidsynth.h in Headers */,
   1.364 -				AA5F0F0F14B6A6490036992F /* music_modplug.h in Headers */,
   1.365  				AA64429E175B0E2500A2125A /* asm_arm.h in Headers */,
   1.366  				AA64429F175B0E2500A2125A /* backends.h in Headers */,
   1.367  				AA6442A1175B0E2500A2125A /* block.h in Headers */,
   1.368  				AA6442A3175B0E2500A2125A /* codebook.h in Headers */,
   1.369  				AA6442A4175B0E2500A2125A /* codec_internal.h in Headers */,
   1.370 +				AAE406391F9609BD00EDAF53 /* music_mpg123.h in Headers */,
   1.371  				AA6442A5175B0E2500A2125A /* config_types.h in Headers */,
   1.372 +				AAE406271F9609BD00EDAF53 /* music_fluidsynth.h in Headers */,
   1.373  				AA6442BE175B0E5000A2125A /* ivorbiscodec.h in Headers */,
   1.374  				AA6442BF175B0E5000A2125A /* ivorbisfile.h in Headers */,
   1.375  				AA6442C0175B0E5000A2125A /* lsp_lookup.h in Headers */,
   1.376  				AA6442C2175B0E5000A2125A /* mdct_lookup.h in Headers */,
   1.377 +				AAE4062D1F9609BD00EDAF53 /* music_modplug.h in Headers */,
   1.378 +				AAE406401F9609BD00EDAF53 /* music_nativemidi.h in Headers */,
   1.379  				AA6442C4175B0E5000A2125A /* mdct.h in Headers */,
   1.380  				AA6442C5175B0E5000A2125A /* misc.h in Headers */,
   1.381 +				AAE406381F9609BD00EDAF53 /* load_aiff.h in Headers */,
   1.382  				AA6442C6175B0E5000A2125A /* os.h in Headers */,
   1.383 +				AAE4062B1F9609BD00EDAF53 /* load_voc.h in Headers */,
   1.384  				AA6442C8175B0E5000A2125A /* registry.h in Headers */,
   1.385 +				AAE4062F1F9609BD00EDAF53 /* music_flac.h in Headers */,
   1.386  				AA6442CD175B0E5000A2125A /* window_lookup.h in Headers */,
   1.387  				AA6442CF175B0E5000A2125A /* window.h in Headers */,
   1.388  				AA60218517653A9800662B9C /* load_pat.h in Headers */,
   1.389  				AA60219017653A9800662B9C /* modplug.h in Headers */,
   1.390 +				AAE406371F9609BD00EDAF53 /* music_ogg.h in Headers */,
   1.391  				AA60219617653A9800662B9C /* tables.h in Headers */,
   1.392 -				AA60219A17653B8700662B9C /* dynamic_modplug.h in Headers */,
   1.393 -				04939B4B17E607250015E4E3 /* load_mp3.h in Headers */,
   1.394 +				AAE406301F9609BD00EDAF53 /* music_wav.h in Headers */,
   1.395  			);
   1.396  			runOnlyForDeploymentPostprocessing = 0;
   1.397  		};
   1.398 @@ -618,12 +587,10 @@
   1.399  			isa = PBXSourcesBuildPhase;
   1.400  			buildActionMask = 2147483647;
   1.401  			files = (
   1.402 -				BE1FA93807AF96B2004B6283 /* mixer.c in Sources */,
   1.403 -				BE1FA93907AF96B2004B6283 /* music_cmd.c in Sources */,
   1.404 -				BE1FA93A07AF96B2004B6283 /* music_ogg.c in Sources */,
   1.405 -				BE1FA93B07AF96B2004B6283 /* music.c in Sources */,
   1.406  				BE1FA93C07AF96B2004B6283 /* common.c in Sources */,
   1.407  				BE1FA93D07AF96B2004B6283 /* ctrlmode.c in Sources */,
   1.408 +				AAE406321F9609BD00EDAF53 /* music_mad.c in Sources */,
   1.409 +				AAE406351F9609BD00EDAF53 /* music.c in Sources */,
   1.410  				BE1FA93E07AF96B2004B6283 /* filter.c in Sources */,
   1.411  				BE1FA93F07AF96B2004B6283 /* instrum.c in Sources */,
   1.412  				BE1FA94007AF96B2004B6283 /* mix.c in Sources */,
   1.413 @@ -631,26 +598,16 @@
   1.414  				BE1FA94207AF96B2004B6283 /* playmidi.c in Sources */,
   1.415  				BE1FA94307AF96B2004B6283 /* readmidi.c in Sources */,
   1.416  				BE1FA94407AF96B2004B6283 /* resample.c in Sources */,
   1.417 +				AAE4062C1F9609BD00EDAF53 /* music_modplug.c in Sources */,
   1.418  				BE1FA94507AF96B2004B6283 /* sdl_a.c in Sources */,
   1.419  				BE1FA94607AF96B2004B6283 /* sdl_c.c in Sources */,
   1.420 +				AAE406421F9609BD00EDAF53 /* music_smpeg.c in Sources */,
   1.421  				BE1FA94707AF96B2004B6283 /* tables.c in Sources */,
   1.422 +				AAE406261F9609BD00EDAF53 /* load_aiff.c in Sources */,
   1.423  				BE1FA94807AF96B2004B6283 /* timidity.c in Sources */,
   1.424 -				BE1FA94907AF96B2004B6283 /* wavestream.c in Sources */,
   1.425 -				BE1FA94A07AF96B2004B6283 /* effect_position.c in Sources */,
   1.426 -				BE1FA94B07AF96B2004B6283 /* effect_stereoreverse.c in Sources */,
   1.427 -				BE1FA94C07AF96B2004B6283 /* effects_internal.c in Sources */,
   1.428 -				BE1FA94D07AF96B2004B6283 /* load_aiff.c in Sources */,
   1.429 -				BE1FA94E07AF96B2004B6283 /* load_voc.c in Sources */,
   1.430 -				BE1FA94F07AF96B2004B6283 /* load_ogg.c in Sources */,
   1.431 -				04A8FCA60A19CAEC0046373F /* dynamic_smpeg.c in Sources */,
   1.432 -				04A8FCAB0A19CB070046373F /* dynamic_ogg.c in Sources */,
   1.433 -				00938E53108A397A0009CF19 /* dynamic_flac.c in Sources */,
   1.434 -				00938E55108A397A0009CF19 /* dynamic_mikmod.c in Sources */,
   1.435 -				AA5F0F0914B6A6490036992F /* dynamic_fluidsynth.c in Sources */,
   1.436 -				AA5F0F0C14B6A6490036992F /* fluidsynth.c in Sources */,
   1.437 -				AA5F0F0E14B6A6490036992F /* music_modplug.c in Sources */,
   1.438  				AA644294175B0E0600A2125A /* bitwise.c in Sources */,
   1.439  				AA644295175B0E0600A2125A /* framing.c in Sources */,
   1.440 +				AAE406431F9609BD00EDAF53 /* music_cmd.c in Sources */,
   1.441  				AA6442A0175B0E2500A2125A /* block.c in Sources */,
   1.442  				AA6442A2175B0E2500A2125A /* codebook.c in Sources */,
   1.443  				AA6442BB175B0E5000A2125A /* floor0.c in Sources */,
   1.444 @@ -661,6 +618,7 @@
   1.445  				AA6442C7175B0E5000A2125A /* registry.c in Sources */,
   1.446  				AA6442C9175B0E5000A2125A /* res012.c in Sources */,
   1.447  				AA6442CA175B0E5000A2125A /* sharedbook.c in Sources */,
   1.448 +				AAE4063B1F9609BD00EDAF53 /* music_nativemidi.c in Sources */,
   1.449  				AA6442CB175B0E5000A2125A /* synthesis.c in Sources */,
   1.450  				AA6442CC175B0E5000A2125A /* vorbisfile.c in Sources */,
   1.451  				AA6442CE175B0E5000A2125A /* window.c in Sources */,
   1.452 @@ -669,37 +627,43 @@
   1.453  				AA60217417653A9800662B9C /* load_abc.cpp in Sources */,
   1.454  				AA60217517653A9800662B9C /* load_amf.cpp in Sources */,
   1.455  				AA60217617653A9800662B9C /* load_ams.cpp in Sources */,
   1.456 +				AAE4063E1F9609BD00EDAF53 /* music_mikmod.c in Sources */,
   1.457  				AA60217717653A9800662B9C /* load_dbm.cpp in Sources */,
   1.458 +				AAE406311F9609BD00EDAF53 /* music_wav.c in Sources */,
   1.459  				AA60217817653A9800662B9C /* load_dmf.cpp in Sources */,
   1.460  				AA60217917653A9800662B9C /* load_dsm.cpp in Sources */,
   1.461 +				AAE406451F9609BD00EDAF53 /* music_mpg123.c in Sources */,
   1.462  				AA60217A17653A9800662B9C /* load_far.cpp in Sources */,
   1.463  				AA60217B17653A9800662B9C /* load_it.cpp in Sources */,
   1.464  				AA60217C17653A9800662B9C /* load_j2b.cpp in Sources */,
   1.465  				AA60217D17653A9800662B9C /* load_mdl.cpp in Sources */,
   1.466  				AA60217E17653A9800662B9C /* load_med.cpp in Sources */,
   1.467 +				AAE406341F9609BD00EDAF53 /* load_voc.c in Sources */,
   1.468  				AA60217F17653A9800662B9C /* load_mid.cpp in Sources */,
   1.469 -				AA60218017653A9800662B9C /* load_mikmod.cpp in Sources */,
   1.470  				AA60218117653A9800662B9C /* load_mt2.cpp in Sources */,
   1.471  				AA60218217653A9800662B9C /* load_mtm.cpp in Sources */,
   1.472  				AA60218317653A9800662B9C /* load_okt.cpp in Sources */,
   1.473  				AA60218417653A9800662B9C /* load_pat.cpp in Sources */,
   1.474  				AA60218617653A9800662B9C /* load_psm.cpp in Sources */,
   1.475  				AA60218717653A9800662B9C /* load_ptm.cpp in Sources */,
   1.476 +				AAE4062E1F9609BD00EDAF53 /* music_fluidsynth.c in Sources */,
   1.477  				AA60218817653A9800662B9C /* load_s3m.cpp in Sources */,
   1.478  				AA60218917653A9800662B9C /* load_stm.cpp in Sources */,
   1.479  				AA60218A17653A9800662B9C /* load_ult.cpp in Sources */,
   1.480  				AA60218B17653A9800662B9C /* load_umx.cpp in Sources */,
   1.481 +				AAE4063F1F9609BD00EDAF53 /* music_ogg.c in Sources */,
   1.482  				AA60218C17653A9800662B9C /* load_wav.cpp in Sources */,
   1.483  				AA60218D17653A9800662B9C /* load_xm.cpp in Sources */,
   1.484 +				AAE4063D1F9609BD00EDAF53 /* music_timidity.c in Sources */,
   1.485  				AA60218E17653A9800662B9C /* mmcmp.cpp in Sources */,
   1.486 +				AAE4063A1F9609BD00EDAF53 /* music_flac.c in Sources */,
   1.487  				AA60218F17653A9800662B9C /* modplug.cpp in Sources */,
   1.488  				AA60219117653A9800662B9C /* snd_dsp.cpp in Sources */,
   1.489  				AA60219217653A9800662B9C /* snd_flt.cpp in Sources */,
   1.490  				AA60219317653A9800662B9C /* snd_fx.cpp in Sources */,
   1.491 +				AAE406291F9609BD00EDAF53 /* mixer.c in Sources */,
   1.492  				AA60219417653A9800662B9C /* sndfile.cpp in Sources */,
   1.493  				AA60219517653A9800662B9C /* sndmix.cpp in Sources */,
   1.494 -				AA60219917653B8700662B9C /* dynamic_modplug.c in Sources */,
   1.495 -				04939B4A17E607250015E4E3 /* load_mp3.c in Sources */,
   1.496  			);
   1.497  			runOnlyForDeploymentPostprocessing = 0;
   1.498  		};
   1.499 @@ -750,7 +714,7 @@
   1.500  					"$(HEADER_SEARCH_PATHS_QUOTED_FOR_PROJECT_2)",
   1.501  				);
   1.502  				HEADER_SEARCH_PATHS_QUOTED_FOR_PROJECT_1 = "\"$(SRCROOT)/../../SDL/include\"";
   1.503 -				HEADER_SEARCH_PATHS_QUOTED_FOR_PROJECT_2 = "\"$(SRCROOT)/../external/libmodplug-0.8.8.4/src\" \"$(SRCROOT)/../external/libmodplug-0.8.8.4/src/libmodplug\" \"$(SRCROOT)/../external/libvorbisidec-1.2.1\" \"$(SRCROOT)/../external/libogg-1.3.1/include\"";
   1.504 +				HEADER_SEARCH_PATHS_QUOTED_FOR_PROJECT_2 = "\"$(SRCROOT)/../external/libmodplug-0.8.9.0/src\" \"$(SRCROOT)/../external/libmodplug-0.8.9.0/src/libmodplug\" \"$(SRCROOT)/../external/libvorbisidec-1.2.1\" \"$(SRCROOT)/../external/libogg-1.3.2/include\"";
   1.505  				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
   1.506  				SDKROOT = iphoneos;
   1.507  				TARGETED_DEVICE_FAMILY = "1,2";
   1.508 @@ -779,7 +743,7 @@
   1.509  					"$(HEADER_SEARCH_PATHS_QUOTED_FOR_PROJECT_2)",
   1.510  				);
   1.511  				HEADER_SEARCH_PATHS_QUOTED_FOR_PROJECT_1 = "\"$(SRCROOT)/../../SDL/include\"";
   1.512 -				HEADER_SEARCH_PATHS_QUOTED_FOR_PROJECT_2 = "\"$(SRCROOT)/../external/libmodplug-0.8.8.4/src\" \"$(SRCROOT)/../external/libmodplug-0.8.8.4/src/libmodplug\" \"$(SRCROOT)/../external/libvorbisidec-1.2.1\" \"$(SRCROOT)/../external/libogg-1.3.1/include\"";
   1.513 +				HEADER_SEARCH_PATHS_QUOTED_FOR_PROJECT_2 = "\"$(SRCROOT)/../external/libmodplug-0.8.9.0/src\" \"$(SRCROOT)/../external/libmodplug-0.8.9.0/src/libmodplug\" \"$(SRCROOT)/../external/libvorbisidec-1.2.1\" \"$(SRCROOT)/../external/libogg-1.3.2/include\"";
   1.514  				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
   1.515  				ONLY_ACTIVE_ARCH = YES;
   1.516  				SDKROOT = iphoneos;
     2.1 --- a/Xcode/Info-Framework.plist	Tue Oct 17 02:39:45 2017 -0700
     2.2 +++ b/Xcode/Info-Framework.plist	Tue Oct 17 02:54:52 2017 -0700
     2.3 @@ -7,7 +7,7 @@
     2.4  	<key>CFBundleExecutable</key>
     2.5  	<string>SDL2_mixer</string>
     2.6  	<key>CFBundleIdentifier</key>
     2.7 -	<string>org.libsdl.SDL2-mixer</string>
     2.8 +	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
     2.9  	<key>CFBundleInfoDictionaryVersion</key>
    2.10  	<string>6.0</string>
    2.11  	<key>CFBundleName</key>
     3.1 --- a/Xcode/SDL_mixer.xcodeproj/project.pbxproj	Tue Oct 17 02:39:45 2017 -0700
     3.2 +++ b/Xcode/SDL_mixer.xcodeproj/project.pbxproj	Tue Oct 17 02:54:52 2017 -0700
     3.3 @@ -7,53 +7,9 @@
     3.4  	objects = {
     3.5  
     3.6  /* Begin PBXBuildFile section */
     3.7 -		00938E33108A37800009CF19 /* load_flac.c in Sources */ = {isa = PBXBuildFile; fileRef = 00938E2B108A37800009CF19 /* load_flac.c */; };
     3.8 -		00938E34108A37800009CF19 /* load_flac.h in Headers */ = {isa = PBXBuildFile; fileRef = 00938E2C108A37800009CF19 /* load_flac.h */; };
     3.9 -		00938E35108A37800009CF19 /* music_flac.c in Sources */ = {isa = PBXBuildFile; fileRef = 00938E2D108A37800009CF19 /* music_flac.c */; };
    3.10 -		00938E36108A37800009CF19 /* music_flac.h in Headers */ = {isa = PBXBuildFile; fileRef = 00938E2E108A37800009CF19 /* music_flac.h */; };
    3.11 -		00938E37108A37800009CF19 /* music_mad.c in Sources */ = {isa = PBXBuildFile; fileRef = 00938E2F108A37800009CF19 /* music_mad.c */; };
    3.12 -		00938E38108A37800009CF19 /* music_mad.h in Headers */ = {isa = PBXBuildFile; fileRef = 00938E30108A37800009CF19 /* music_mad.h */; };
    3.13 -		00938E39108A37800009CF19 /* music_mikmod.c in Sources */ = {isa = PBXBuildFile; fileRef = 00938E31108A37800009CF19 /* music_mikmod.c */; };
    3.14 -		00938E3A108A37800009CF19 /* music_mikmod.h in Headers */ = {isa = PBXBuildFile; fileRef = 00938E32108A37800009CF19 /* music_mikmod.h */; };
    3.15 -		00938E4E108A397A0009CF19 /* dynamic_flac.c in Sources */ = {isa = PBXBuildFile; fileRef = 00938E49108A397A0009CF19 /* dynamic_flac.c */; };
    3.16 -		00938E4F108A397A0009CF19 /* dynamic_flac.h in Headers */ = {isa = PBXBuildFile; fileRef = 00938E4A108A397A0009CF19 /* dynamic_flac.h */; };
    3.17 -		00938E50108A397A0009CF19 /* dynamic_mikmod.c in Sources */ = {isa = PBXBuildFile; fileRef = 00938E4B108A397A0009CF19 /* dynamic_mikmod.c */; };
    3.18 -		00938E51108A397A0009CF19 /* dynamic_smpeg.h in Headers */ = {isa = PBXBuildFile; fileRef = 00938E4C108A397A0009CF19 /* dynamic_smpeg.h */; };
    3.19 -		00938E52108A397A0009CF19 /* dynamic_ogg.h in Headers */ = {isa = PBXBuildFile; fileRef = 00938E4D108A397A0009CF19 /* dynamic_ogg.h */; };
    3.20 -		00938E53108A397A0009CF19 /* dynamic_flac.c in Sources */ = {isa = PBXBuildFile; fileRef = 00938E49108A397A0009CF19 /* dynamic_flac.c */; };
    3.21 -		00938E54108A397A0009CF19 /* dynamic_flac.h in Headers */ = {isa = PBXBuildFile; fileRef = 00938E4A108A397A0009CF19 /* dynamic_flac.h */; };
    3.22 -		00938E55108A397A0009CF19 /* dynamic_mikmod.c in Sources */ = {isa = PBXBuildFile; fileRef = 00938E4B108A397A0009CF19 /* dynamic_mikmod.c */; };
    3.23 -		00938E56108A397A0009CF19 /* dynamic_smpeg.h in Headers */ = {isa = PBXBuildFile; fileRef = 00938E4C108A397A0009CF19 /* dynamic_smpeg.h */; };
    3.24 -		00938E57108A397A0009CF19 /* dynamic_ogg.h in Headers */ = {isa = PBXBuildFile; fileRef = 00938E4D108A397A0009CF19 /* dynamic_ogg.h */; };
    3.25  		0448E8AE108B937A00C9D3EA /* native_midi_macosx.c in Sources */ = {isa = PBXBuildFile; fileRef = 0448E8AD108B937A00C9D3EA /* native_midi_macosx.c */; };
    3.26  		0448E8AF108B937A00C9D3EA /* native_midi_macosx.c in Sources */ = {isa = PBXBuildFile; fileRef = 0448E8AD108B937A00C9D3EA /* native_midi_macosx.c */; };
    3.27 -		04939B4E17E607F70015E4E3 /* load_mp3.c in Sources */ = {isa = PBXBuildFile; fileRef = 04939B4C17E607F70015E4E3 /* load_mp3.c */; };
    3.28 -		04939B4F17E607F70015E4E3 /* load_mp3.c in Sources */ = {isa = PBXBuildFile; fileRef = 04939B4C17E607F70015E4E3 /* load_mp3.c */; };
    3.29 -		04939B5017E607F70015E4E3 /* load_mp3.h in Headers */ = {isa = PBXBuildFile; fileRef = 04939B4D17E607F70015E4E3 /* load_mp3.h */; };
    3.30 -		04939B5117E607F70015E4E3 /* load_mp3.h in Headers */ = {isa = PBXBuildFile; fileRef = 04939B4D17E607F70015E4E3 /* load_mp3.h */; };
    3.31 -		04A8FCA60A19CAEC0046373F /* dynamic_smpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 04A8FCA40A19CAEC0046373F /* dynamic_smpeg.c */; };
    3.32 -		04A8FCA70A19CAEC0046373F /* dynamic_smpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 04A8FCA40A19CAEC0046373F /* dynamic_smpeg.c */; };
    3.33 -		04A8FCAB0A19CB070046373F /* dynamic_ogg.c in Sources */ = {isa = PBXBuildFile; fileRef = 04A8FCA90A19CB070046373F /* dynamic_ogg.c */; };
    3.34 -		04A8FCAC0A19CB070046373F /* dynamic_ogg.c in Sources */ = {isa = PBXBuildFile; fileRef = 04A8FCA90A19CB070046373F /* dynamic_ogg.c */; };
    3.35  		AA6021301765383B00662B9C /* modplug.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = AA60212F1765382200662B9C /* modplug.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
    3.36 -		AA60213A176538EB00662B9C /* dynamic_fluidsynth.c in Sources */ = {isa = PBXBuildFile; fileRef = AA602131176538EB00662B9C /* dynamic_fluidsynth.c */; };
    3.37 -		AA60213B176538EB00662B9C /* dynamic_fluidsynth.c in Sources */ = {isa = PBXBuildFile; fileRef = AA602131176538EB00662B9C /* dynamic_fluidsynth.c */; };
    3.38 -		AA60213C176538EB00662B9C /* dynamic_fluidsynth.h in Headers */ = {isa = PBXBuildFile; fileRef = AA602132176538EB00662B9C /* dynamic_fluidsynth.h */; };
    3.39 -		AA60213D176538EB00662B9C /* dynamic_fluidsynth.h in Headers */ = {isa = PBXBuildFile; fileRef = AA602132176538EB00662B9C /* dynamic_fluidsynth.h */; };
    3.40 -		AA60213E176538EB00662B9C /* dynamic_mikmod.h in Headers */ = {isa = PBXBuildFile; fileRef = AA602133176538EB00662B9C /* dynamic_mikmod.h */; };
    3.41 -		AA60213F176538EB00662B9C /* dynamic_mikmod.h in Headers */ = {isa = PBXBuildFile; fileRef = AA602133176538EB00662B9C /* dynamic_mikmod.h */; };
    3.42 -		AA602140176538EB00662B9C /* dynamic_modplug.c in Sources */ = {isa = PBXBuildFile; fileRef = AA602134176538EB00662B9C /* dynamic_modplug.c */; };
    3.43 -		AA602141176538EB00662B9C /* dynamic_modplug.c in Sources */ = {isa = PBXBuildFile; fileRef = AA602134176538EB00662B9C /* dynamic_modplug.c */; };
    3.44 -		AA602142176538EB00662B9C /* dynamic_modplug.h in Headers */ = {isa = PBXBuildFile; fileRef = AA602135176538EB00662B9C /* dynamic_modplug.h */; };
    3.45 -		AA602143176538EB00662B9C /* dynamic_modplug.h in Headers */ = {isa = PBXBuildFile; fileRef = AA602135176538EB00662B9C /* dynamic_modplug.h */; };
    3.46 -		AA602144176538EB00662B9C /* fluidsynth.c in Sources */ = {isa = PBXBuildFile; fileRef = AA602136176538EB00662B9C /* fluidsynth.c */; };
    3.47 -		AA602145176538EB00662B9C /* fluidsynth.c in Sources */ = {isa = PBXBuildFile; fileRef = AA602136176538EB00662B9C /* fluidsynth.c */; };
    3.48 -		AA602146176538EB00662B9C /* fluidsynth.h in Headers */ = {isa = PBXBuildFile; fileRef = AA602137176538EB00662B9C /* fluidsynth.h */; };
    3.49 -		AA602147176538EB00662B9C /* fluidsynth.h in Headers */ = {isa = PBXBuildFile; fileRef = AA602137176538EB00662B9C /* fluidsynth.h */; };
    3.50 -		AA602148176538EB00662B9C /* music_modplug.c in Sources */ = {isa = PBXBuildFile; fileRef = AA602138176538EB00662B9C /* music_modplug.c */; };
    3.51 -		AA602149176538EB00662B9C /* music_modplug.c in Sources */ = {isa = PBXBuildFile; fileRef = AA602138176538EB00662B9C /* music_modplug.c */; };
    3.52 -		AA60214A176538EB00662B9C /* music_modplug.h in Headers */ = {isa = PBXBuildFile; fileRef = AA602139176538EB00662B9C /* music_modplug.h */; };
    3.53 -		AA60214B176538EB00662B9C /* music_modplug.h in Headers */ = {isa = PBXBuildFile; fileRef = AA602139176538EB00662B9C /* music_modplug.h */; };
    3.54  		AA644290175AA7C900A2125A /* smpeg2.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = AA64428E175AA7A500A2125A /* smpeg2.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
    3.55  		AA6442D3175B181D00A2125A /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA6442D2175B181D00A2125A /* AudioUnit.framework */; };
    3.56  		AA6442D5175B185800A2125A /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA6442D4175B185800A2125A /* CoreServices.framework */; };
    3.57 @@ -61,8 +17,42 @@
    3.58  		AA9F7DBB14B15D4400278D1E /* Ogg.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = AA9F7DB314B15ADC00278D1E /* Ogg.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
    3.59  		AA9F7DBE14B15D5400278D1E /* Vorbis.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = AA9F7DB414B15ADC00278D1E /* Vorbis.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
    3.60  		AAE2D4361F90416000057D25 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AA6442D0175B181300A2125A /* AudioToolbox.framework */; };
    3.61 -		BE1FA8B907AF96B2004B6283 /* music_cmd.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CC1B87B012FB8CD7F000001 /* music_cmd.h */; };
    3.62 -		BE1FA8BA07AF96B2004B6283 /* music_ogg.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CC1B87D012FB8CD7F000001 /* music_ogg.h */; };
    3.63 +		AAE405E21F9607C300EDAF53 /* load_aiff.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405BE1F9607BF00EDAF53 /* load_aiff.c */; };
    3.64 +		AAE405E31F9607C300EDAF53 /* music_fluidsynth.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405BF1F9607BF00EDAF53 /* music_fluidsynth.h */; };
    3.65 +		AAE405E41F9607C300EDAF53 /* mixer.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405C01F9607BF00EDAF53 /* mixer.h */; };
    3.66 +		AAE405E51F9607C300EDAF53 /* mixer.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405C11F9607C000EDAF53 /* mixer.c */; };
    3.67 +		AAE405E61F9607C300EDAF53 /* music.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405C21F9607C000EDAF53 /* music.h */; };
    3.68 +		AAE405E71F9607C300EDAF53 /* load_voc.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405C31F9607C000EDAF53 /* load_voc.h */; };
    3.69 +		AAE405E81F9607C300EDAF53 /* music_modplug.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405C41F9607C000EDAF53 /* music_modplug.c */; };
    3.70 +		AAE405E91F9607C300EDAF53 /* music_modplug.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405C51F9607C000EDAF53 /* music_modplug.h */; };
    3.71 +		AAE405EA1F9607C300EDAF53 /* music_fluidsynth.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405C61F9607C000EDAF53 /* music_fluidsynth.c */; };
    3.72 +		AAE405EB1F9607C300EDAF53 /* music_flac.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405C71F9607C000EDAF53 /* music_flac.h */; };
    3.73 +		AAE405EC1F9607C300EDAF53 /* music_wav.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405C81F9607C000EDAF53 /* music_wav.h */; };
    3.74 +		AAE405ED1F9607C300EDAF53 /* music_wav.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405C91F9607C000EDAF53 /* music_wav.c */; };
    3.75 +		AAE405EE1F9607C300EDAF53 /* music_mad.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405CA1F9607C000EDAF53 /* music_mad.c */; };
    3.76 +		AAE405EF1F9607C300EDAF53 /* music_smpeg.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405CB1F9607C000EDAF53 /* music_smpeg.h */; };
    3.77 +		AAE405F01F9607C300EDAF53 /* load_voc.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405CC1F9607C000EDAF53 /* load_voc.c */; };
    3.78 +		AAE405F11F9607C300EDAF53 /* music.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405CD1F9607C000EDAF53 /* music.c */; };
    3.79 +		AAE405F21F9607C300EDAF53 /* effects_internal.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405CE1F9607C100EDAF53 /* effects_internal.c */; };
    3.80 +		AAE405F31F9607C300EDAF53 /* music_mikmod.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405CF1F9607C100EDAF53 /* music_mikmod.h */; };
    3.81 +		AAE405F41F9607C300EDAF53 /* effect_position.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405D01F9607C100EDAF53 /* effect_position.c */; };
    3.82 +		AAE405F51F9607C300EDAF53 /* music_ogg.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405D11F9607C100EDAF53 /* music_ogg.h */; };
    3.83 +		AAE405F61F9607C300EDAF53 /* load_aiff.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405D21F9607C100EDAF53 /* load_aiff.h */; };
    3.84 +		AAE405F71F9607C300EDAF53 /* music_mpg123.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405D31F9607C100EDAF53 /* music_mpg123.h */; };
    3.85 +		AAE405F81F9607C300EDAF53 /* music_flac.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405D41F9607C100EDAF53 /* music_flac.c */; };
    3.86 +		AAE405F91F9607C300EDAF53 /* music_nativemidi.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405D51F9607C100EDAF53 /* music_nativemidi.c */; };
    3.87 +		AAE405FA1F9607C300EDAF53 /* music_timidity.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405D61F9607C100EDAF53 /* music_timidity.h */; };
    3.88 +		AAE405FB1F9607C300EDAF53 /* music_timidity.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405D71F9607C200EDAF53 /* music_timidity.c */; };
    3.89 +		AAE405FC1F9607C300EDAF53 /* music_mikmod.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405D81F9607C200EDAF53 /* music_mikmod.c */; };
    3.90 +		AAE405FD1F9607C300EDAF53 /* music_ogg.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405D91F9607C200EDAF53 /* music_ogg.c */; };
    3.91 +		AAE405FE1F9607C300EDAF53 /* music_nativemidi.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405DA1F9607C200EDAF53 /* music_nativemidi.h */; };
    3.92 +		AAE405FF1F9607C300EDAF53 /* music_cmd.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405DB1F9607C200EDAF53 /* music_cmd.h */; };
    3.93 +		AAE406001F9607C300EDAF53 /* music_smpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405DC1F9607C200EDAF53 /* music_smpeg.c */; };
    3.94 +		AAE406011F9607C300EDAF53 /* music_mad.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405DD1F9607C300EDAF53 /* music_mad.h */; };
    3.95 +		AAE406021F9607C300EDAF53 /* music_cmd.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405DE1F9607C300EDAF53 /* music_cmd.c */; };
    3.96 +		AAE406031F9607C300EDAF53 /* music_mpg123.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405DF1F9607C300EDAF53 /* music_mpg123.c */; };
    3.97 +		AAE406041F9607C300EDAF53 /* effect_stereoreverse.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405E01F9607C300EDAF53 /* effect_stereoreverse.c */; };
    3.98 +		AAE406051F9607C300EDAF53 /* effects_internal.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405E11F9607C300EDAF53 /* effects_internal.h */; };
    3.99  		BE1FA8BB07AF96B2004B6283 /* common.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CC1B881012FB8CD7F000001 /* common.h */; };
   3.100  		BE1FA8BC07AF96B2004B6283 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CC1B882012FB8CD7F000001 /* config.h */; };
   3.101  		BE1FA8BD07AF96B2004B6283 /* ctrlmode.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CC1B884012FB8CD7F000001 /* ctrlmode.h */; };
   3.102 @@ -75,16 +65,7 @@
   3.103  		BE1FA8C407AF96B2004B6283 /* resample.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CC1B892012FB8CD7F000001 /* resample.h */; };
   3.104  		BE1FA8C507AF96B2004B6283 /* tables.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CC1B896012FB8CD7F000001 /* tables.h */; };
   3.105  		BE1FA8C607AF96B2004B6283 /* timidity.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CC1B898012FB8CD7F000001 /* timidity.h */; };
   3.106 -		BE1FA8C707AF96B2004B6283 /* wavestream.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CC1B89C012FB8CD7F000001 /* wavestream.h */; };
   3.107 -		BE1FA8C807AF96B2004B6283 /* effects_internal.h in Headers */ = {isa = PBXBuildFile; fileRef = F567D63E01CD881401F3E8B9 /* effects_internal.h */; };
   3.108 -		BE1FA8C907AF96B2004B6283 /* load_aiff.h in Headers */ = {isa = PBXBuildFile; fileRef = F567D64801CD88A701F3E8B9 /* load_aiff.h */; };
   3.109 -		BE1FA8CA07AF96B2004B6283 /* load_voc.h in Headers */ = {isa = PBXBuildFile; fileRef = F567D64A01CD88A701F3E8B9 /* load_voc.h */; };
   3.110  		BE1FA8CD07AF96B2004B6283 /* SDL_mixer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1014BAEA010A4B677F000001 /* SDL_mixer.h */; settings = {ATTRIBUTES = (Public, ); }; };
   3.111 -		BE1FA8CE07AF96B2004B6283 /* load_ogg.h in Headers */ = {isa = PBXBuildFile; fileRef = B2A42D0F03FAC6A400A8000A /* load_ogg.h */; };
   3.112 -		BE1FA8E707AF96B2004B6283 /* mixer.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B879012FB8CD7F000001 /* mixer.c */; };
   3.113 -		BE1FA8E807AF96B2004B6283 /* music_cmd.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B87A012FB8CD7F000001 /* music_cmd.c */; };
   3.114 -		BE1FA8E907AF96B2004B6283 /* music_ogg.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B87C012FB8CD7F000001 /* music_ogg.c */; };
   3.115 -		BE1FA8EA07AF96B2004B6283 /* music.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B87E012FB8CD7F000001 /* music.c */; };
   3.116  		BE1FA8EB07AF96B2004B6283 /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B880012FB8CD7F000001 /* common.c */; };
   3.117  		BE1FA8EC07AF96B2004B6283 /* ctrlmode.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B883012FB8CD7F000001 /* ctrlmode.c */; };
   3.118  		BE1FA8ED07AF96B2004B6283 /* filter.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B885012FB8CD7F000001 /* filter.c */; };
   3.119 @@ -98,16 +79,7 @@
   3.120  		BE1FA8F507AF96B2004B6283 /* sdl_c.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B894012FB8CD7F000001 /* sdl_c.c */; };
   3.121  		BE1FA8F607AF96B2004B6283 /* tables.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B895012FB8CD7F000001 /* tables.c */; };
   3.122  		BE1FA8F707AF96B2004B6283 /* timidity.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B897012FB8CD7F000001 /* timidity.c */; };
   3.123 -		BE1FA8F807AF96B2004B6283 /* wavestream.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B89B012FB8CD7F000001 /* wavestream.c */; };
   3.124 -		BE1FA8F907AF96B2004B6283 /* effect_position.c in Sources */ = {isa = PBXBuildFile; fileRef = F567D63B01CD881401F3E8B9 /* effect_position.c */; };
   3.125 -		BE1FA8FA07AF96B2004B6283 /* effect_stereoreverse.c in Sources */ = {isa = PBXBuildFile; fileRef = F567D63C01CD881401F3E8B9 /* effect_stereoreverse.c */; };
   3.126 -		BE1FA8FB07AF96B2004B6283 /* effects_internal.c in Sources */ = {isa = PBXBuildFile; fileRef = F567D63D01CD881401F3E8B9 /* effects_internal.c */; };
   3.127 -		BE1FA8FC07AF96B2004B6283 /* load_aiff.c in Sources */ = {isa = PBXBuildFile; fileRef = F567D64701CD88A701F3E8B9 /* load_aiff.c */; };
   3.128 -		BE1FA8FD07AF96B2004B6283 /* load_voc.c in Sources */ = {isa = PBXBuildFile; fileRef = F567D64901CD88A701F3E8B9 /* load_voc.c */; };
   3.129 -		BE1FA90007AF96B2004B6283 /* load_ogg.c in Sources */ = {isa = PBXBuildFile; fileRef = B2A42D0E03FAC6A400A8000A /* load_ogg.c */; };
   3.130  		BE1FA90207AF96B2004B6283 /* SDL2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BE1FA8AE07AF95F7004B6283 /* SDL2.framework */; };
   3.131 -		BE1FA90C07AF96B2004B6283 /* music_cmd.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CC1B87B012FB8CD7F000001 /* music_cmd.h */; };
   3.132 -		BE1FA90D07AF96B2004B6283 /* music_ogg.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CC1B87D012FB8CD7F000001 /* music_ogg.h */; };
   3.133  		BE1FA90E07AF96B2004B6283 /* common.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CC1B881012FB8CD7F000001 /* common.h */; };
   3.134  		BE1FA90F07AF96B2004B6283 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CC1B882012FB8CD7F000001 /* config.h */; };
   3.135  		BE1FA91007AF96B2004B6283 /* ctrlmode.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CC1B884012FB8CD7F000001 /* ctrlmode.h */; };
   3.136 @@ -120,15 +92,6 @@
   3.137  		BE1FA91707AF96B2004B6283 /* resample.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CC1B892012FB8CD7F000001 /* resample.h */; };
   3.138  		BE1FA91807AF96B2004B6283 /* tables.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CC1B896012FB8CD7F000001 /* tables.h */; };
   3.139  		BE1FA91907AF96B2004B6283 /* timidity.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CC1B898012FB8CD7F000001 /* timidity.h */; };
   3.140 -		BE1FA91A07AF96B2004B6283 /* wavestream.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CC1B89C012FB8CD7F000001 /* wavestream.h */; };
   3.141 -		BE1FA91B07AF96B2004B6283 /* effects_internal.h in Headers */ = {isa = PBXBuildFile; fileRef = F567D63E01CD881401F3E8B9 /* effects_internal.h */; };
   3.142 -		BE1FA91C07AF96B2004B6283 /* load_aiff.h in Headers */ = {isa = PBXBuildFile; fileRef = F567D64801CD88A701F3E8B9 /* load_aiff.h */; };
   3.143 -		BE1FA91D07AF96B2004B6283 /* load_voc.h in Headers */ = {isa = PBXBuildFile; fileRef = F567D64A01CD88A701F3E8B9 /* load_voc.h */; };
   3.144 -		BE1FA91E07AF96B2004B6283 /* load_ogg.h in Headers */ = {isa = PBXBuildFile; fileRef = B2A42D0F03FAC6A400A8000A /* load_ogg.h */; };
   3.145 -		BE1FA93807AF96B2004B6283 /* mixer.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B879012FB8CD7F000001 /* mixer.c */; };
   3.146 -		BE1FA93907AF96B2004B6283 /* music_cmd.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B87A012FB8CD7F000001 /* music_cmd.c */; };
   3.147 -		BE1FA93A07AF96B2004B6283 /* music_ogg.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B87C012FB8CD7F000001 /* music_ogg.c */; };
   3.148 -		BE1FA93B07AF96B2004B6283 /* music.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B87E012FB8CD7F000001 /* music.c */; };
   3.149  		BE1FA93C07AF96B2004B6283 /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B880012FB8CD7F000001 /* common.c */; };
   3.150  		BE1FA93D07AF96B2004B6283 /* ctrlmode.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B883012FB8CD7F000001 /* ctrlmode.c */; };
   3.151  		BE1FA93E07AF96B2004B6283 /* filter.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B885012FB8CD7F000001 /* filter.c */; };
   3.152 @@ -142,13 +105,6 @@
   3.153  		BE1FA94607AF96B2004B6283 /* sdl_c.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B894012FB8CD7F000001 /* sdl_c.c */; };
   3.154  		BE1FA94707AF96B2004B6283 /* tables.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B895012FB8CD7F000001 /* tables.c */; };
   3.155  		BE1FA94807AF96B2004B6283 /* timidity.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B897012FB8CD7F000001 /* timidity.c */; };
   3.156 -		BE1FA94907AF96B2004B6283 /* wavestream.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CC1B89B012FB8CD7F000001 /* wavestream.c */; };
   3.157 -		BE1FA94A07AF96B2004B6283 /* effect_position.c in Sources */ = {isa = PBXBuildFile; fileRef = F567D63B01CD881401F3E8B9 /* effect_position.c */; };
   3.158 -		BE1FA94B07AF96B2004B6283 /* effect_stereoreverse.c in Sources */ = {isa = PBXBuildFile; fileRef = F567D63C01CD881401F3E8B9 /* effect_stereoreverse.c */; };
   3.159 -		BE1FA94C07AF96B2004B6283 /* effects_internal.c in Sources */ = {isa = PBXBuildFile; fileRef = F567D63D01CD881401F3E8B9 /* effects_internal.c */; };
   3.160 -		BE1FA94D07AF96B2004B6283 /* load_aiff.c in Sources */ = {isa = PBXBuildFile; fileRef = F567D64701CD88A701F3E8B9 /* load_aiff.c */; };
   3.161 -		BE1FA94E07AF96B2004B6283 /* load_voc.c in Sources */ = {isa = PBXBuildFile; fileRef = F567D64901CD88A701F3E8B9 /* load_voc.c */; };
   3.162 -		BE1FA94F07AF96B2004B6283 /* load_ogg.c in Sources */ = {isa = PBXBuildFile; fileRef = B2A42D0E03FAC6A400A8000A /* load_ogg.c */; };
   3.163  /* End PBXBuildFile section */
   3.164  
   3.165  /* Begin PBXContainerItemProxy section */
   3.166 @@ -180,31 +136,8 @@
   3.167  /* End PBXCopyFilesBuildPhase section */
   3.168  
   3.169  /* Begin PBXFileReference section */
   3.170 -		00938E2B108A37800009CF19 /* load_flac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = load_flac.c; path = ../load_flac.c; sourceTree = SOURCE_ROOT; };
   3.171 -		00938E2C108A37800009CF19 /* load_flac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = load_flac.h; path = ../load_flac.h; sourceTree = SOURCE_ROOT; };
   3.172 -		00938E2D108A37800009CF19 /* music_flac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_flac.c; path = ../music_flac.c; sourceTree = SOURCE_ROOT; };
   3.173 -		00938E2E108A37800009CF19 /* music_flac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_flac.h; path = ../music_flac.h; sourceTree = SOURCE_ROOT; };
   3.174 -		00938E2F108A37800009CF19 /* music_mad.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_mad.c; path = ../music_mad.c; sourceTree = SOURCE_ROOT; };
   3.175 -		00938E30108A37800009CF19 /* music_mad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_mad.h; path = ../music_mad.h; sourceTree = SOURCE_ROOT; };
   3.176 -		00938E31108A37800009CF19 /* music_mikmod.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_mikmod.c; path = ../music_mikmod.c; sourceTree = SOURCE_ROOT; };
   3.177 -		00938E32108A37800009CF19 /* music_mikmod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_mikmod.h; path = ../music_mikmod.h; sourceTree = SOURCE_ROOT; };
   3.178 -		00938E49108A397A0009CF19 /* dynamic_flac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dynamic_flac.c; path = ../dynamic_flac.c; sourceTree = SOURCE_ROOT; };
   3.179 -		00938E4A108A397A0009CF19 /* dynamic_flac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_flac.h; path = ../dynamic_flac.h; sourceTree = SOURCE_ROOT; };
   3.180 -		00938E4B108A397A0009CF19 /* dynamic_mikmod.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dynamic_mikmod.c; path = ../dynamic_mikmod.c; sourceTree = SOURCE_ROOT; };
   3.181 -		00938E4C108A397A0009CF19 /* dynamic_smpeg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_smpeg.h; path = ../dynamic_smpeg.h; sourceTree = SOURCE_ROOT; };
   3.182 -		00938E4D108A397A0009CF19 /* dynamic_ogg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_ogg.h; path = ../dynamic_ogg.h; sourceTree = SOURCE_ROOT; };
   3.183  		0448E8AD108B937A00C9D3EA /* native_midi_macosx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = native_midi_macosx.c; sourceTree = "<group>"; };
   3.184 -		04939B4C17E607F70015E4E3 /* load_mp3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = load_mp3.c; path = ../load_mp3.c; sourceTree = "<group>"; };
   3.185 -		04939B4D17E607F70015E4E3 /* load_mp3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = load_mp3.h; path = ../load_mp3.h; sourceTree = "<group>"; };
   3.186 -		04A8FCA40A19CAEC0046373F /* dynamic_smpeg.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = dynamic_smpeg.c; path = ../dynamic_smpeg.c; sourceTree = SOURCE_ROOT; };
   3.187 -		04A8FCA90A19CB070046373F /* dynamic_ogg.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = dynamic_ogg.c; path = ../dynamic_ogg.c; sourceTree = SOURCE_ROOT; };
   3.188  		1014BAEA010A4B677F000001 /* SDL_mixer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SDL_mixer.h; path = ../SDL_mixer.h; sourceTree = SOURCE_ROOT; };
   3.189 -		5CC1B879012FB8CD7F000001 /* mixer.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = mixer.c; path = ../mixer.c; sourceTree = "<group>"; };
   3.190 -		5CC1B87A012FB8CD7F000001 /* music_cmd.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = music_cmd.c; path = ../music_cmd.c; sourceTree = "<group>"; };
   3.191 -		5CC1B87B012FB8CD7F000001 /* music_cmd.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = music_cmd.h; path = ../music_cmd.h; sourceTree = "<group>"; };
   3.192 -		5CC1B87C012FB8CD7F000001 /* music_ogg.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = music_ogg.c; path = ../music_ogg.c; sourceTree = "<group>"; };
   3.193 -		5CC1B87D012FB8CD7F000001 /* music_ogg.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = music_ogg.h; path = ../music_ogg.h; sourceTree = "<group>"; };
   3.194 -		5CC1B87E012FB8CD7F000001 /* music.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = music.c; path = ../music.c; sourceTree = "<group>"; };
   3.195  		5CC1B880012FB8CD7F000001 /* common.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = common.c; sourceTree = "<group>"; };
   3.196  		5CC1B881012FB8CD7F000001 /* common.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = common.h; sourceTree = "<group>"; };
   3.197  		5CC1B882012FB8CD7F000001 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
   3.198 @@ -230,18 +163,7 @@
   3.199  		5CC1B896012FB8CD7F000001 /* tables.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = tables.h; sourceTree = "<group>"; };
   3.200  		5CC1B897012FB8CD7F000001 /* timidity.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = timidity.c; sourceTree = "<group>"; };
   3.201  		5CC1B898012FB8CD7F000001 /* timidity.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = timidity.h; sourceTree = "<group>"; };
   3.202 -		5CC1B89B012FB8CD7F000001 /* wavestream.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = wavestream.c; path = ../wavestream.c; sourceTree = "<group>"; };
   3.203 -		5CC1B89C012FB8CD7F000001 /* wavestream.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = wavestream.h; path = ../wavestream.h; sourceTree = "<group>"; };
   3.204  		AA60212F1765382200662B9C /* modplug.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = modplug.framework; path = Frameworks/modplug.framework; sourceTree = "<group>"; };
   3.205 -		AA602131176538EB00662B9C /* dynamic_fluidsynth.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dynamic_fluidsynth.c; path = ../dynamic_fluidsynth.c; sourceTree = "<group>"; };
   3.206 -		AA602132176538EB00662B9C /* dynamic_fluidsynth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_fluidsynth.h; path = ../dynamic_fluidsynth.h; sourceTree = "<group>"; };
   3.207 -		AA602133176538EB00662B9C /* dynamic_mikmod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_mikmod.h; path = ../dynamic_mikmod.h; sourceTree = "<group>"; };
   3.208 -		AA602134176538EB00662B9C /* dynamic_modplug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dynamic_modplug.c; path = ../dynamic_modplug.c; sourceTree = "<group>"; };
   3.209 -		AA602135176538EB00662B9C /* dynamic_modplug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dynamic_modplug.h; path = ../dynamic_modplug.h; sourceTree = "<group>"; };
   3.210 -		AA602136176538EB00662B9C /* fluidsynth.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fluidsynth.c; path = ../fluidsynth.c; sourceTree = "<group>"; };
   3.211 -		AA602137176538EB00662B9C /* fluidsynth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fluidsynth.h; path = ../fluidsynth.h; sourceTree = "<group>"; };
   3.212 -		AA602138176538EB00662B9C /* music_modplug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_modplug.c; path = ../music_modplug.c; sourceTree = "<group>"; };
   3.213 -		AA602139176538EB00662B9C /* music_modplug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_modplug.h; path = ../music_modplug.h; sourceTree = "<group>"; };
   3.214  		AA64428E175AA7A500A2125A /* smpeg2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = smpeg2.framework; path = Frameworks/smpeg2.framework; sourceTree = "<group>"; };
   3.215  		AA6442D0175B181300A2125A /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
   3.216  		AA6442D2175B181D00A2125A /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; };
   3.217 @@ -249,22 +171,48 @@
   3.218  		AA9F7DB314B15ADC00278D1E /* Ogg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Ogg.framework; path = Frameworks/Ogg.framework; sourceTree = "<group>"; };
   3.219  		AA9F7DB414B15ADC00278D1E /* Vorbis.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Vorbis.framework; path = Frameworks/Vorbis.framework; sourceTree = "<group>"; };
   3.220  		AA9F7DB714B15AE700278D1E /* FLAC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FLAC.framework; path = Frameworks/FLAC.framework; sourceTree = "<group>"; };
   3.221 -		B2A42D0E03FAC6A400A8000A /* load_ogg.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = load_ogg.c; path = ../load_ogg.c; sourceTree = SOURCE_ROOT; };
   3.222 -		B2A42D0F03FAC6A400A8000A /* load_ogg.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = load_ogg.h; path = ../load_ogg.h; sourceTree = SOURCE_ROOT; };
   3.223 +		AAE405BE1F9607BF00EDAF53 /* load_aiff.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = load_aiff.c; path = ../load_aiff.c; sourceTree = "<group>"; };
   3.224 +		AAE405BF1F9607BF00EDAF53 /* music_fluidsynth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_fluidsynth.h; path = ../music_fluidsynth.h; sourceTree = "<group>"; };
   3.225 +		AAE405C01F9607BF00EDAF53 /* mixer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mixer.h; path = ../mixer.h; sourceTree = "<group>"; };
   3.226 +		AAE405C11F9607C000EDAF53 /* mixer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mixer.c; path = ../mixer.c; sourceTree = "<group>"; };
   3.227 +		AAE405C21F9607C000EDAF53 /* music.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music.h; path = ../music.h; sourceTree = "<group>"; };
   3.228 +		AAE405C31F9607C000EDAF53 /* load_voc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = load_voc.h; path = ../load_voc.h; sourceTree = "<group>"; };
   3.229 +		AAE405C41F9607C000EDAF53 /* music_modplug.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_modplug.c; path = ../music_modplug.c; sourceTree = "<group>"; };
   3.230 +		AAE405C51F9607C000EDAF53 /* music_modplug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_modplug.h; path = ../music_modplug.h; sourceTree = "<group>"; };
   3.231 +		AAE405C61F9607C000EDAF53 /* music_fluidsynth.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_fluidsynth.c; path = ../music_fluidsynth.c; sourceTree = "<group>"; };
   3.232 +		AAE405C71F9607C000EDAF53 /* music_flac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_flac.h; path = ../music_flac.h; sourceTree = "<group>"; };
   3.233 +		AAE405C81F9607C000EDAF53 /* music_wav.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_wav.h; path = ../music_wav.h; sourceTree = "<group>"; };
   3.234 +		AAE405C91F9607C000EDAF53 /* music_wav.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_wav.c; path = ../music_wav.c; sourceTree = "<group>"; };
   3.235 +		AAE405CA1F9607C000EDAF53 /* music_mad.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_mad.c; path = ../music_mad.c; sourceTree = "<group>"; };
   3.236 +		AAE405CB1F9607C000EDAF53 /* music_smpeg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_smpeg.h; path = ../music_smpeg.h; sourceTree = "<group>"; };
   3.237 +		AAE405CC1F9607C000EDAF53 /* load_voc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = load_voc.c; path = ../load_voc.c; sourceTree = "<group>"; };
   3.238 +		AAE405CD1F9607C000EDAF53 /* music.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music.c; path = ../music.c; sourceTree = "<group>"; };
   3.239 +		AAE405CE1F9607C100EDAF53 /* effects_internal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = effects_internal.c; path = ../effects_internal.c; sourceTree = "<group>"; };
   3.240 +		AAE405CF1F9607C100EDAF53 /* music_mikmod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_mikmod.h; path = ../music_mikmod.h; sourceTree = "<group>"; };
   3.241 +		AAE405D01F9607C100EDAF53 /* effect_position.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = effect_position.c; path = ../effect_position.c; sourceTree = "<group>"; };
   3.242 +		AAE405D11F9607C100EDAF53 /* music_ogg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_ogg.h; path = ../music_ogg.h; sourceTree = "<group>"; };
   3.243 +		AAE405D21F9607C100EDAF53 /* load_aiff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = load_aiff.h; path = ../load_aiff.h; sourceTree = "<group>"; };
   3.244 +		AAE405D31F9607C100EDAF53 /* music_mpg123.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_mpg123.h; path = ../music_mpg123.h; sourceTree = "<group>"; };
   3.245 +		AAE405D41F9607C100EDAF53 /* music_flac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_flac.c; path = ../music_flac.c; sourceTree = "<group>"; };
   3.246 +		AAE405D51F9607C100EDAF53 /* music_nativemidi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_nativemidi.c; path = ../music_nativemidi.c; sourceTree = "<group>"; };
   3.247 +		AAE405D61F9607C100EDAF53 /* music_timidity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_timidity.h; path = ../music_timidity.h; sourceTree = "<group>"; };
   3.248 +		AAE405D71F9607C200EDAF53 /* music_timidity.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_timidity.c; path = ../music_timidity.c; sourceTree = "<group>"; };
   3.249 +		AAE405D81F9607C200EDAF53 /* music_mikmod.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_mikmod.c; path = ../music_mikmod.c; sourceTree = "<group>"; };
   3.250 +		AAE405D91F9607C200EDAF53 /* music_ogg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_ogg.c; path = ../music_ogg.c; sourceTree = "<group>"; };
   3.251 +		AAE405DA1F9607C200EDAF53 /* music_nativemidi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_nativemidi.h; path = ../music_nativemidi.h; sourceTree = "<group>"; };
   3.252 +		AAE405DB1F9607C200EDAF53 /* music_cmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_cmd.h; path = ../music_cmd.h; sourceTree = "<group>"; };
   3.253 +		AAE405DC1F9607C200EDAF53 /* music_smpeg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_smpeg.c; path = ../music_smpeg.c; sourceTree = "<group>"; };
   3.254 +		AAE405DD1F9607C300EDAF53 /* music_mad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_mad.h; path = ../music_mad.h; sourceTree = "<group>"; };
   3.255 +		AAE405DE1F9607C300EDAF53 /* music_cmd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_cmd.c; path = ../music_cmd.c; sourceTree = "<group>"; };
   3.256 +		AAE405DF1F9607C300EDAF53 /* music_mpg123.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_mpg123.c; path = ../music_mpg123.c; sourceTree = "<group>"; };
   3.257 +		AAE405E01F9607C300EDAF53 /* effect_stereoreverse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = effect_stereoreverse.c; path = ../effect_stereoreverse.c; sourceTree = "<group>"; };
   3.258 +		AAE405E11F9607C300EDAF53 /* effects_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = effects_internal.h; path = ../effects_internal.h; sourceTree = "<group>"; };
   3.259  		BE1FA8AE07AF95F7004B6283 /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2.framework; path = /Library/Frameworks/SDL2.framework; sourceTree = "<absolute>"; };
   3.260  		BE1FA90507AF96B2004B6283 /* Info-Framework.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-Framework.plist"; sourceTree = "<group>"; };
   3.261  		BE1FA90607AF96B2004B6283 /* SDL2_mixer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SDL2_mixer.framework; sourceTree = BUILT_PRODUCTS_DIR; };
   3.262  		BE1FA95407AF96B2004B6283 /* libSDL2_mixer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSDL2_mixer.a; sourceTree = BUILT_PRODUCTS_DIR; };
   3.263  		BE1FA95807AF96B3004B6283 /* Create DMG */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "Create DMG"; sourceTree = BUILT_PRODUCTS_DIR; };
   3.264  		F51BFB0101F724BE01D3D55B /* native_midi.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = native_midi.h; sourceTree = "<group>"; };
   3.265 -		F567D63B01CD881401F3E8B9 /* effect_position.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = effect_position.c; path = ../effect_position.c; sourceTree = SOURCE_ROOT; };
   3.266 -		F567D63C01CD881401F3E8B9 /* effect_stereoreverse.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = effect_stereoreverse.c; path = ../effect_stereoreverse.c; sourceTree = SOURCE_ROOT; };
   3.267 -		F567D63D01CD881401F3E8B9 /* effects_internal.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = effects_internal.c; path = ../effects_internal.c; sourceTree = SOURCE_ROOT; };
   3.268 -		F567D63E01CD881401F3E8B9 /* effects_internal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = effects_internal.h; path = ../effects_internal.h; sourceTree = SOURCE_ROOT; };
   3.269 -		F567D64701CD88A701F3E8B9 /* load_aiff.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = load_aiff.c; path = ../load_aiff.c; sourceTree = SOURCE_ROOT; };
   3.270 -		F567D64801CD88A701F3E8B9 /* load_aiff.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = load_aiff.h; path = ../load_aiff.h; sourceTree = SOURCE_ROOT; };
   3.271 -		F567D64901CD88A701F3E8B9 /* load_voc.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = load_voc.c; path = ../load_voc.c; sourceTree = SOURCE_ROOT; };
   3.272 -		F567D64A01CD88A701F3E8B9 /* load_voc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = load_voc.h; path = ../load_voc.h; sourceTree = SOURCE_ROOT; };
   3.273  		F59C710300D5CB5801000001 /* ReadMe.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ReadMe.txt; sourceTree = "<group>"; };
   3.274  		F59C710400D5CB5801000001 /* Welcome.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = Welcome.txt; sourceTree = "<group>"; };
   3.275  		F59C710600D5CB5801000001 /* SDL_mixer.info */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SDL_mixer.info; sourceTree = "<group>"; };
   3.276 @@ -336,50 +284,42 @@
   3.277  			children = (
   3.278  				F51BFAFD01F724BE01D3D55B /* native_midi */,
   3.279  				5CC1B87F012FB8CD7F000001 /* timidity */,
   3.280 -				00938E49108A397A0009CF19 /* dynamic_flac.c */,
   3.281 -				00938E4A108A397A0009CF19 /* dynamic_flac.h */,
   3.282 -				AA602131176538EB00662B9C /* dynamic_fluidsynth.c */,
   3.283 -				AA602132176538EB00662B9C /* dynamic_fluidsynth.h */,
   3.284 -				00938E4B108A397A0009CF19 /* dynamic_mikmod.c */,
   3.285 -				AA602133176538EB00662B9C /* dynamic_mikmod.h */,
   3.286 -				AA602134176538EB00662B9C /* dynamic_modplug.c */,
   3.287 -				AA602135176538EB00662B9C /* dynamic_modplug.h */,
   3.288 -				04A8FCA40A19CAEC0046373F /* dynamic_smpeg.c */,
   3.289 -				00938E4C108A397A0009CF19 /* dynamic_smpeg.h */,
   3.290 -				04A8FCA90A19CB070046373F /* dynamic_ogg.c */,
   3.291 -				00938E4D108A397A0009CF19 /* dynamic_ogg.h */,
   3.292 -				F567D63B01CD881401F3E8B9 /* effect_position.c */,
   3.293 -				F567D63C01CD881401F3E8B9 /* effect_stereoreverse.c */,
   3.294 -				F567D63D01CD881401F3E8B9 /* effects_internal.c */,
   3.295 -				F567D63E01CD881401F3E8B9 /* effects_internal.h */,
   3.296 -				AA602136176538EB00662B9C /* fluidsynth.c */,
   3.297 -				AA602137176538EB00662B9C /* fluidsynth.h */,
   3.298 -				F567D64701CD88A701F3E8B9 /* load_aiff.c */,
   3.299 -				F567D64801CD88A701F3E8B9 /* load_aiff.h */,
   3.300 -				00938E2B108A37800009CF19 /* load_flac.c */,
   3.301 -				00938E2C108A37800009CF19 /* load_flac.h */,
   3.302 -				04939B4C17E607F70015E4E3 /* load_mp3.c */,
   3.303 -				04939B4D17E607F70015E4E3 /* load_mp3.h */,
   3.304 -				B2A42D0E03FAC6A400A8000A /* load_ogg.c */,
   3.305 -				B2A42D0F03FAC6A400A8000A /* load_ogg.h */,
   3.306 -				F567D64901CD88A701F3E8B9 /* load_voc.c */,
   3.307 -				F567D64A01CD88A701F3E8B9 /* load_voc.h */,
   3.308 -				5CC1B879012FB8CD7F000001 /* mixer.c */,
   3.309 -				5CC1B87E012FB8CD7F000001 /* music.c */,
   3.310 -				5CC1B87A012FB8CD7F000001 /* music_cmd.c */,
   3.311 -				5CC1B87B012FB8CD7F000001 /* music_cmd.h */,
   3.312 -				00938E2D108A37800009CF19 /* music_flac.c */,
   3.313 -				00938E2E108A37800009CF19 /* music_flac.h */,
   3.314 -				00938E2F108A37800009CF19 /* music_mad.c */,
   3.315 -				00938E30108A37800009CF19 /* music_mad.h */,
   3.316 -				00938E31108A37800009CF19 /* music_mikmod.c */,
   3.317 -				00938E32108A37800009CF19 /* music_mikmod.h */,
   3.318 -				AA602138176538EB00662B9C /* music_modplug.c */,
   3.319 -				AA602139176538EB00662B9C /* music_modplug.h */,
   3.320 -				5CC1B87C012FB8CD7F000001 /* music_ogg.c */,
   3.321 -				5CC1B87D012FB8CD7F000001 /* music_ogg.h */,
   3.322 -				5CC1B89B012FB8CD7F000001 /* wavestream.c */,
   3.323 -				5CC1B89C012FB8CD7F000001 /* wavestream.h */,
   3.324 +				AAE405D01F9607C100EDAF53 /* effect_position.c */,
   3.325 +				AAE405E01F9607C300EDAF53 /* effect_stereoreverse.c */,
   3.326 +				AAE405CE1F9607C100EDAF53 /* effects_internal.c */,
   3.327 +				AAE405E11F9607C300EDAF53 /* effects_internal.h */,
   3.328 +				AAE405BE1F9607BF00EDAF53 /* load_aiff.c */,
   3.329 +				AAE405D21F9607C100EDAF53 /* load_aiff.h */,
   3.330 +				AAE405CC1F9607C000EDAF53 /* load_voc.c */,
   3.331 +				AAE405C31F9607C000EDAF53 /* load_voc.h */,
   3.332 +				AAE405C11F9607C000EDAF53 /* mixer.c */,
   3.333 +				AAE405C01F9607BF00EDAF53 /* mixer.h */,
   3.334 +				AAE405DE1F9607C300EDAF53 /* music_cmd.c */,
   3.335 +				AAE405DB1F9607C200EDAF53 /* music_cmd.h */,
   3.336 +				AAE405D41F9607C100EDAF53 /* music_flac.c */,
   3.337 +				AAE405C71F9607C000EDAF53 /* music_flac.h */,
   3.338 +				AAE405C61F9607C000EDAF53 /* music_fluidsynth.c */,
   3.339 +				AAE405BF1F9607BF00EDAF53 /* music_fluidsynth.h */,
   3.340 +				AAE405CA1F9607C000EDAF53 /* music_mad.c */,
   3.341 +				AAE405DD1F9607C300EDAF53 /* music_mad.h */,
   3.342 +				AAE405D81F9607C200EDAF53 /* music_mikmod.c */,
   3.343 +				AAE405CF1F9607C100EDAF53 /* music_mikmod.h */,
   3.344 +				AAE405C41F9607C000EDAF53 /* music_modplug.c */,
   3.345 +				AAE405C51F9607C000EDAF53 /* music_modplug.h */,
   3.346 +				AAE405DF1F9607C300EDAF53 /* music_mpg123.c */,
   3.347 +				AAE405D31F9607C100EDAF53 /* music_mpg123.h */,
   3.348 +				AAE405D51F9607C100EDAF53 /* music_nativemidi.c */,
   3.349 +				AAE405DA1F9607C200EDAF53 /* music_nativemidi.h */,
   3.350 +				AAE405D91F9607C200EDAF53 /* music_ogg.c */,
   3.351 +				AAE405D11F9607C100EDAF53 /* music_ogg.h */,
   3.352 +				AAE405DC1F9607C200EDAF53 /* music_smpeg.c */,
   3.353 +				AAE405CB1F9607C000EDAF53 /* music_smpeg.h */,
   3.354 +				AAE405D71F9607C200EDAF53 /* music_timidity.c */,
   3.355 +				AAE405D61F9607C100EDAF53 /* music_timidity.h */,
   3.356 +				AAE405C91F9607C000EDAF53 /* music_wav.c */,
   3.357 +				AAE405C81F9607C000EDAF53 /* music_wav.h */,
   3.358 +				AAE405CD1F9607C000EDAF53 /* music.c */,
   3.359 +				AAE405C21F9607C000EDAF53 /* music.h */,
   3.360  			);
   3.361  			name = "Library Source";
   3.362  			sourceTree = "<group>";
   3.363 @@ -476,39 +416,36 @@
   3.364  			isa = PBXHeadersBuildPhase;
   3.365  			buildActionMask = 2147483647;
   3.366  			files = (
   3.367 -				BE1FA8B907AF96B2004B6283 /* music_cmd.h in Headers */,
   3.368 -				BE1FA8BA07AF96B2004B6283 /* music_ogg.h in Headers */,
   3.369 +				AAE405E31F9607C300EDAF53 /* music_fluidsynth.h in Headers */,
   3.370 +				AAE405EF1F9607C300EDAF53 /* music_smpeg.h in Headers */,
   3.371  				BE1FA8BB07AF96B2004B6283 /* common.h in Headers */,
   3.372  				BE1FA8BC07AF96B2004B6283 /* config.h in Headers */,
   3.373  				BE1FA8BD07AF96B2004B6283 /* ctrlmode.h in Headers */,
   3.374 +				AAE405F31F9607C300EDAF53 /* music_mikmod.h in Headers */,
   3.375 +				AAE405F61F9607C300EDAF53 /* load_aiff.h in Headers */,
   3.376 +				AAE405E71F9607C300EDAF53 /* load_voc.h in Headers */,
   3.377  				BE1FA8BE07AF96B2004B6283 /* filter.h in Headers */,
   3.378  				BE1FA8BF07AF96B2004B6283 /* instrum.h in Headers */,
   3.379 +				AAE405EC1F9607C300EDAF53 /* music_wav.h in Headers */,
   3.380 +				AAE406011F9607C300EDAF53 /* music_mad.h in Headers */,
   3.381 +				AAE405E91F9607C300EDAF53 /* music_modplug.h in Headers */,
   3.382 +				AAE405FE1F9607C300EDAF53 /* music_nativemidi.h in Headers */,
   3.383  				BE1FA8C007AF96B2004B6283 /* mix.h in Headers */,
   3.384  				BE1FA8C107AF96B2004B6283 /* output.h in Headers */,
   3.385  				BE1FA8C207AF96B2004B6283 /* playmidi.h in Headers */,
   3.386 +				AAE405E41F9607C300EDAF53 /* mixer.h in Headers */,
   3.387 +				AAE405FF1F9607C300EDAF53 /* music_cmd.h in Headers */,
   3.388 +				AAE405EB1F9607C300EDAF53 /* music_flac.h in Headers */,
   3.389 +				AAE406051F9607C300EDAF53 /* effects_internal.h in Headers */,
   3.390 +				AAE405FA1F9607C300EDAF53 /* music_timidity.h in Headers */,
   3.391  				BE1FA8C307AF96B2004B6283 /* readmidi.h in Headers */,
   3.392  				BE1FA8C407AF96B2004B6283 /* resample.h in Headers */,
   3.393  				BE1FA8C507AF96B2004B6283 /* tables.h in Headers */,
   3.394 +				AAE405F71F9607C300EDAF53 /* music_mpg123.h in Headers */,
   3.395  				BE1FA8C607AF96B2004B6283 /* timidity.h in Headers */,
   3.396 -				BE1FA8C707AF96B2004B6283 /* wavestream.h in Headers */,
   3.397 -				BE1FA8C807AF96B2004B6283 /* effects_internal.h in Headers */,
   3.398 -				BE1FA8C907AF96B2004B6283 /* load_aiff.h in Headers */,
   3.399 -				BE1FA8CA07AF96B2004B6283 /* load_voc.h in Headers */,
   3.400 +				AAE405E61F9607C300EDAF53 /* music.h in Headers */,
   3.401  				BE1FA8CD07AF96B2004B6283 /* SDL_mixer.h in Headers */,
   3.402 -				BE1FA8CE07AF96B2004B6283 /* load_ogg.h in Headers */,
   3.403 -				00938E34108A37800009CF19 /* load_flac.h in Headers */,
   3.404 -				00938E36108A37800009CF19 /* music_flac.h in Headers */,
   3.405 -				00938E38108A37800009CF19 /* music_mad.h in Headers */,
   3.406 -				00938E3A108A37800009CF19 /* music_mikmod.h in Headers */,
   3.407 -				00938E4F108A397A0009CF19 /* dynamic_flac.h in Headers */,
   3.408 -				00938E51108A397A0009CF19 /* dynamic_smpeg.h in Headers */,
   3.409 -				00938E52108A397A0009CF19 /* dynamic_ogg.h in Headers */,
   3.410 -				AA60213C176538EB00662B9C /* dynamic_fluidsynth.h in Headers */,
   3.411 -				AA60213E176538EB00662B9C /* dynamic_mikmod.h in Headers */,
   3.412 -				AA602142176538EB00662B9C /* dynamic_modplug.h in Headers */,
   3.413 -				AA602146176538EB00662B9C /* fluidsynth.h in Headers */,
   3.414 -				AA60214A176538EB00662B9C /* music_modplug.h in Headers */,
   3.415 -				04939B5017E607F70015E4E3 /* load_mp3.h in Headers */,
   3.416 +				AAE405F51F9607C300EDAF53 /* music_ogg.h in Headers */,
   3.417  			);
   3.418  			runOnlyForDeploymentPostprocessing = 0;
   3.419  		};
   3.420 @@ -516,8 +453,6 @@
   3.421  			isa = PBXHeadersBuildPhase;
   3.422  			buildActionMask = 2147483647;
   3.423  			files = (
   3.424 -				BE1FA90C07AF96B2004B6283 /* music_cmd.h in Headers */,
   3.425 -				BE1FA90D07AF96B2004B6283 /* music_ogg.h in Headers */,
   3.426  				BE1FA90E07AF96B2004B6283 /* common.h in Headers */,
   3.427  				BE1FA90F07AF96B2004B6283 /* config.h in Headers */,
   3.428  				BE1FA91007AF96B2004B6283 /* ctrlmode.h in Headers */,
   3.429 @@ -530,20 +465,6 @@
   3.430  				BE1FA91707AF96B2004B6283 /* resample.h in Headers */,
   3.431  				BE1FA91807AF96B2004B6283 /* tables.h in Headers */,
   3.432  				BE1FA91907AF96B2004B6283 /* timidity.h in Headers */,
   3.433 -				BE1FA91A07AF96B2004B6283 /* wavestream.h in Headers */,
   3.434 -				BE1FA91B07AF96B2004B6283 /* effects_internal.h in Headers */,
   3.435 -				BE1FA91C07AF96B2004B6283 /* load_aiff.h in Headers */,
   3.436 -				BE1FA91D07AF96B2004B6283 /* load_voc.h in Headers */,
   3.437 -				BE1FA91E07AF96B2004B6283 /* load_ogg.h in Headers */,
   3.438 -				00938E54108A397A0009CF19 /* dynamic_flac.h in Headers */,
   3.439 -				00938E56108A397A0009CF19 /* dynamic_smpeg.h in Headers */,
   3.440 -				00938E57108A397A0009CF19 /* dynamic_ogg.h in Headers */,
   3.441 -				AA60213D176538EB00662B9C /* dynamic_fluidsynth.h in Headers */,
   3.442 -				AA60213F176538EB00662B9C /* dynamic_mikmod.h in Headers */,
   3.443 -				AA602143176538EB00662B9C /* dynamic_modplug.h in Headers */,
   3.444 -				AA602147176538EB00662B9C /* fluidsynth.h in Headers */,
   3.445 -				AA60214B176538EB00662B9C /* music_modplug.h in Headers */,
   3.446 -				04939B5117E607F70015E4E3 /* load_mp3.h in Headers */,
   3.447  			);
   3.448  			runOnlyForDeploymentPostprocessing = 0;
   3.449  		};
   3.450 @@ -616,7 +537,7 @@
   3.451  		0867D690FE84028FC02AAC07 /* Project object */ = {
   3.452  			isa = PBXProject;
   3.453  			attributes = {
   3.454 -				LastUpgradeCheck = 0630;
   3.455 +				LastUpgradeCheck = 0900;
   3.456  			};
   3.457  			buildConfigurationList = 00B7E497097EC6B300826121 /* Build configuration list for PBXProject "SDL_mixer" */;
   3.458  			compatibilityVersion = "Xcode 3.2";
   3.459 @@ -709,44 +630,39 @@
   3.460  			isa = PBXSourcesBuildPhase;
   3.461  			buildActionMask = 2147483647;
   3.462  			files = (
   3.463 -				BE1FA8E707AF96B2004B6283 /* mixer.c in Sources */,
   3.464 -				BE1FA8E807AF96B2004B6283 /* music_cmd.c in Sources */,
   3.465 -				BE1FA8E907AF96B2004B6283 /* music_ogg.c in Sources */,
   3.466 -				BE1FA8EA07AF96B2004B6283 /* music.c in Sources */,
   3.467  				BE1FA8EB07AF96B2004B6283 /* common.c in Sources */,
   3.468  				BE1FA8EC07AF96B2004B6283 /* ctrlmode.c in Sources */,
   3.469  				BE1FA8ED07AF96B2004B6283 /* filter.c in Sources */,
   3.470 +				AAE405E21F9607C300EDAF53 /* load_aiff.c in Sources */,
   3.471 +				AAE406001F9607C300EDAF53 /* music_smpeg.c in Sources */,
   3.472  				BE1FA8EE07AF96B2004B6283 /* instrum.c in Sources */,
   3.473  				BE1FA8EF07AF96B2004B6283 /* mix.c in Sources */,
   3.474 +				AAE405F01F9607C300EDAF53 /* load_voc.c in Sources */,
   3.475  				BE1FA8F007AF96B2004B6283 /* output.c in Sources */,
   3.476 +				AAE405FC1F9607C300EDAF53 /* music_mikmod.c in Sources */,
   3.477  				BE1FA8F107AF96B2004B6283 /* playmidi.c in Sources */,
   3.478  				BE1FA8F207AF96B2004B6283 /* readmidi.c in Sources */,
   3.479 +				AAE405EA1F9607C300EDAF53 /* music_fluidsynth.c in Sources */,
   3.480 +				AAE405FD1F9607C300EDAF53 /* music_ogg.c in Sources */,
   3.481 +				AAE405F41F9607C300EDAF53 /* effect_position.c in Sources */,
   3.482 +				AAE405F81F9607C300EDAF53 /* music_flac.c in Sources */,
   3.483  				BE1FA8F307AF96B2004B6283 /* resample.c in Sources */,
   3.484 +				AAE405F21F9607C300EDAF53 /* effects_internal.c in Sources */,
   3.485 +				AAE406021F9607C300EDAF53 /* music_cmd.c in Sources */,
   3.486  				BE1FA8F407AF96B2004B6283 /* sdl_a.c in Sources */,
   3.487  				BE1FA8F507AF96B2004B6283 /* sdl_c.c in Sources */,
   3.488  				BE1FA8F607AF96B2004B6283 /* tables.c in Sources */,
   3.489 +				AAE405FB1F9607C300EDAF53 /* music_timidity.c in Sources */,
   3.490 +				AAE405F11F9607C300EDAF53 /* music.c in Sources */,
   3.491 +				AAE405F91F9607C300EDAF53 /* music_nativemidi.c in Sources */,
   3.492 +				AAE406031F9607C300EDAF53 /* music_mpg123.c in Sources */,
   3.493 +				AAE406041F9607C300EDAF53 /* effect_stereoreverse.c in Sources */,
   3.494 +				AAE405EE1F9607C300EDAF53 /* music_mad.c in Sources */,
   3.495 +				AAE405ED1F9607C300EDAF53 /* music_wav.c in Sources */,
   3.496 +				AAE405E81F9607C300EDAF53 /* music_modplug.c in Sources */,
   3.497 +				AAE405E51F9607C300EDAF53 /* mixer.c in Sources */,
   3.498  				BE1FA8F707AF96B2004B6283 /* timidity.c in Sources */,
   3.499 -				BE1FA8F807AF96B2004B6283 /* wavestream.c in Sources */,
   3.500 -				BE1FA8F907AF96B2004B6283 /* effect_position.c in Sources */,
   3.501 -				BE1FA8FA07AF96B2004B6283 /* effect_stereoreverse.c in Sources */,
   3.502 -				BE1FA8FB07AF96B2004B6283 /* effects_internal.c in Sources */,
   3.503 -				BE1FA8FC07AF96B2004B6283 /* load_aiff.c in Sources */,
   3.504 -				BE1FA8FD07AF96B2004B6283 /* load_voc.c in Sources */,
   3.505 -				BE1FA90007AF96B2004B6283 /* load_ogg.c in Sources */,
   3.506 -				04A8FCA70A19CAEC0046373F /* dynamic_smpeg.c in Sources */,
   3.507 -				04A8FCAC0A19CB070046373F /* dynamic_ogg.c in Sources */,
   3.508 -				00938E33108A37800009CF19 /* load_flac.c in Sources */,
   3.509 -				00938E35108A37800009CF19 /* music_flac.c in Sources */,
   3.510 -				00938E37108A37800009CF19 /* music_mad.c in Sources */,
   3.511 -				00938E39108A37800009CF19 /* music_mikmod.c in Sources */,
   3.512 -				00938E4E108A397A0009CF19 /* dynamic_flac.c in Sources */,
   3.513 -				00938E50108A397A0009CF19 /* dynamic_mikmod.c in Sources */,
   3.514  				0448E8AE108B937A00C9D3EA /* native_midi_macosx.c in Sources */,
   3.515 -				AA60213A176538EB00662B9C /* dynamic_fluidsynth.c in Sources */,
   3.516 -				AA602140176538EB00662B9C /* dynamic_modplug.c in Sources */,
   3.517 -				AA602144176538EB00662B9C /* fluidsynth.c in Sources */,
   3.518 -				AA602148176538EB00662B9C /* music_modplug.c in Sources */,
   3.519 -				04939B4E17E607F70015E4E3 /* load_mp3.c in Sources */,
   3.520  			);
   3.521  			runOnlyForDeploymentPostprocessing = 0;
   3.522  		};
   3.523 @@ -754,10 +670,6 @@
   3.524  			isa = PBXSourcesBuildPhase;
   3.525  			buildActionMask = 2147483647;
   3.526  			files = (
   3.527 -				BE1FA93807AF96B2004B6283 /* mixer.c in Sources */,
   3.528 -				BE1FA93907AF96B2004B6283 /* music_cmd.c in Sources */,
   3.529 -				BE1FA93A07AF96B2004B6283 /* music_ogg.c in Sources */,
   3.530 -				BE1FA93B07AF96B2004B6283 /* music.c in Sources */,
   3.531  				BE1FA93C07AF96B2004B6283 /* common.c in Sources */,
   3.532  				BE1FA93D07AF96B2004B6283 /* ctrlmode.c in Sources */,
   3.533  				BE1FA93E07AF96B2004B6283 /* filter.c in Sources */,
   3.534 @@ -771,23 +683,7 @@
   3.535  				BE1FA94607AF96B2004B6283 /* sdl_c.c in Sources */,
   3.536  				BE1FA94707AF96B2004B6283 /* tables.c in Sources */,
   3.537  				BE1FA94807AF96B2004B6283 /* timidity.c in Sources */,
   3.538 -				BE1FA94907AF96B2004B6283 /* wavestream.c in Sources */,
   3.539 -				BE1FA94A07AF96B2004B6283 /* effect_position.c in Sources */,
   3.540 -				BE1FA94B07AF96B2004B6283 /* effect_stereoreverse.c in Sources */,
   3.541 -				BE1FA94C07AF96B2004B6283 /* effects_internal.c in Sources */,
   3.542 -				BE1FA94D07AF96B2004B6283 /* load_aiff.c in Sources */,
   3.543 -				BE1FA94E07AF96B2004B6283 /* load_voc.c in Sources */,
   3.544 -				BE1FA94F07AF96B2004B6283 /* load_ogg.c in Sources */,
   3.545 -				04A8FCA60A19CAEC0046373F /* dynamic_smpeg.c in Sources */,
   3.546 -				04A8FCAB0A19CB070046373F /* dynamic_ogg.c in Sources */,
   3.547 -				00938E53108A397A0009CF19 /* dynamic_flac.c in Sources */,
   3.548 -				00938E55108A397A0009CF19 /* dynamic_mikmod.c in Sources */,
   3.549  				0448E8AF108B937A00C9D3EA /* native_midi_macosx.c in Sources */,
   3.550 -				AA60213B176538EB00662B9C /* dynamic_fluidsynth.c in Sources */,
   3.551 -				AA602141176538EB00662B9C /* dynamic_modplug.c in Sources */,
   3.552 -				AA602145176538EB00662B9C /* fluidsynth.c in Sources */,
   3.553 -				AA602149176538EB00662B9C /* music_modplug.c in Sources */,
   3.554 -				04939B4F17E607F70015E4E3 /* load_mp3.c in Sources */,
   3.555  			);
   3.556  			runOnlyForDeploymentPostprocessing = 0;
   3.557  		};
   3.558 @@ -805,7 +701,6 @@
   3.559  		00B7E48C097EC6B300826121 /* Release */ = {
   3.560  			isa = XCBuildConfiguration;
   3.561  			buildSettings = {
   3.562 -				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
   3.563  				COMBINE_HIDPI_IMAGES = YES;
   3.564  				DYLIB_COMPATIBILITY_VERSION = 1;
   3.565  				DYLIB_CURRENT_VERSION = 1.1.0;
   3.566 @@ -839,6 +734,7 @@
   3.567  					"-weak_framework",
   3.568  					Vorbis,
   3.569  				);
   3.570 +				PRODUCT_BUNDLE_IDENTIFIER = "org.libsdl.SDL2-mixer";
   3.571  				WRAPPER_EXTENSION = framework;
   3.572  			};
   3.573  			name = Release;
   3.574 @@ -846,7 +742,6 @@
   3.575  		00B7E48D097EC6B300826121 /* Debug */ = {
   3.576  			isa = XCBuildConfiguration;
   3.577  			buildSettings = {
   3.578 -				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
   3.579  				COMBINE_HIDPI_IMAGES = YES;
   3.580  				DYLIB_COMPATIBILITY_VERSION = 1;
   3.581  				DYLIB_CURRENT_VERSION = 1.1.0;
   3.582 @@ -880,6 +775,7 @@
   3.583  					"-weak_framework",
   3.584  					Vorbis,
   3.585  				);
   3.586 +				PRODUCT_BUNDLE_IDENTIFIER = "org.libsdl.SDL2-mixer";
   3.587  				WRAPPER_EXTENSION = framework;
   3.588  			};
   3.589  			name = Debug;
   3.590 @@ -969,7 +865,23 @@
   3.591  		00B7E498097EC6B300826121 /* Release */ = {
   3.592  			isa = XCBuildConfiguration;
   3.593  			buildSettings = {
   3.594 +				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
   3.595 +				CLANG_WARN_BOOL_CONVERSION = YES;
   3.596 +				CLANG_WARN_COMMA = YES;
   3.597 +				CLANG_WARN_CONSTANT_CONVERSION = YES;
   3.598 +				CLANG_WARN_EMPTY_BODY = YES;
   3.599 +				CLANG_WARN_ENUM_CONVERSION = YES;
   3.600 +				CLANG_WARN_INFINITE_RECURSION = YES;
   3.601 +				CLANG_WARN_INT_CONVERSION = YES;
   3.602 +				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
   3.603 +				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
   3.604 +				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
   3.605 +				CLANG_WARN_STRICT_PROTOTYPES = YES;
   3.606 +				CLANG_WARN_SUSPICIOUS_MOVE = YES;
   3.607 +				CLANG_WARN_UNREACHABLE_CODE = YES;
   3.608 +				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
   3.609  				DEPLOYMENT_POSTPROCESSING = YES;
   3.610 +				ENABLE_STRICT_OBJC_MSGSEND = YES;
   3.611  				FRAMEWORK_SEARCH_PATHS = (
   3.612  					"$(FRAMEWORK_SEARCH_PATHS_QUOTED)",
   3.613  					"$(HOME)/Library/Frameworks",
   3.614 @@ -977,6 +889,7 @@
   3.615  				);
   3.616  				FRAMEWORK_SEARCH_PATHS_QUOTED = "\"$(SRCROOT)/Frameworks\"";
   3.617  				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
   3.618 +				GCC_NO_COMMON_BLOCKS = YES;
   3.619  				GCC_PREPROCESSOR_DEFINITIONS = (
   3.620  					MUSIC_CMD,
   3.621  					MUSIC_WAV,
   3.622 @@ -988,13 +901,19 @@
   3.623  					MUSIC_FLAC,
   3.624  				);
   3.625  				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
   3.626 +				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
   3.627 +				GCC_WARN_ABOUT_RETURN_TYPE = YES;
   3.628 +				GCC_WARN_UNDECLARED_SELECTOR = YES;
   3.629 +				GCC_WARN_UNINITIALIZED_AUTOS = YES;
   3.630 +				GCC_WARN_UNUSED_FUNCTION = YES;
   3.631 +				GCC_WARN_UNUSED_VARIABLE = YES;
   3.632  				HEADER_SEARCH_PATHS = (
   3.633  					"$(HEADER_SEARCH_PATHS_QUOTED)",
   3.634  					"$(HOME)/Library/Frameworks/SDL2.framework/Headers",
   3.635  					/Library/Frameworks/SDL2.framework/Headers,
   3.636  				);
   3.637  				HEADER_SEARCH_PATHS_QUOTED = "\"$(SRCROOT)/Frameworks/modplug.framework/Headers\" \"$(SRCROOT)/Frameworks/Ogg.framework/Headers\" \"$(SRCROOT)/Frameworks/Vorbis.framework/Headers\" \"$(SRCROOT)/Frameworks/FLAC.framework/Headers\" \"$(SRCROOT)/Frameworks/smpeg2.framework/Headers\"";
   3.638 -				MACOSX_DEPLOYMENT_TARGET = 10.5;
   3.639 +				MACOSX_DEPLOYMENT_TARGET = 10.6;
   3.640  				PRODUCT_NAME = SDL2_mixer;
   3.641  				SDKROOT = macosx;
   3.642  				SEPARATE_STRIP = YES;
   3.643 @@ -1005,12 +924,30 @@
   3.644  		00B7E499097EC6B300826121 /* Debug */ = {
   3.645  			isa = XCBuildConfiguration;
   3.646  			buildSettings = {
   3.647 +				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
   3.648 +				CLANG_WARN_BOOL_CONVERSION = YES;
   3.649 +				CLANG_WARN_COMMA = YES;
   3.650 +				CLANG_WARN_CONSTANT_CONVERSION = YES;
   3.651 +				CLANG_WARN_EMPTY_BODY = YES;
   3.652 +				CLANG_WARN_ENUM_CONVERSION = YES;
   3.653 +				CLANG_WARN_INFINITE_RECURSION = YES;
   3.654 +				CLANG_WARN_INT_CONVERSION = YES;
   3.655 +				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
   3.656 +				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
   3.657 +				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
   3.658 +				CLANG_WARN_STRICT_PROTOTYPES = YES;
   3.659 +				CLANG_WARN_SUSPICIOUS_MOVE = YES;
   3.660 +				CLANG_WARN_UNREACHABLE_CODE = YES;
   3.661 +				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
   3.662 +				ENABLE_STRICT_OBJC_MSGSEND = YES;
   3.663 +				ENABLE_TESTABILITY = YES;
   3.664  				FRAMEWORK_SEARCH_PATHS = (
   3.665  					"$(FRAMEWORK_SEARCH_PATHS_QUOTED)",
   3.666  					"$(HOME)/Library/Frameworks",
   3.667  					/Library/Frameworks,
   3.668  				);
   3.669  				FRAMEWORK_SEARCH_PATHS_QUOTED = "\"$(SRCROOT)/Frameworks\"";
   3.670 +				GCC_NO_COMMON_BLOCKS = YES;
   3.671  				GCC_OPTIMIZATION_LEVEL = 0;
   3.672  				GCC_PREPROCESSOR_DEFINITIONS = (
   3.673  					MUSIC_CMD,
   3.674 @@ -1023,13 +960,19 @@
   3.675  					MUSIC_FLAC,
   3.676  				);
   3.677  				GCC_SYMBOLS_PRIVATE_EXTERN = YES;
   3.678 +				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
   3.679 +				GCC_WARN_ABOUT_RETURN_TYPE = YES;
   3.680 +				GCC_WARN_UNDECLARED_SELECTOR = YES;
   3.681 +				GCC_WARN_UNINITIALIZED_AUTOS = YES;
   3.682 +				GCC_WARN_UNUSED_FUNCTION = YES;
   3.683 +				GCC_WARN_UNUSED_VARIABLE = YES;
   3.684  				HEADER_SEARCH_PATHS = (
   3.685  					"$(HEADER_SEARCH_PATHS_QUOTED)",
   3.686  					"$(HOME)/Library/Frameworks/SDL2.framework/Headers",
   3.687  					/Library/Frameworks/SDL2.framework/Headers,
   3.688  				);
   3.689  				HEADER_SEARCH_PATHS_QUOTED = "\"$(SRCROOT)/Frameworks/modplug.framework/Headers\" \"$(SRCROOT)/Frameworks/Ogg.framework/Headers\" \"$(SRCROOT)/Frameworks/Vorbis.framework/Headers\" \"$(SRCROOT)/Frameworks/FLAC.framework/Headers\" \"$(SRCROOT)/Frameworks/smpeg2.framework/Headers\"";
   3.690 -				MACOSX_DEPLOYMENT_TARGET = 10.5;
   3.691 +				MACOSX_DEPLOYMENT_TARGET = 10.6;
   3.692  				ONLY_ACTIVE_ARCH = YES;
   3.693  				PRODUCT_NAME = SDL2_mixer;
   3.694  				SDKROOT = macosx;
     4.1 --- a/effect_stereoreverse.c	Tue Oct 17 02:39:45 2017 -0700
     4.2 +++ b/effect_stereoreverse.c	Tue Oct 17 02:54:52 2017 -0700
     4.3 @@ -112,7 +112,7 @@
     4.4  
     4.5      if (channels == 2) {
     4.6  		int bits = (format & 0xFF);
     4.7 -		switch (format & 0xFF) {
     4.8 +		switch (bits) {
     4.9  		case 8:
    4.10              f = _Eff_reversestereo8;
    4.11  			break;
     5.1 --- a/music.c	Tue Oct 17 02:39:45 2017 -0700
     5.2 +++ b/music.c	Tue Oct 17 02:54:52 2017 -0700
     5.3 @@ -149,7 +149,7 @@
     5.4  static void music_internal_volume(int volume);
     5.5  static int  music_internal_play(Mix_Music *music, double position);
     5.6  static int  music_internal_position(double position);
     5.7 -static SDL_bool music_internal_playing();
     5.8 +static SDL_bool music_internal_playing(void);
     5.9  static void music_internal_halt(void);
    5.10  
    5.11  
    5.12 @@ -370,7 +370,7 @@
    5.13  
    5.14  static Mix_MusicType detect_music_type(SDL_RWops *src)
    5.15  {
    5.16 -    char magic[12];
    5.17 +    Uint8 magic[12];
    5.18  
    5.19      if (SDL_RWread(src, magic, 1, 12) != 12) {
    5.20          Mix_SetError("Couldn't read first 12 bytes of audio data");
    5.21 @@ -859,7 +859,7 @@
    5.22  }
    5.23  
    5.24  /* Check the status of the music */
    5.25 -static SDL_bool music_internal_playing()
    5.26 +static SDL_bool music_internal_playing(void)
    5.27  {
    5.28      if (music_playing == NULL) {
    5.29          return SDL_FALSE;
     6.1 --- a/music_cmd.c	Tue Oct 17 02:39:45 2017 -0700
     6.2 +++ b/music_cmd.c	Tue Oct 17 02:54:52 2017 -0700
     6.3 @@ -163,7 +163,6 @@
     6.4  
     6.5      /* Child process - executes here */
     6.6      case 0: {
     6.7 -        char *command;
     6.8          char **argv;
     6.9  
    6.10          /* Unblock signals in case we're called from a thread */
    6.11 @@ -242,12 +241,11 @@
    6.12  }
    6.13  
    6.14  /* Close the given music stream */
    6.15 -int MusicCMD_Delete(void *context)
    6.16 +void MusicCMD_Delete(void *context)
    6.17  {
    6.18      MusicCMD *music = (MusicCMD *)context;
    6.19      SDL_free(music->file);
    6.20      SDL_free(music);
    6.21 -    return 0;
    6.22  }
    6.23  
    6.24  Mix_MusicInterface Mix_MusicInterface_CMD =
     7.1 --- a/music_ogg.c	Tue Oct 17 02:39:45 2017 -0700
     7.2 +++ b/music_ogg.c	Tue Oct 17 02:54:52 2017 -0700
     7.3 @@ -264,7 +264,7 @@
     7.4  #ifdef OGG_USE_TREMOR
     7.5      len = vorbis.ov_read(&music->vf, data, sizeof(data), &section);
     7.6  #else
     7.7 -    len = vorbis.ov_read(&music->vf, data, sizeof(data), 0, 2, 1, &section);
     7.8 +    len = (int)vorbis.ov_read(&music->vf, data, sizeof(data), 0, 2, 1, &section);
     7.9  #endif
    7.10      if (len <= 0) {
    7.11          if (len == 0) {
    7.12 @@ -277,7 +277,7 @@
    7.13          vorbis_info *vi;
    7.14  
    7.15          vi = vorbis.ov_info(&music->vf, -1);
    7.16 -        SDL_BuildAudioCVT(cvt, AUDIO_S16, vi->channels, vi->rate,
    7.17 +        SDL_BuildAudioCVT(cvt, AUDIO_S16, vi->channels, (int)vi->rate,
    7.18                                 music_spec.format, music_spec.channels, music_spec.freq);
    7.19          if (cvt->buf) {
    7.20              SDL_free(cvt->buf);
    7.21 @@ -385,7 +385,7 @@
    7.22      OGG_Seek,
    7.23      NULL,   /* Pause */
    7.24      NULL,   /* Resume */
    7.25 -    NULL,   /* Stop */
    7.26 +    OGG_Stop,
    7.27      OGG_Delete,
    7.28      NULL,   /* Close */
    7.29      OGG_Unload,
     8.1 --- a/music_wav.c	Tue Oct 17 02:39:45 2017 -0700
     8.2 +++ b/music_wav.c	Tue Oct 17 02:54:52 2017 -0700
     8.3 @@ -295,7 +295,6 @@
     8.4  
     8.5  static SDL_bool ParseFMT(WAVStream *wave, Uint32 chunk_length)
     8.6  {
     8.7 -    SDL_RWops *src = wave->src;
     8.8      SDL_AudioSpec *spec = &wave->spec;
     8.9      WaveFMT *format;
    8.10      Uint8 *data;
     9.1 --- a/native_midi/native_midi.h	Tue Oct 17 02:39:45 2017 -0700
     9.2 +++ b/native_midi/native_midi.h	Tue Oct 17 02:54:52 2017 -0700
     9.3 @@ -26,12 +26,12 @@
     9.4  
     9.5  typedef struct _NativeMidiSong NativeMidiSong;
     9.6  
     9.7 -int native_midi_detect();
     9.8 +int native_midi_detect(void);
     9.9  NativeMidiSong *native_midi_loadsong_RW(SDL_RWops *src, int freesrc);
    9.10  void native_midi_freesong(NativeMidiSong *song);
    9.11  void native_midi_start(NativeMidiSong *song, int loops);
    9.12 -void native_midi_stop();
    9.13 -int native_midi_active();
    9.14 +void native_midi_stop(void);
    9.15 +int native_midi_active(void);
    9.16  void native_midi_setvolume(int volume);
    9.17  const char *native_midi_error(void);
    9.18  
    10.1 --- a/native_midi/native_midi_haiku.cpp	Tue Oct 17 02:39:45 2017 -0700
    10.2 +++ b/native_midi/native_midi_haiku.cpp	Tue Oct 17 02:54:52 2017 -0700
    10.3 @@ -206,7 +206,7 @@
    10.4  
    10.5  char lasterr[1024];
    10.6  
    10.7 -int native_midi_detect()
    10.8 +int native_midi_detect(void)
    10.9  {
   10.10    status_t res = synth.EnableInput(true, false);
   10.11    return res == B_OK;
   10.12 @@ -261,7 +261,7 @@
   10.13    song->store->Start();
   10.14    currentSong = song;
   10.15  }
   10.16 -void native_midi_stop()
   10.17 +void native_midi_stop(void)
   10.18  {
   10.19    if (currentSong == NULL) return;
   10.20    currentSong->store->Stop();
   10.21 @@ -270,7 +270,7 @@
   10.22      usleep(1000);
   10.23    currentSong = NULL;
   10.24  }
   10.25 -int native_midi_active()
   10.26 +int native_midi_active(void)
   10.27  {
   10.28    if (currentSong == NULL) return 0;
   10.29    return currentSong->store->IsPlaying();
    11.1 --- a/native_midi/native_midi_mac.c	Tue Oct 17 02:39:45 2017 -0700
    11.2 +++ b/native_midi/native_midi_mac.c	Tue Oct 17 02:54:52 2017 -0700
    11.3 @@ -83,7 +83,7 @@
    11.4  
    11.5  
    11.6  /* Check whether QuickTime is available */
    11.7 -int native_midi_detect()
    11.8 +int native_midi_detect(void)
    11.9  {
   11.10      /* TODO */
   11.11      return 1;
   11.12 @@ -242,7 +242,7 @@
   11.13      SDL_PauseAudio(0);
   11.14  }
   11.15  
   11.16 -void native_midi_stop()
   11.17 +void native_midi_stop(void)
   11.18  {
   11.19      if (gTunePlayer == NULL)
   11.20          return;
   11.21 @@ -254,7 +254,7 @@
   11.22      TuneUnroll(gTunePlayer);
   11.23  }
   11.24  
   11.25 -int native_midi_active()
   11.26 +int native_midi_active(void)
   11.27  {
   11.28      if (gTunePlayer != NULL)
   11.29      {
    12.1 --- a/native_midi/native_midi_macosx.c	Tue Oct 17 02:39:45 2017 -0700
    12.2 +++ b/native_midi/native_midi_macosx.c	Tue Oct 17 02:54:52 2017 -0700
    12.3 @@ -150,7 +150,7 @@
    12.4  }
    12.5  
    12.6  
    12.7 -int native_midi_detect()
    12.8 +int native_midi_detect(void)
    12.9  {
   12.10      return 1;  /* always available. */
   12.11  }
   12.12 @@ -287,7 +287,7 @@
   12.13      SDL_PauseAudio(0);
   12.14  }
   12.15  
   12.16 -void native_midi_stop()
   12.17 +void native_midi_stop(void)
   12.18  {
   12.19      if (currentsong) {
   12.20          SDL_PauseAudio(1);
   12.21 @@ -299,7 +299,7 @@
   12.22      }
   12.23  }
   12.24  
   12.25 -int native_midi_active()
   12.26 +int native_midi_active(void)
   12.27  {
   12.28      MusicTimeStamp currentTime = 0;
   12.29      if (currentsong == NULL)
    13.1 --- a/native_midi/native_midi_win32.c	Tue Oct 17 02:39:45 2017 -0700
    13.2 +++ b/native_midi/native_midi_win32.c	Tue Oct 17 02:54:52 2017 -0700
    13.3 @@ -189,7 +189,7 @@
    13.4      }
    13.5  }
    13.6  
    13.7 -int native_midi_detect()
    13.8 +int native_midi_detect(void)
    13.9  {
   13.10    MMRESULT merr;
   13.11    HMIDISTRM MidiStream;
   13.12 @@ -272,7 +272,7 @@
   13.13    }
   13.14  }
   13.15  
   13.16 -void native_midi_stop()
   13.17 +void native_midi_stop(void)
   13.18  {
   13.19    if (!hMidiStream)
   13.20      return;
   13.21 @@ -282,7 +282,7 @@
   13.22    hMidiStream = NULL;
   13.23  }
   13.24  
   13.25 -int native_midi_active()
   13.26 +int native_midi_active(void)
   13.27  {
   13.28    return currentsong->MusicPlaying;
   13.29  }