gosu 1.4.6 → 1.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (320) hide show
  1. checksums.yaml +4 -4
  2. data/COPYING +2 -1
  3. data/dependencies/SDL/include/SDL3/SDL.h +91 -0
  4. data/dependencies/SDL/include/SDL3/SDL_assert.h +710 -0
  5. data/dependencies/SDL/include/SDL3/SDL_asyncio.h +550 -0
  6. data/dependencies/SDL/include/SDL3/SDL_atomic.h +692 -0
  7. data/dependencies/SDL/include/SDL3/SDL_audio.h +2382 -0
  8. data/dependencies/SDL/include/SDL3/SDL_begin_code.h +553 -0
  9. data/dependencies/SDL/include/{SDL_bits.h → SDL3/SDL_bits.h} +47 -27
  10. data/dependencies/SDL/include/{SDL_blendmode.h → SDL3/SDL_blendmode.h} +59 -55
  11. data/dependencies/SDL/include/SDL3/SDL_camera.h +535 -0
  12. data/dependencies/SDL/include/SDL3/SDL_clipboard.h +331 -0
  13. data/dependencies/SDL/include/{close_code.h → SDL3/SDL_close_code.h} +9 -8
  14. data/dependencies/SDL/include/{SDL_types.h → SDL3/SDL_copying.h} +2 -9
  15. data/dependencies/SDL/include/SDL3/SDL_cpuinfo.h +374 -0
  16. data/dependencies/SDL/include/SDL3/SDL_dialog.h +343 -0
  17. data/dependencies/SDL/include/SDL3/SDL_dlopennote.h +234 -0
  18. data/dependencies/SDL/include/{SDL_egl.h → SDL3/SDL_egl.h} +11 -8
  19. data/dependencies/SDL/include/SDL3/SDL_endian.h +645 -0
  20. data/dependencies/SDL/include/SDL3/SDL_error.h +226 -0
  21. data/dependencies/SDL/include/SDL3/SDL_events.h +1651 -0
  22. data/dependencies/SDL/include/SDL3/SDL_filesystem.h +537 -0
  23. data/dependencies/SDL/include/SDL3/SDL_gamepad.h +1657 -0
  24. data/dependencies/SDL/include/SDL3/SDL_gpu.h +4637 -0
  25. data/dependencies/SDL/include/SDL3/SDL_guid.h +106 -0
  26. data/dependencies/SDL/include/SDL3/SDL_haptic.h +1461 -0
  27. data/dependencies/SDL/include/SDL3/SDL_hidapi.h +571 -0
  28. data/dependencies/SDL/include/SDL3/SDL_hints.h +5041 -0
  29. data/dependencies/SDL/include/SDL3/SDL_init.h +508 -0
  30. data/dependencies/SDL/include/SDL3/SDL_intrin.h +410 -0
  31. data/dependencies/SDL/include/SDL3/SDL_iostream.h +1379 -0
  32. data/dependencies/SDL/include/SDL3/SDL_joystick.h +1385 -0
  33. data/dependencies/SDL/include/SDL3/SDL_keyboard.h +615 -0
  34. data/dependencies/SDL/include/SDL3/SDL_keycode.h +348 -0
  35. data/dependencies/SDL/include/SDL3/SDL_loadso.h +145 -0
  36. data/dependencies/SDL/include/{SDL_locale.h → SDL3/SDL_locale.h} +40 -24
  37. data/dependencies/SDL/include/SDL3/SDL_log.h +541 -0
  38. data/dependencies/SDL/include/SDL3/SDL_main.h +704 -0
  39. data/dependencies/SDL/include/SDL3/SDL_main_impl.h +149 -0
  40. data/dependencies/SDL/include/{SDL_messagebox.h → SDL3/SDL_messagebox.h} +85 -48
  41. data/dependencies/SDL/include/{SDL_metal.h → SDL3/SDL_metal.h} +29 -29
  42. data/dependencies/SDL/include/{SDL_misc.h → SDL3/SDL_misc.h} +13 -12
  43. data/dependencies/SDL/include/SDL3/SDL_mouse.h +813 -0
  44. data/dependencies/SDL/include/SDL3/SDL_mutex.h +1117 -0
  45. data/dependencies/SDL/include/SDL3/SDL_oldnames.h +1339 -0
  46. data/dependencies/SDL/include/{SDL_opengl.h → SDL3/SDL_opengl.h} +1247 -278
  47. data/dependencies/SDL/include/{SDL_opengl_glext.h → SDL3/SDL_opengl_glext.h} +5 -1
  48. data/dependencies/SDL/include/{SDL_opengles.h → SDL3/SDL_opengles.h} +6 -7
  49. data/dependencies/SDL/include/{SDL_opengles2.h → SDL3/SDL_opengles2.h} +10 -11
  50. data/dependencies/SDL/include/SDL3/SDL_pen.h +198 -0
  51. data/dependencies/SDL/include/SDL3/SDL_pixels.h +1441 -0
  52. data/dependencies/SDL/include/{SDL_test_log.h → SDL3/SDL_platform.h} +25 -26
  53. data/dependencies/SDL/include/SDL3/SDL_platform_defines.h +497 -0
  54. data/dependencies/SDL/include/{SDL_power.h → SDL3/SDL_power.h} +40 -20
  55. data/dependencies/SDL/include/SDL3/SDL_process.h +441 -0
  56. data/dependencies/SDL/include/SDL3/SDL_properties.h +572 -0
  57. data/dependencies/SDL/include/SDL3/SDL_rect.h +528 -0
  58. data/dependencies/SDL/include/SDL3/SDL_render.h +3034 -0
  59. data/dependencies/SDL/include/SDL3/SDL_revision.h +56 -0
  60. data/dependencies/SDL/include/{SDL_scancode.h → SDL3/SDL_scancode.h} +60 -68
  61. data/dependencies/SDL/include/SDL3/SDL_sensor.h +321 -0
  62. data/dependencies/SDL/include/SDL3/SDL_stdinc.h +6186 -0
  63. data/dependencies/SDL/include/SDL3/SDL_storage.h +686 -0
  64. data/dependencies/SDL/include/SDL3/SDL_surface.h +1769 -0
  65. data/dependencies/SDL/include/SDL3/SDL_system.h +840 -0
  66. data/dependencies/SDL/include/{SDL_test.h → SDL3/SDL_test.h} +16 -22
  67. data/dependencies/SDL/include/{SDL_test_assert.h → SDL3/SDL_test_assert.h} +27 -34
  68. data/dependencies/SDL/include/{SDL_test_common.h → SDL3/SDL_test_common.h} +109 -52
  69. data/dependencies/SDL/include/{SDL_test_compare.h → SDL3/SDL_test_compare.h} +22 -14
  70. data/dependencies/SDL/include/{SDL_test_crc32.h → SDL3/SDL_test_crc32.h} +27 -30
  71. data/dependencies/SDL/include/{SDL_test_font.h → SDL3/SDL_test_font.h} +50 -49
  72. data/dependencies/SDL/include/{SDL_test_fuzzer.h → SDL3/SDL_test_fuzzer.h} +64 -79
  73. data/dependencies/SDL/include/{SDL_test_harness.h → SDL3/SDL_test_harness.h} +47 -30
  74. data/dependencies/SDL/include/SDL3/SDL_test_log.h +83 -0
  75. data/dependencies/SDL/include/{SDL_test_md5.h → SDL3/SDL_test_md5.h} +21 -28
  76. data/dependencies/SDL/include/{SDL_test_memory.h → SDL3/SDL_test_memory.h} +19 -16
  77. data/dependencies/SDL/include/SDL3/SDL_thread.h +602 -0
  78. data/dependencies/SDL/include/SDL3/SDL_time.h +249 -0
  79. data/dependencies/SDL/include/SDL3/SDL_timer.h +454 -0
  80. data/dependencies/SDL/include/SDL3/SDL_touch.h +184 -0
  81. data/dependencies/SDL/include/SDL3/SDL_tray.h +544 -0
  82. data/dependencies/SDL/include/SDL3/SDL_version.h +198 -0
  83. data/dependencies/SDL/include/SDL3/SDL_video.h +3497 -0
  84. data/dependencies/SDL/include/SDL3/SDL_vulkan.h +287 -0
  85. data/dependencies/SDL/lib/x64/libSDL3.dll.a +0 -0
  86. data/dependencies/SDL/lib/x86/libSDL3.dll.a +0 -0
  87. data/dependencies/SDL_sound/SDL3_sound/SDL_sound.h +755 -0
  88. data/dependencies/SDL_sound/SDL_sound.c +136 -215
  89. data/dependencies/SDL_sound/SDL_sound_aiff.c +55 -54
  90. data/dependencies/SDL_sound/SDL_sound_au.c +32 -32
  91. data/dependencies/SDL_sound/SDL_sound_coreaudio.c +24 -41
  92. data/dependencies/SDL_sound/SDL_sound_flac.c +32 -12
  93. data/dependencies/SDL_sound/SDL_sound_internal.h +33 -48
  94. data/dependencies/SDL_sound/SDL_sound_modplug.c +21 -29
  95. data/dependencies/SDL_sound/SDL_sound_mp3.c +35 -13
  96. data/dependencies/SDL_sound/SDL_sound_raw.c +14 -15
  97. data/dependencies/SDL_sound/SDL_sound_shn.c +82 -82
  98. data/dependencies/SDL_sound/SDL_sound_voc.c +30 -30
  99. data/dependencies/SDL_sound/SDL_sound_vorbis.c +34 -25
  100. data/dependencies/SDL_sound/SDL_sound_wav.c +86 -82
  101. data/dependencies/SDL_sound/dr_flac.h +1890 -1301
  102. data/dependencies/SDL_sound/dr_mp3.h +1098 -660
  103. data/dependencies/SDL_sound/libmodplug/fastmix.c +1 -1
  104. data/dependencies/SDL_sound/libmodplug/libmodplug.h +5 -4
  105. data/dependencies/SDL_sound/libmodplug/load_ams.c +6 -3
  106. data/dependencies/SDL_sound/libmodplug/load_dsm.c +2 -1
  107. data/dependencies/SDL_sound/libmodplug/load_mt2.c +2 -2
  108. data/dependencies/SDL_sound/libmodplug/modplug.h +2 -1
  109. data/dependencies/SDL_sound/libmodplug/snd_fx.c +3 -3
  110. data/dependencies/SDL_sound/libmodplug/sndfile.c +3 -0
  111. data/dependencies/SDL_sound/libmodplug/sndmix.c +7 -3
  112. data/dependencies/SDL_sound/stb_vorbis.h +397 -342
  113. data/dependencies/mojoAL/AL/alc.h +2 -2
  114. data/dependencies/mojoAL/mojoal.c +2120 -1885
  115. data/dependencies/stb/stb_image.h +1190 -1379
  116. data/dependencies/stb/stb_image_write.h +329 -129
  117. data/dependencies/stb/stb_truetype.h +304 -60
  118. data/dependencies/utf8proc/utf8proc.c +133 -75
  119. data/dependencies/utf8proc/utf8proc.h +131 -50
  120. data/dependencies/utf8proc/utf8proc_data.h +16213 -15658
  121. data/ext/gosu-ffi/extconf.rb +103 -0
  122. data/ext/gosu-ffi/gosu-ffi.def +467 -0
  123. data/ffi/Gosu.cpp +330 -0
  124. data/ffi/Gosu.h +84 -0
  125. data/ffi/Gosu_Channel.cpp +62 -0
  126. data/ffi/Gosu_Channel.h +17 -0
  127. data/ffi/Gosu_Color.cpp +176 -0
  128. data/ffi/Gosu_Color.h +31 -0
  129. data/ffi/Gosu_Constants.cpp +334 -0
  130. data/ffi/Gosu_FFI.h +34 -0
  131. data/ffi/Gosu_FFI_internal.h +160 -0
  132. data/ffi/Gosu_Font.cpp +97 -0
  133. data/ffi/Gosu_Font.h +32 -0
  134. data/ffi/Gosu_Image.cpp +239 -0
  135. data/ffi/Gosu_Image.h +71 -0
  136. data/ffi/Gosu_Sample.cpp +29 -0
  137. data/ffi/Gosu_Sample.h +14 -0
  138. data/ffi/Gosu_Song.cpp +69 -0
  139. data/ffi/Gosu_Song.h +18 -0
  140. data/ffi/Gosu_TextInput.cpp +94 -0
  141. data/ffi/Gosu_TextInput.h +25 -0
  142. data/ffi/Gosu_Window.cpp +314 -0
  143. data/ffi/Gosu_Window.h +78 -0
  144. data/include/Gosu/Audio.hpp +6 -11
  145. data/include/Gosu/Bitmap.hpp +38 -53
  146. data/include/Gosu/Buffer.hpp +54 -0
  147. data/include/Gosu/Color.hpp +29 -36
  148. data/include/Gosu/Directories.hpp +25 -28
  149. data/include/Gosu/Drawable.hpp +58 -0
  150. data/include/Gosu/Font.hpp +6 -5
  151. data/include/Gosu/Fwd.hpp +4 -6
  152. data/include/Gosu/Gosu.hpp +5 -5
  153. data/include/Gosu/Graphics.hpp +53 -61
  154. data/include/Gosu/GraphicsBase.hpp +1 -11
  155. data/include/Gosu/Image.hpp +12 -15
  156. data/include/Gosu/Math.hpp +50 -72
  157. data/include/Gosu/Transform.hpp +32 -0
  158. data/include/Gosu/Utility.hpp +77 -1
  159. data/include/Gosu/Version.hpp +2 -2
  160. data/include/Gosu/Window.hpp +15 -9
  161. data/lib/SDL3.dll +0 -0
  162. data/lib/gosu/channel.rb +50 -0
  163. data/lib/gosu/color.rb +173 -0
  164. data/lib/gosu/compat.rb +130 -17
  165. data/lib/gosu/constants.rb +386 -0
  166. data/lib/gosu/ffi.rb +269 -0
  167. data/lib/gosu/font.rb +62 -0
  168. data/lib/gosu/gl_tex_info.rb +33 -0
  169. data/lib/gosu/gosu.rb +250 -0
  170. data/lib/gosu/image.rb +179 -0
  171. data/lib/gosu/numeric.rb +17 -0
  172. data/lib/gosu/preview.rb +6 -6
  173. data/lib/gosu/sample.rb +25 -0
  174. data/lib/gosu/song.rb +57 -0
  175. data/lib/gosu/text_input.rb +83 -0
  176. data/lib/gosu/window.rb +249 -0
  177. data/lib/gosu.rb +29 -8
  178. data/lib64/SDL3.dll +0 -0
  179. data/rdoc/gosu.rb +2 -2
  180. data/src/Audio.cpp +30 -24
  181. data/src/AudioFile.hpp +5 -4
  182. data/src/AudioFileAudioToolbox.cpp +8 -8
  183. data/src/AudioFileSDLSound.cpp +12 -15
  184. data/src/BinPacker.cpp +188 -0
  185. data/src/BinPacker.hpp +55 -0
  186. data/src/Bitmap.cpp +172 -143
  187. data/src/BitmapIO.cpp +60 -86
  188. data/src/Buffer.cpp +150 -0
  189. data/src/ClipRectStack.cpp +38 -0
  190. data/src/ClipRectStack.hpp +17 -83
  191. data/src/Color.cpp +75 -80
  192. data/src/Directories.cpp +47 -0
  193. data/src/DirectoriesUIKit.cpp +50 -0
  194. data/src/DrawOp.hpp +20 -18
  195. data/src/DrawOpQueue.hpp +27 -33
  196. data/src/Drawable.cpp +95 -0
  197. data/src/EmptyDrawable.hpp +38 -0
  198. data/src/FPS.cpp +31 -0
  199. data/src/Font.cpp +104 -74
  200. data/src/GosuGLView.cpp +13 -11
  201. data/src/GosuViewController.cpp +2 -10
  202. data/src/Graphics.cpp +86 -145
  203. data/src/GraphicsImpl.hpp +14 -68
  204. data/src/Image.cpp +41 -35
  205. data/src/Input.cpp +73 -78
  206. data/src/Macro.cpp +46 -29
  207. data/src/Macro.hpp +23 -17
  208. data/src/MarkupParser.cpp +5 -5
  209. data/src/Math.cpp +48 -22
  210. data/src/OffScreenTarget.cpp +47 -50
  211. data/src/OffScreenTarget.hpp +13 -11
  212. data/src/OpenGLContext.cpp +116 -0
  213. data/src/OpenGLContext.hpp +41 -0
  214. data/src/RenderState.hpp +49 -71
  215. data/src/Resolution.cpp +65 -53
  216. data/src/TexChunk.cpp +35 -80
  217. data/src/TexChunk.hpp +44 -35
  218. data/src/Text.cpp +1 -1
  219. data/src/TextBuilder.cpp +35 -21
  220. data/src/TextBuilder.hpp +6 -9
  221. data/src/TextInput.cpp +9 -9
  222. data/src/Texture.cpp +62 -80
  223. data/src/Texture.hpp +25 -23
  224. data/src/TiledDrawable.cpp +149 -0
  225. data/src/TiledDrawable.hpp +47 -0
  226. data/src/TimingApple.cpp +1 -1
  227. data/src/Transform.cpp +45 -50
  228. data/src/TransformStack.hpp +16 -16
  229. data/src/TrueTypeFont.cpp +59 -51
  230. data/src/TrueTypeFont.hpp +6 -7
  231. data/src/TrueTypeFontApple.cpp +28 -19
  232. data/src/TrueTypeFontUnix.cpp +39 -32
  233. data/src/TrueTypeFontWin.cpp +30 -30
  234. data/src/Utility.cpp +113 -37
  235. data/src/UtilityWin.cpp +49 -0
  236. data/src/Window.cpp +121 -151
  237. data/src/WindowUIKit.cpp +14 -14
  238. metadata +165 -118
  239. data/dependencies/SDL/include/SDL.h +0 -233
  240. data/dependencies/SDL/include/SDL_assert.h +0 -320
  241. data/dependencies/SDL/include/SDL_atomic.h +0 -415
  242. data/dependencies/SDL/include/SDL_audio.h +0 -1500
  243. data/dependencies/SDL/include/SDL_clipboard.h +0 -141
  244. data/dependencies/SDL/include/SDL_config.h +0 -331
  245. data/dependencies/SDL/include/SDL_cpuinfo.h +0 -594
  246. data/dependencies/SDL/include/SDL_endian.h +0 -348
  247. data/dependencies/SDL/include/SDL_error.h +0 -163
  248. data/dependencies/SDL/include/SDL_events.h +0 -1166
  249. data/dependencies/SDL/include/SDL_filesystem.h +0 -149
  250. data/dependencies/SDL/include/SDL_gamecontroller.h +0 -1074
  251. data/dependencies/SDL/include/SDL_gesture.h +0 -117
  252. data/dependencies/SDL/include/SDL_guid.h +0 -100
  253. data/dependencies/SDL/include/SDL_haptic.h +0 -1341
  254. data/dependencies/SDL/include/SDL_hidapi.h +0 -451
  255. data/dependencies/SDL/include/SDL_hints.h +0 -2569
  256. data/dependencies/SDL/include/SDL_joystick.h +0 -1066
  257. data/dependencies/SDL/include/SDL_keyboard.h +0 -353
  258. data/dependencies/SDL/include/SDL_keycode.h +0 -358
  259. data/dependencies/SDL/include/SDL_loadso.h +0 -115
  260. data/dependencies/SDL/include/SDL_log.h +0 -404
  261. data/dependencies/SDL/include/SDL_main.h +0 -275
  262. data/dependencies/SDL/include/SDL_mouse.h +0 -465
  263. data/dependencies/SDL/include/SDL_mutex.h +0 -471
  264. data/dependencies/SDL/include/SDL_name.h +0 -33
  265. data/dependencies/SDL/include/SDL_pixels.h +0 -644
  266. data/dependencies/SDL/include/SDL_platform.h +0 -261
  267. data/dependencies/SDL/include/SDL_quit.h +0 -58
  268. data/dependencies/SDL/include/SDL_rect.h +0 -376
  269. data/dependencies/SDL/include/SDL_render.h +0 -1919
  270. data/dependencies/SDL/include/SDL_revision.h +0 -7
  271. data/dependencies/SDL/include/SDL_rwops.h +0 -841
  272. data/dependencies/SDL/include/SDL_sensor.h +0 -322
  273. data/dependencies/SDL/include/SDL_shape.h +0 -155
  274. data/dependencies/SDL/include/SDL_stdinc.h +0 -830
  275. data/dependencies/SDL/include/SDL_surface.h +0 -997
  276. data/dependencies/SDL/include/SDL_system.h +0 -623
  277. data/dependencies/SDL/include/SDL_syswm.h +0 -386
  278. data/dependencies/SDL/include/SDL_test_images.h +0 -78
  279. data/dependencies/SDL/include/SDL_test_random.h +0 -115
  280. data/dependencies/SDL/include/SDL_thread.h +0 -464
  281. data/dependencies/SDL/include/SDL_timer.h +0 -222
  282. data/dependencies/SDL/include/SDL_touch.h +0 -150
  283. data/dependencies/SDL/include/SDL_version.h +0 -204
  284. data/dependencies/SDL/include/SDL_video.h +0 -2150
  285. data/dependencies/SDL/include/SDL_vulkan.h +0 -215
  286. data/dependencies/SDL/include/begin_code.h +0 -187
  287. data/dependencies/SDL/lib/x64/libSDL2.dll.a +0 -0
  288. data/dependencies/SDL/lib/x86/libSDL2.dll.a +0 -0
  289. data/dependencies/SDL_sound/SDL_sound.h +0 -725
  290. data/ext/gosu/extconf.rb +0 -119
  291. data/include/Gosu/IO.hpp +0 -254
  292. data/include/Gosu/ImageData.hpp +0 -53
  293. data/include/Gosu/Inspection.hpp +0 -7
  294. data/lib/SDL2.dll +0 -0
  295. data/lib/gosu/patches.rb +0 -66
  296. data/lib/gosu/run.rb +0 -20
  297. data/lib/gosu/swig_patches.rb +0 -110
  298. data/lib64/SDL2.dll +0 -0
  299. data/src/BlockAllocator.cpp +0 -131
  300. data/src/BlockAllocator.hpp +0 -32
  301. data/src/DirectoriesApple.cpp +0 -69
  302. data/src/DirectoriesUnix.cpp +0 -46
  303. data/src/DirectoriesWin.cpp +0 -65
  304. data/src/EmptyImageData.hpp +0 -52
  305. data/src/FileUnix.cpp +0 -99
  306. data/src/FileWin.cpp +0 -88
  307. data/src/IO.cpp +0 -60
  308. data/src/Iconv.hpp +0 -51
  309. data/src/Inspection.cpp +0 -27
  310. data/src/LargeImageData.cpp +0 -215
  311. data/src/LargeImageData.hpp +0 -39
  312. data/src/Log.hpp +0 -19
  313. data/src/RubyGosu.cxx +0 -13100
  314. data/src/RubyGosu.h +0 -49
  315. data/src/WinUtility.cpp +0 -61
  316. data/src/WinUtility.hpp +0 -27
  317. /data/dependencies/SDL/include/{SDL_opengles2_gl2.h → SDL3/SDL_opengles2_gl2.h} +0 -0
  318. /data/dependencies/SDL/include/{SDL_opengles2_gl2ext.h → SDL3/SDL_opengles2_gl2ext.h} +0 -0
  319. /data/dependencies/SDL/include/{SDL_opengles2_gl2platform.h → SDL3/SDL_opengles2_gl2platform.h} +0 -0
  320. /data/dependencies/SDL/include/{SDL_opengles2_khrplatform.h → SDL3/SDL_opengles2_khrplatform.h} +0 -0
@@ -19,40 +19,40 @@
19
19
  #if SOUND_SUPPORTS_WAV
20
20
 
21
21
  /* Better than SDL_ReadLE16, since you can detect i/o errors... */
22
- static SDL_INLINE int read_le16(SDL_RWops *rw, Uint16 *ui16)
22
+ static SDL_INLINE int read_le16(SDL_IOStream *io, Uint16 *ui16)
23
23
  {
24
- int rc = SDL_RWread(rw, ui16, sizeof (Uint16), 1);
25
- BAIL_IF_MACRO(rc != 1, ERR_IO_ERROR, 0);
26
- *ui16 = SDL_SwapLE16(*ui16);
24
+ int rc = SDL_ReadIO(io, ui16, sizeof(Uint16));
25
+ BAIL_IF_MACRO(rc != sizeof(Uint16), ERR_IO_ERROR, 0);
26
+ *ui16 = SDL_Swap16LE(*ui16);
27
27
  return 1;
28
28
  } /* read_le16 */
29
29
 
30
30
 
31
- /* Better than SDL_ReadLE32, since you can detect i/o errors... */
32
- static SDL_INLINE int read_le32(SDL_RWops *rw, Uint32 *ui32)
31
+ /* Better than SDL_ReadU32LE, since you can detect i/o errors... */
32
+ static SDL_INLINE int read_le32(SDL_IOStream *io, Uint32 *ui32)
33
33
  {
34
- int rc = SDL_RWread(rw, ui32, sizeof (Uint32), 1);
35
- BAIL_IF_MACRO(rc != 1, ERR_IO_ERROR, 0);
36
- *ui32 = SDL_SwapLE32(*ui32);
34
+ int rc = SDL_ReadIO(io, ui32, sizeof(Uint32));
35
+ BAIL_IF_MACRO(rc != sizeof(Uint32), ERR_IO_ERROR, 0);
36
+ *ui32 = SDL_Swap32LE(*ui32);
37
37
  return 1;
38
38
  } /* read_le32 */
39
39
 
40
- static SDL_INLINE int read_le16s(SDL_RWops *rw, Sint16 *si16)
40
+ static SDL_INLINE int read_le16s(SDL_IOStream *io, Sint16 *si16)
41
41
  {
42
- return read_le16(rw, (Uint16 *) si16);
42
+ return read_le16(io, (Uint16 *) si16);
43
43
  } /* read_le16s */
44
44
 
45
- static SDL_INLINE int read_le32s(SDL_RWops *rw, Sint32 *si32)
45
+ static SDL_INLINE int read_le32s(SDL_IOStream *io, Sint32 *si32)
46
46
  {
47
- return read_le32(rw, (Uint32 *) si32);
47
+ return read_le32(io, (Uint32 *) si32);
48
48
  } /* read_le32s */
49
49
 
50
50
 
51
51
  /* This is just cleaner on the caller's end... */
52
- static SDL_INLINE int read_uint8(SDL_RWops *rw, Uint8 *ui8)
52
+ static SDL_INLINE int read_uint8(SDL_IOStream *io, Uint8 *ui8)
53
53
  {
54
- int rc = SDL_RWread(rw, ui8, sizeof (Uint8), 1);
55
- BAIL_IF_MACRO(rc != 1, ERR_IO_ERROR, 0);
54
+ int rc = SDL_ReadIO(io, ui8, sizeof (Uint8));
55
+ BAIL_IF_MACRO(rc != sizeof (Uint8), ERR_IO_ERROR, 0);
56
56
  return 1;
57
57
  } /* read_uint8 */
58
58
 
@@ -136,21 +136,21 @@ typedef struct S_WAV_FMT_T
136
136
  * Note that the union "fmt" is not read in here; that is handled as
137
137
  * needed in the read_fmt_* functions.
138
138
  */
139
- static int read_fmt_chunk(SDL_RWops *rw, fmt_t *fmt)
139
+ static int read_fmt_chunk(SDL_IOStream *io, fmt_t *fmt)
140
140
  {
141
141
  /* skip reading the chunk ID, since it was already read at this point... */
142
142
  fmt->chunkID = fmtID;
143
143
 
144
- BAIL_IF_MACRO(!read_le32s(rw, &fmt->chunkSize), NULL, 0);
144
+ BAIL_IF_MACRO(!read_le32s(io, &fmt->chunkSize), NULL, 0);
145
145
  BAIL_IF_MACRO(fmt->chunkSize < 16, "WAV: Invalid chunk size", 0);
146
- fmt->next_chunk_offset = SDL_RWtell(rw) + fmt->chunkSize;
146
+ fmt->next_chunk_offset = SDL_TellIO(io) + fmt->chunkSize;
147
147
 
148
- BAIL_IF_MACRO(!read_le16(rw, &fmt->wFormatTag), NULL, 0);
149
- BAIL_IF_MACRO(!read_le16(rw, &fmt->wChannels), NULL, 0);
150
- BAIL_IF_MACRO(!read_le32(rw, &fmt->dwSamplesPerSec), NULL, 0);
151
- BAIL_IF_MACRO(!read_le32(rw, &fmt->dwAvgBytesPerSec), NULL, 0);
152
- BAIL_IF_MACRO(!read_le16(rw, &fmt->wBlockAlign), NULL, 0);
153
- BAIL_IF_MACRO(!read_le16(rw, &fmt->wBitsPerSample), NULL, 0);
148
+ BAIL_IF_MACRO(!read_le16(io, &fmt->wFormatTag), NULL, 0);
149
+ BAIL_IF_MACRO(!read_le16(io, &fmt->wChannels), NULL, 0);
150
+ BAIL_IF_MACRO(!read_le32(io, &fmt->dwSamplesPerSec), NULL, 0);
151
+ BAIL_IF_MACRO(!read_le32(io, &fmt->dwAvgBytesPerSec), NULL, 0);
152
+ BAIL_IF_MACRO(!read_le16(io, &fmt->wBlockAlign), NULL, 0);
153
+ BAIL_IF_MACRO(!read_le16(io, &fmt->wBitsPerSample), NULL, 0);
154
154
 
155
155
  return 1;
156
156
  } /* read_fmt_chunk */
@@ -175,11 +175,11 @@ typedef struct
175
175
  * Read in a data_t from disk. This makes this process safe regardless of
176
176
  * the processor's byte order or how the fmt_t structure is packed.
177
177
  */
178
- static int read_data_chunk(SDL_RWops *rw, data_t *data)
178
+ static int read_data_chunk(SDL_IOStream *io, data_t *data)
179
179
  {
180
180
  /* skip reading the chunk ID, since it was already read at this point... */
181
181
  data->chunkID = dataID;
182
- BAIL_IF_MACRO(!read_le32s(rw, &data->chunkSize), NULL, 0);
182
+ BAIL_IF_MACRO(!read_le32s(io, &data->chunkSize), NULL, 0);
183
183
  return 1;
184
184
  } /* read_data_chunk */
185
185
 
@@ -214,7 +214,7 @@ static Uint32 read_sample_fmt_normal(Sound_Sample *sample)
214
214
  Uint32 max = (internal->buffer_size < (Uint32) w->bytesLeft) ?
215
215
  internal->buffer_size : (Uint32) w->bytesLeft;
216
216
 
217
- /* We need to convert 24-bit PCM to an SDL-friendly AUDIO_S32SYS ... */
217
+ /* We need to convert 24-bit PCM to an SDL-friendly SDL_AUDIO_S32 ... */
218
218
  if (w->fmt->wBitsPerSample == 24) {
219
219
  const Uint32 num_samples = max / 3;
220
220
 
@@ -232,7 +232,7 @@ static Uint32 read_sample_fmt_normal(Sound_Sample *sample)
232
232
  * We don't actually do any decoding, so we read the wav data
233
233
  * directly into the internal buffer...
234
234
  */
235
- retval = SDL_RWread(internal->rw, internal->buffer, 1, max);
235
+ retval = SDL_ReadIO(internal->io, internal->buffer, max);
236
236
 
237
237
  w->bytesLeft -= retval;
238
238
 
@@ -254,8 +254,8 @@ static Uint32 read_sample_fmt_normal(Sound_Sample *sample)
254
254
  Uint32 *dst = (Uint32 *) (((Uint8 *)internal->buffer + (total * 4)) - 4);
255
255
  Uint32 i;
256
256
  for (i = 0; i < total; i++, dst--, src -= 3) {
257
- const Uint32 sample = ((Uint32) src[0]) | (((Uint32) src[1]) << 8) | (((Uint32) src[2]) << 16);
258
- *dst = sample << 8; /* shift it up so the most significant bits cover the 32-bit space. */
257
+ const Uint32 smpl = ((Uint32) src[0]) | (((Uint32) src[1]) << 8) | (((Uint32) src[2]) << 16);
258
+ *dst = smpl << 8; /* shift it up so the most significant bits cover the 32-bit space. */
259
259
  }
260
260
  retval = total * 4;
261
261
  }
@@ -271,7 +271,7 @@ static int seek_sample_fmt_normal(Sound_Sample *sample, Uint32 ms)
271
271
  fmt_t *fmt = w->fmt;
272
272
  const Sint64 offset = __Sound_convertMsToBytePos(&sample->actual, ms);
273
273
  const Sint64 pos = (fmt->data_starting_offset + offset);
274
- const Sint64 rc = SDL_RWseek(internal->rw, pos, RW_SEEK_SET);
274
+ const Sint64 rc = SDL_SeekIO(internal->io, pos, SDL_IO_SEEK_SET);
275
275
  BAIL_IF_MACRO(rc != pos, ERR_IO_ERROR, 0);
276
276
  w->bytesLeft = fmt->total_bytes - offset;
277
277
  return 1; /* success. */
@@ -285,9 +285,9 @@ static int rewind_sample_fmt_normal(Sound_Sample *sample)
285
285
  } /* rewind_sample_fmt_normal */
286
286
 
287
287
 
288
- static int read_fmt_normal(SDL_RWops *rw, fmt_t *fmt)
288
+ static int read_fmt_normal(SDL_IOStream *io, fmt_t *fmt)
289
289
  {
290
- /* (don't need to read more from the RWops...) */
290
+ /* (don't need to read more from the SDL_IOStream...) */
291
291
  fmt->free = NULL;
292
292
  fmt->read_sample = read_sample_fmt_normal;
293
293
  fmt->rewind_sample = rewind_sample_fmt_normal;
@@ -309,7 +309,7 @@ static int read_fmt_normal(SDL_RWops *rw, fmt_t *fmt)
309
309
  static SDL_INLINE int read_adpcm_block_headers(Sound_Sample *sample)
310
310
  {
311
311
  Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
312
- SDL_RWops *rw = internal->rw;
312
+ SDL_IOStream *io = internal->io;
313
313
  wav_t *w = (wav_t *) internal->decoder_private;
314
314
  fmt_t *fmt = w->fmt;
315
315
  ADPCMBLOCKHEADER *headers = fmt->fmt.adpcm.blockheaders;
@@ -325,16 +325,16 @@ static SDL_INLINE int read_adpcm_block_headers(Sound_Sample *sample)
325
325
  w->bytesLeft -= fmt->wBlockAlign;
326
326
 
327
327
  for (i = 0; i < max; i++)
328
- BAIL_IF_MACRO(!read_uint8(rw, &headers[i].bPredictor), NULL, 0);
328
+ BAIL_IF_MACRO(!read_uint8(io, &headers[i].bPredictor), NULL, 0);
329
329
 
330
330
  for (i = 0; i < max; i++)
331
- BAIL_IF_MACRO(!read_le16(rw, &headers[i].iDelta), NULL, 0);
331
+ BAIL_IF_MACRO(!read_le16(io, &headers[i].iDelta), NULL, 0);
332
332
 
333
333
  for (i = 0; i < max; i++)
334
- BAIL_IF_MACRO(!read_le16s(rw, &headers[i].iSamp1), NULL, 0);
334
+ BAIL_IF_MACRO(!read_le16s(io, &headers[i].iSamp1), NULL, 0);
335
335
 
336
336
  for (i = 0; i < max; i++)
337
- BAIL_IF_MACRO(!read_le16s(rw, &headers[i].iSamp2), NULL, 0);
337
+ BAIL_IF_MACRO(!read_le16s(io, &headers[i].iSamp2), NULL, 0);
338
338
 
339
339
  fmt->fmt.adpcm.samples_left_in_block = fmt->fmt.adpcm.wSamplesPerBlock;
340
340
  fmt->fmt.adpcm.nibble_state = 0;
@@ -386,7 +386,7 @@ static SDL_INLINE int decode_adpcm_sample_frame(Sound_Sample *sample)
386
386
  wav_t *w = (wav_t *) internal->decoder_private;
387
387
  fmt_t *fmt = w->fmt;
388
388
  ADPCMBLOCKHEADER *headers = fmt->fmt.adpcm.blockheaders;
389
- SDL_RWops *rw = internal->rw;
389
+ SDL_IOStream *io = internal->io;
390
390
  int i;
391
391
  int max = fmt->wChannels;
392
392
  Uint8 nib = fmt->fmt.adpcm.nibble;
@@ -401,7 +401,7 @@ static SDL_INLINE int decode_adpcm_sample_frame(Sound_Sample *sample)
401
401
 
402
402
  if (fmt->fmt.adpcm.nibble_state == 0)
403
403
  {
404
- BAIL_IF_MACRO(!read_uint8(rw, &nib), NULL, 0);
404
+ BAIL_IF_MACRO(!read_uint8(io, &nib), NULL, 0);
405
405
  fmt->fmt.adpcm.nibble_state = 1;
406
406
  do_adpcm_nibble(nib >> 4, &headers[i], lPredSamp);
407
407
  } /* if */
@@ -517,12 +517,12 @@ static int seek_sample_fmt_adpcm(Sound_Sample *sample, Uint32 ms)
517
517
  wav_t *w = (wav_t *) internal->decoder_private;
518
518
  fmt_t *fmt = w->fmt;
519
519
  const Uint32 origsampsleft = fmt->fmt.adpcm.samples_left_in_block;
520
- const Sint64 origpos = SDL_RWtell(internal->rw);
520
+ const Sint64 origpos = SDL_TellIO(internal->io);
521
521
  const Sint64 offset = __Sound_convertMsToBytePos(&sample->actual, ms);
522
522
  const Sint64 bpb = (fmt->fmt.adpcm.wSamplesPerBlock * fmt->sample_frame_size);
523
523
  Sint64 skipsize = (offset / bpb) * fmt->wBlockAlign;
524
524
  const Sint64 pos = skipsize + fmt->data_starting_offset;
525
- Sint64 rc = SDL_RWseek(internal->rw, pos, RW_SEEK_SET);
525
+ Sint64 rc = SDL_SeekIO(internal->io, pos, SDL_IO_SEEK_SET);
526
526
  BAIL_IF_MACRO(rc != pos, ERR_IO_ERROR, 0);
527
527
 
528
528
  /* The offset we need is in this block, so we need to decode to there. */
@@ -530,7 +530,7 @@ static int seek_sample_fmt_adpcm(Sound_Sample *sample, Uint32 ms)
530
530
  rc = (offset % bpb); /* bytes into this block we need to decode */
531
531
  if (!read_adpcm_block_headers(sample))
532
532
  {
533
- SDL_RWseek(internal->rw, origpos, RW_SEEK_SET); /* try to make sane. */
533
+ SDL_SeekIO(internal->io, origpos, SDL_IO_SEEK_SET); /* try to make sane. */
534
534
  return 0;
535
535
  } /* if */
536
536
 
@@ -541,7 +541,7 @@ static int seek_sample_fmt_adpcm(Sound_Sample *sample, Uint32 ms)
541
541
  {
542
542
  if (!decode_adpcm_sample_frame(sample))
543
543
  {
544
- SDL_RWseek(internal->rw, origpos, RW_SEEK_SET);
544
+ SDL_SeekIO(internal->io, origpos, SDL_IO_SEEK_SET);
545
545
  fmt->fmt.adpcm.samples_left_in_block = origsampsleft;
546
546
  return 0;
547
547
  } /* if */
@@ -560,7 +560,7 @@ static int seek_sample_fmt_adpcm(Sound_Sample *sample, Uint32 ms)
560
560
  * safe regardless of the processor's byte order or how the fmt_t
561
561
  * structure is packed.
562
562
  */
563
- static int read_fmt_adpcm(SDL_RWops *rw, fmt_t *fmt)
563
+ static int read_fmt_adpcm(SDL_IOStream *io, fmt_t *fmt)
564
564
  {
565
565
  size_t i;
566
566
 
@@ -570,9 +570,9 @@ static int read_fmt_adpcm(SDL_RWops *rw, fmt_t *fmt)
570
570
  fmt->rewind_sample = rewind_sample_fmt_adpcm;
571
571
  fmt->seek_sample = seek_sample_fmt_adpcm;
572
572
 
573
- BAIL_IF_MACRO(!read_le16(rw, &fmt->fmt.adpcm.cbSize), NULL, 0);
574
- BAIL_IF_MACRO(!read_le16(rw, &fmt->fmt.adpcm.wSamplesPerBlock), NULL, 0);
575
- BAIL_IF_MACRO(!read_le16(rw, &fmt->fmt.adpcm.wNumCoef), NULL, 0);
573
+ BAIL_IF_MACRO(!read_le16(io, &fmt->fmt.adpcm.cbSize), NULL, 0);
574
+ BAIL_IF_MACRO(!read_le16(io, &fmt->fmt.adpcm.wSamplesPerBlock), NULL, 0);
575
+ BAIL_IF_MACRO(!read_le16(io, &fmt->fmt.adpcm.wNumCoef), NULL, 0);
576
576
 
577
577
  /* fmt->free() is always called, so these malloc()s will be cleaned up. */
578
578
 
@@ -582,8 +582,8 @@ static int read_fmt_adpcm(SDL_RWops *rw, fmt_t *fmt)
582
582
 
583
583
  for (i = 0; i < fmt->fmt.adpcm.wNumCoef; i++)
584
584
  {
585
- BAIL_IF_MACRO(!read_le16s(rw, &fmt->fmt.adpcm.aCoef[i].iCoef1), NULL, 0);
586
- BAIL_IF_MACRO(!read_le16s(rw, &fmt->fmt.adpcm.aCoef[i].iCoef2), NULL, 0);
585
+ BAIL_IF_MACRO(!read_le16s(io, &fmt->fmt.adpcm.aCoef[i].iCoef1), NULL, 0);
586
+ BAIL_IF_MACRO(!read_le16s(io, &fmt->fmt.adpcm.aCoef[i].iCoef2), NULL, 0);
587
587
  } /* for */
588
588
 
589
589
  i = sizeof (ADPCMBLOCKHEADER) * fmt->wChannels;
@@ -599,9 +599,9 @@ static int read_fmt_adpcm(SDL_RWops *rw, fmt_t *fmt)
599
599
  * Everything else... *
600
600
  *****************************************************************************/
601
601
 
602
- static SDL_bool WAV_init(void)
602
+ static bool WAV_init(void)
603
603
  {
604
- return SDL_TRUE; /* always succeeds. */
604
+ return true; /* always succeeds. */
605
605
  } /* WAV_init */
606
606
 
607
607
 
@@ -611,7 +611,7 @@ static void WAV_quit(void)
611
611
  } /* WAV_quit */
612
612
 
613
613
 
614
- static int read_fmt(SDL_RWops *rw, fmt_t *fmt)
614
+ static int read_fmt(SDL_IOStream *io, fmt_t *fmt)
615
615
  {
616
616
  /* if it's in this switch statement, we support the format. */
617
617
  switch (fmt->wFormatTag)
@@ -619,15 +619,15 @@ static int read_fmt(SDL_RWops *rw, fmt_t *fmt)
619
619
  case FMT_EXTENSIBLE: /* !!! FIXME: this isn't correct */
620
620
  case FMT_NORMAL:
621
621
  SNDDBG(("WAV: Appears to be uncompressed audio.\n"));
622
- return read_fmt_normal(rw, fmt);
622
+ return read_fmt_normal(io, fmt);
623
623
 
624
624
  case FMT_ADPCM:
625
625
  SNDDBG(("WAV: Appears to be ADPCM compressed audio.\n"));
626
- return read_fmt_adpcm(rw, fmt);
626
+ return read_fmt_adpcm(io, fmt);
627
627
 
628
628
  case FMT_IEEE_FLOAT:
629
629
  SNDDBG(("WAV: Appears to be IEEE float uncompressed audio.\n"));
630
- return read_fmt_normal(rw, fmt); /* just normal PCM, otherwise. */
630
+ return read_fmt_normal(io, fmt); /* just normal PCM, otheioise. */
631
631
 
632
632
  /* add other types here. */
633
633
  } /* switch */
@@ -641,24 +641,24 @@ static int read_fmt(SDL_RWops *rw, fmt_t *fmt)
641
641
  /*
642
642
  * Locate a specific chunk in the WAVE file by ID...
643
643
  */
644
- static int find_chunk(SDL_RWops *rw, Uint32 id)
644
+ static int find_chunk(SDL_IOStream *io, Uint32 id)
645
645
  {
646
646
  Sint32 siz = 0;
647
647
  Uint32 _id = 0;
648
- Sint64 pos = SDL_RWtell(rw);
648
+ Sint64 pos = SDL_TellIO(io);
649
649
 
650
650
  while (1)
651
651
  {
652
- BAIL_IF_MACRO(!read_le32(rw, &_id), NULL, 0);
652
+ BAIL_IF_MACRO(!read_le32(io, &_id), NULL, 0);
653
653
  if (_id == id)
654
654
  return 1;
655
655
 
656
656
  /* skip ahead and see what next chunk is... */
657
- BAIL_IF_MACRO(!read_le32s(rw, &siz), NULL, 0);
657
+ BAIL_IF_MACRO(!read_le32s(io, &siz), NULL, 0);
658
658
  SDL_assert(siz >= 0);
659
659
  pos += (sizeof (Uint32) * 2) + siz;
660
660
  if (siz > 0)
661
- BAIL_IF_MACRO(SDL_RWseek(rw, pos, RW_SEEK_SET) != pos, NULL, 0);
661
+ BAIL_IF_MACRO(SDL_SeekIO(io, pos, SDL_IO_SEEK_SET) != pos, NULL, 0);
662
662
  } /* while */
663
663
 
664
664
  return 0; /* shouldn't hit this, but just in case... */
@@ -668,55 +668,59 @@ static int find_chunk(SDL_RWops *rw, Uint32 id)
668
668
  static int WAV_open_internal(Sound_Sample *sample, const char *ext, fmt_t *fmt)
669
669
  {
670
670
  Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
671
- SDL_RWops *rw = internal->rw;
671
+ SDL_IOStream *io = internal->io;
672
672
  data_t d;
673
673
  wav_t *w;
674
674
 
675
- BAIL_IF_MACRO(SDL_ReadLE32(rw) != riffID, "WAV: Not a RIFF file.", 0);
676
- SDL_ReadLE32(rw); /* throw the length away; we get this info later. */
677
- BAIL_IF_MACRO(SDL_ReadLE32(rw) != waveID, "WAV: Not a WAVE file.", 0);
678
- BAIL_IF_MACRO(!find_chunk(rw, fmtID), "WAV: No format chunk.", 0);
679
- BAIL_IF_MACRO(!read_fmt_chunk(rw, fmt), "WAV: Can't read format chunk.", 0);
675
+ Uint32 value = 0;
676
+ SDL_ReadU32LE(io, &value);
677
+ BAIL_IF_MACRO(value != riffID, "WAV: Not a RIFF file.", 0);
678
+ SDL_ReadU32LE(io, &value); /* throw the length away; we get this info later. */
679
+ value = 0;
680
+ SDL_ReadU32LE(io, &value);
681
+ BAIL_IF_MACRO(value != waveID, "WAV: Not a WAVE file.", 0);
682
+ BAIL_IF_MACRO(!find_chunk(io, fmtID), "WAV: No format chunk.", 0);
683
+ BAIL_IF_MACRO(!read_fmt_chunk(io, fmt), "WAV: Can't read format chunk.", 0);
680
684
 
681
685
  sample->actual.channels = (Uint8) fmt->wChannels;
682
- sample->actual.rate = fmt->dwSamplesPerSec;
686
+ sample->actual.freq = fmt->dwSamplesPerSec;
683
687
 
684
688
  if (fmt->wFormatTag == FMT_IEEE_FLOAT)
685
689
  {
686
690
  BAIL_IF_MACRO(fmt->wBitsPerSample != 32, "WAV: Unsupported sample size.", 0);
687
- sample->actual.format = AUDIO_F32LSB;
691
+ sample->actual.format = SDL_AUDIO_F32LE;
688
692
  } /* if */
689
693
  else
690
694
  {
691
695
  switch (fmt->wBitsPerSample)
692
696
  {
693
- case 4: sample->actual.format = AUDIO_S16SYS; break;
694
- case 8: sample->actual.format = AUDIO_U8; break;
695
- case 16: sample->actual.format = AUDIO_S16LSB; break;
696
- case 24: sample->actual.format = AUDIO_S32SYS; break;
697
- case 32: sample->actual.format = AUDIO_S32LSB; break;
697
+ case 4: sample->actual.format = SDL_AUDIO_S16; break;
698
+ case 8: sample->actual.format = SDL_AUDIO_U8; break;
699
+ case 16: sample->actual.format = SDL_AUDIO_S16LE; break;
700
+ case 24: sample->actual.format = SDL_AUDIO_S32; break;
701
+ case 32: sample->actual.format = SDL_AUDIO_S32LE; break;
698
702
  default:
699
703
  SNDDBG(("WAV: %d bits per sample!?\n", (int) fmt->wBitsPerSample));
700
704
  BAIL_MACRO("WAV: Unsupported sample size.", 0);
701
705
  } /* switch */
702
706
  } /* else */
703
707
 
704
- BAIL_IF_MACRO(!read_fmt(rw, fmt), NULL, 0);
705
- SDL_RWseek(rw, fmt->next_chunk_offset, RW_SEEK_SET);
706
- BAIL_IF_MACRO(!find_chunk(rw, dataID), "WAV: No data chunk.", 0);
707
- BAIL_IF_MACRO(!read_data_chunk(rw, &d), "WAV: Can't read data chunk.", 0);
708
+ BAIL_IF_MACRO(!read_fmt(io, fmt), NULL, 0);
709
+ SDL_SeekIO(io, fmt->next_chunk_offset, SDL_IO_SEEK_SET);
710
+ BAIL_IF_MACRO(!find_chunk(io, dataID), "WAV: No data chunk.", 0);
711
+ BAIL_IF_MACRO(!read_data_chunk(io, &d), "WAV: Can't read data chunk.", 0);
708
712
 
709
713
  w = (wav_t *) SDL_malloc(sizeof(wav_t));
710
714
  BAIL_IF_MACRO(w == NULL, ERR_OUT_OF_MEMORY, 0);
711
715
  w->fmt = fmt;
712
716
  fmt->total_bytes = w->bytesLeft = d.chunkSize;
713
- fmt->data_starting_offset = SDL_RWtell(rw);
717
+ fmt->data_starting_offset = SDL_TellIO(io);
714
718
  fmt->sample_frame_size = ( ((sample->actual.format & 0xFF) / 8) *
715
719
  sample->actual.channels );
716
720
  internal->decoder_private = (void *) w;
717
721
 
718
722
  if (fmt->dwAvgBytesPerSec == 0) { /* we assume data is uncompressed if this field is unset. */
719
- fmt->dwAvgBytesPerSec = fmt->sample_frame_size * sample->actual.rate;
723
+ fmt->dwAvgBytesPerSec = fmt->sample_frame_size * sample->actual.freq;
720
724
  BAIL_IF_MACRO(fmt->dwAvgBytesPerSec == 0, "WAV: corrupt format chunk?", 0);
721
725
  }
722
726
 
@@ -778,7 +782,7 @@ static int WAV_rewind(Sound_Sample *sample)
778
782
  Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
779
783
  wav_t *w = (wav_t *) internal->decoder_private;
780
784
  fmt_t *fmt = w->fmt;
781
- const Sint64 rc = SDL_RWseek(internal->rw, fmt->data_starting_offset, RW_SEEK_SET);
785
+ const Sint64 rc = SDL_SeekIO(internal->io, fmt->data_starting_offset, SDL_IO_SEEK_SET);
782
786
  BAIL_IF_MACRO(rc != fmt->data_starting_offset, ERR_IO_ERROR, 0);
783
787
  w->bytesLeft = fmt->total_bytes;
784
788
  return fmt->rewind_sample(sample);