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
@@ -44,13 +44,13 @@ static size_t flac_read(void* pUserData, void* pBufferOut, size_t bytesToRead)
44
44
  Uint8 *ptr = (Uint8 *) pBufferOut;
45
45
  Sound_Sample *sample = (Sound_Sample *) pUserData;
46
46
  Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
47
- SDL_RWops *rwops = internal->rw;
47
+ SDL_IOStream *io = internal->io;
48
48
  size_t retval = 0;
49
49
 
50
50
  /* !!! FIXME: dr_flac treats returning less than bytesToRead as EOF. So we can't EAGAIN. */
51
51
  while (bytesToRead)
52
52
  {
53
- const size_t rc = SDL_RWread(rwops, ptr, 1, bytesToRead);
53
+ const size_t rc = SDL_ReadIO(io, ptr, bytesToRead);
54
54
  if (rc == 0) break;
55
55
  bytesToRead -= rc;
56
56
  retval += rc;
@@ -62,16 +62,36 @@ static size_t flac_read(void* pUserData, void* pBufferOut, size_t bytesToRead)
62
62
 
63
63
  static drflac_bool32 flac_seek(void* pUserData, int offset, drflac_seek_origin origin)
64
64
  {
65
- const int whence = (origin == drflac_seek_origin_start) ? RW_SEEK_SET : RW_SEEK_CUR;
66
65
  Sound_Sample *sample = (Sound_Sample *) pUserData;
67
66
  Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
68
- return (SDL_RWseek(internal->rw, offset, whence) != -1) ? DRFLAC_TRUE : DRFLAC_FALSE;
67
+ int whence;
68
+ switch (origin) {
69
+ case DRFLAC_SEEK_SET:
70
+ whence = SDL_IO_SEEK_SET;
71
+ break;
72
+ case DRFLAC_SEEK_CUR:
73
+ whence = SDL_IO_SEEK_CUR;
74
+ break;
75
+ case DRFLAC_SEEK_END:
76
+ whence = SDL_IO_SEEK_END;
77
+ break;
78
+ default:
79
+ return DRFLAC_FALSE;
80
+ }
81
+ return (SDL_SeekIO(internal->io, offset, whence) != -1) ? DRFLAC_TRUE : DRFLAC_FALSE;
69
82
  } /* flac_seek */
70
83
 
84
+ static drflac_bool32 flac_tell(void* pUserData, drflac_int64* pCursor)
85
+ {
86
+ Sound_Sample *sample = (Sound_Sample *) pUserData;
87
+ Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
88
+ *pCursor = SDL_TellIO(internal->io);
89
+ return (*pCursor != -1) ? DRFLAC_TRUE : DRFLAC_FALSE;
90
+ } /* flac_tell */
71
91
 
72
- static SDL_bool FLAC_init(void)
92
+ static bool FLAC_init(void)
73
93
  {
74
- return SDL_TRUE; /* always succeeds. */
94
+ return true; /* always succeeds. */
75
95
  } /* FLAC_init */
76
96
 
77
97
 
@@ -84,7 +104,7 @@ static void FLAC_quit(void)
84
104
  static int FLAC_open(Sound_Sample *sample, const char *ext)
85
105
  {
86
106
  Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
87
- drflac *dr = drflac_open(flac_read, flac_seek, sample, NULL);
107
+ drflac *dr = drflac_open(flac_read, flac_seek, flac_tell, sample, NULL);
88
108
 
89
109
  if (!dr)
90
110
  {
@@ -96,16 +116,16 @@ static int FLAC_open(Sound_Sample *sample, const char *ext)
96
116
  sample->flags = SOUND_SAMPLEFLAG_CANSEEK;
97
117
 
98
118
  sample->actual.channels = dr->channels;
99
- sample->actual.rate = dr->sampleRate;
100
- sample->actual.format = AUDIO_S32SYS; /* dr_flac only does Sint32. */
119
+ sample->actual.freq = dr->sampleRate;
120
+ sample->actual.format = SDL_AUDIO_S32; /* dr_flac only does Sint32. */
101
121
 
102
122
  if (dr->totalPCMFrameCount == 0)
103
123
  internal->total_time = -1;
104
124
  else
105
125
  {
106
- const Uint32 rate = (Uint32) dr->sampleRate;
126
+ const Uint32 freq = (Uint32) dr->sampleRate;
107
127
  const Uint64 frames = (Uint64) dr->totalPCMFrameCount;
108
- internal->total_time = (frames / rate) * 1000;
128
+ internal->total_time = (frames / freq) * 1000;
109
129
  internal->total_time += ((dr->totalPCMFrameCount % dr->sampleRate) * 1000) / dr->sampleRate;
110
130
  } /* else */
111
131
 
@@ -145,7 +165,7 @@ static int FLAC_seek(Sound_Sample *sample, Uint32 ms)
145
165
  {
146
166
  Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
147
167
  drflac *dr = (drflac *) internal->decoder_private;
148
- const float frames_per_ms = ((float) sample->actual.rate) / 1000.0f;
168
+ const float frames_per_ms = ((float) sample->actual.freq) / 1000.0f;
149
169
  const drflac_uint64 frame_offset = (drflac_uint64) (frames_per_ms * ((float) ms));
150
170
  return (drflac_seek_to_pcm_frame(dr, frame_offset) == DRFLAC_TRUE);
151
171
  } /* FLAC_seek */
@@ -11,27 +11,14 @@
11
11
  * application.
12
12
  */
13
13
 
14
- #ifndef _INCLUDE_SDL_SOUND_INTERNAL_H_
15
- #define _INCLUDE_SDL_SOUND_INTERNAL_H_
14
+ #ifndef SDL_SOUND_INTERNAL_H_
15
+ #define SDL_SOUND_INTERNAL_H_
16
16
 
17
17
  #ifndef __SDL_SOUND_INTERNAL__
18
18
  #error Do not include this header from your applications.
19
19
  #endif
20
20
 
21
- #include "SDL_sound.h"
22
-
23
- /* SDL_AudioStream, which we use internally, didn't arrive until SDL 2.0.7. */
24
- #if !SDL_VERSION_ATLEAST(2, 0, 7)
25
- #error SDL_sound requires SDL 2.0.7 or later. Please upgrade.
26
- #endif
27
-
28
- #if ((defined(__GNUC__) && (__GNUC__ >= 4)) || defined(__clang__)) && !(defined(_WIN32) || defined(__OS2__))
29
- #define SOUND_HAVE_PRAGMA_VISIBILITY 1
30
- #endif
31
-
32
- #if SOUND_HAVE_PRAGMA_VISIBILITY
33
- #pragma GCC visibility push(hidden)
34
- #endif
21
+ #include <SDL3_sound/SDL_sound.h>
35
22
 
36
23
  #if (defined DEBUG_CHATTER)
37
24
  #define SNDDBG(x) SDL_Log x
@@ -39,6 +26,17 @@
39
26
  #define SNDDBG(x)
40
27
  #endif
41
28
 
29
+ /* disable several MS Visual Studio warnings: */
30
+ #ifdef _MSC_VER
31
+ #pragma warning(disable:4100) /* unreferenced formal parameter */
32
+ #pragma warning(disable:4389) /* signed/unsigned mismatch ( <, <=, >, >= ) */
33
+ #pragma warning(disable:4018) /* signed/unsigned mismatch ( ==, != ) */
34
+ #pragma warning(disable:4127) /* conditional expression is constant. */
35
+ #pragma warning(disable:4761) /* integral size mismatch in argument; conversion supplied (for MSVC6 and older.) */
36
+ #pragma warning(disable:4244) /* conversion from 'type' to 'int', possible loss of data */
37
+ #pragma warning(disable:4267) /* conversion from 'size_t' to 'type', possible loss of data */
38
+ #endif
39
+
42
40
  #ifndef SOUND_SUPPORTS_MIDI
43
41
  #define SOUND_SUPPORTS_MIDI 0
44
42
  #endif
@@ -87,7 +85,7 @@
87
85
  * SDL itself only supports mono and stereo output, but hopefully we can
88
86
  * raise this value someday...there's probably a lot of assumptions in
89
87
  * SDL_sound that rely on it, though.
90
- * !!! FIXME: SDL2 supports more channels.
88
+ * !!! FIXME: SDL3 supports more channels.
91
89
  */
92
90
  #define SOUND_MAX_CHANNELS 2
93
91
 
@@ -102,7 +100,7 @@ typedef struct __SOUND_DECODERFUNCTIONS__
102
100
  * set up any global state that your decoder needs, such as
103
101
  * initializing an external library, etc.
104
102
  *
105
- * Return SDL_TRUE if initialization is successful, SDL_FALSE if
103
+ * Return true if initialization is successful, false if
106
104
  * there's a fatal error. If this method fails, then this decoder
107
105
  * is flagged as unavailable until SDL_sound() is shut down and
108
106
  * reinitialized, in which case this method will be tried again.
@@ -111,7 +109,7 @@ typedef struct __SOUND_DECODERFUNCTIONS__
111
109
  * method fails, so if you can't intialize, you'll have to clean
112
110
  * up the half-initialized state in this method.
113
111
  */
114
- SDL_bool (*init)(void);
112
+ bool (*init)(void);
115
113
 
116
114
  /*
117
115
  * This is called during the Sound_Quit() function. Use this to
@@ -143,11 +141,11 @@ typedef struct __SOUND_DECODERFUNCTIONS__
143
141
  * in Sound_SampleInternal section:
144
142
  * Sound_Sample *next; (offlimits)
145
143
  * Sound_Sample *prev; (offlimits)
146
- * SDL_RWops *rw; (can use, but do NOT close it)
144
+ * SDL_IOStream *io; (can use, but do NOT close it)
147
145
  * const Sound_DecoderFunctions *funcs; (that's this structure)
148
146
  * SDL_AudioStream stream; (offlimits)
149
- * SDL_bool pending_eof; (offlimits)
150
- * SDL_bool pending_error; (offlimits)
147
+ * bool pending_eof; (offlimits)
148
+ * bool pending_error; (offlimits)
151
149
  * void *buffer; (offlimits until read() method)
152
150
  * Uint32 buffer_size; (offlimits until read() method)
153
151
  * void *decoder_private; (read and write access)
@@ -155,8 +153,8 @@ typedef struct __SOUND_DECODERFUNCTIONS__
155
153
  * in rest of Sound_Sample:
156
154
  * void *opaque; (this was internal section, above)
157
155
  * const Sound_DecoderInfo *decoder; (read only)
158
- * Sound_AudioInfo desired; (read only, usually not needed here)
159
- * Sound_AudioInfo actual; (please fill this in)
156
+ * SDL_AudioSpec desired; (read only, usually not needed here)
157
+ * SDL_AudioSpec actual; (please fill this in)
160
158
  * void *buffer; (offlimits)
161
159
  * Uint32 buffer_size; (offlimits)
162
160
  * Sound_SampleFlags flags; (set appropriately)
@@ -180,7 +178,7 @@ typedef struct __SOUND_DECODERFUNCTIONS__
180
178
  *
181
179
  * ...and then start decoding. Fill in up to internal->buffer_size
182
180
  * bytes of decoded sound in the space pointed to by
183
- * internal->buffer. The encoded data is read in from internal->rw.
181
+ * internal->buffer. The encoded data is read in from internal->io.
184
182
  * Data should be decoded in the format specified during the
185
183
  * decoder's open() method in the sample->actual field. The
186
184
  * conversion to the desired format is done at a higher level.
@@ -212,17 +210,17 @@ typedef struct __SOUND_DECODERFUNCTIONS__
212
210
  /*
213
211
  * Reset the decoding to the beginning of the stream. Nonzero on
214
212
  * success, zero on failure.
215
- *
213
+ *
216
214
  * The purpose of this method is to allow for higher efficiency than
217
215
  * an application could get by just recreating the sample externally;
218
- * not only do they not have to reopen the RWops, reallocate buffers,
216
+ * not only do they not have to reopen the SDL_IOStream, reallocate buffers,
219
217
  * and potentially pass the data through several rejecting decoders,
220
218
  * but certain decoders will not have to recreate their existing
221
219
  * state (search for metadata, etc) since they already know they
222
220
  * have a valid audio stream with a given set of characteristics.
223
221
  *
224
222
  * The decoder is responsible for calling seek() on the associated
225
- * SDL_RWops. A failing call to seek() should be the ONLY reason that
223
+ * SDL_IOStream. A failing call to seek() should be the ONLY reason that
226
224
  * this method should ever fail!
227
225
  */
228
226
  int (*rewind)(Sound_Sample *sample);
@@ -236,7 +234,7 @@ typedef struct __SOUND_DECODERFUNCTIONS__
236
234
  * decoding to a given point.
237
235
  *
238
236
  * The decoder is responsible for calling seek() on the associated
239
- * SDL_RWops.
237
+ * SDL_IOStream.
240
238
  *
241
239
  * If there is an error, try to recover so that the next read will
242
240
  * continue as if nothing happened.
@@ -251,11 +249,11 @@ typedef struct __SOUND_SAMPLEINTERNAL__
251
249
  {
252
250
  Sound_Sample *next;
253
251
  Sound_Sample *prev;
254
- SDL_RWops *rw;
252
+ SDL_IOStream *io;
255
253
  const Sound_DecoderFunctions *funcs;
256
254
  SDL_AudioStream *stream;
257
- SDL_bool pending_eof;
258
- SDL_bool pending_error;
255
+ bool pending_eof;
256
+ bool pending_error;
259
257
  void *buffer;
260
258
  Uint32 buffer_size;
261
259
  void *decoder_private;
@@ -298,27 +296,14 @@ void __Sound_SetError(const char *err);
298
296
  * Call this to convert milliseconds to an actual byte position, based on
299
297
  * audio data characteristics.
300
298
  */
301
- Uint32 __Sound_convertMsToBytePos(Sound_AudioInfo *info, Uint32 ms);
299
+ Uint32 __Sound_convertMsToBytePos(SDL_AudioSpec *info, Uint32 ms);
302
300
 
303
301
 
304
302
  /* These get used all over for lessening code clutter. */
305
303
  #define BAIL_MACRO(e, r) { __Sound_SetError(e); return r; }
306
304
  #define BAIL_IF_MACRO(c, e, r) if (c) { __Sound_SetError(e); return r; }
307
305
 
308
- #if SDL_VERSION_ATLEAST(2,0,12)
309
- #define HAVE_SDL_STRTOKR
310
- #else
311
- #define SDL_strtokr __Sound_strtokr
312
- extern char *SDL_strtokr(char *s1, const char *s2, char **saveptr);
313
- #endif
314
-
315
- /* SDL doesn't provide a rand() replacement */
316
- #define SDL_rand __Sound_rand
317
- #define SDL_srand __Sound_srand
318
- extern int SDL_rand(void);
319
- extern void SDL_srand(unsigned int seed);
320
-
321
- /* Wrappers around the SDL versions of these in case you're on an older SDL */
306
+ /* Wrappers around SDL versions. SDL3 doesn't provide a SIMDRealloc() */
322
307
  extern void *__Sound_SIMDAlloc(const size_t len);
323
308
  extern void *__Sound_SIMDRealloc(void *mem, const size_t len);
324
309
  extern void __Sound_SIMDFree(void *ptr);
@@ -327,7 +312,7 @@ extern void __Sound_SIMDFree(void *ptr);
327
312
  }
328
313
  #endif
329
314
 
330
- #endif /* defined _INCLUDE_SDL_SOUND_INTERNAL_H_ */
315
+ #endif /* defined SDL_SOUND_INTERNAL_H_ */
331
316
 
332
317
  /* end of SDL_sound_internal.h ... */
333
318
 
@@ -56,7 +56,7 @@ static const char *extensions_modplug[] =
56
56
 
57
57
 
58
58
 
59
- static SDL_bool MODPLUG_init(void)
59
+ static bool MODPLUG_init(void)
60
60
  {
61
61
  return ModPlug_Init(); /* success. */
62
62
  } /* MODPLUG_init */
@@ -102,41 +102,33 @@ static int MODPLUG_open(Sound_Sample *sample, const char *ext)
102
102
 
103
103
  /* ModPlug needs the entire stream in one big chunk. I don't like it,
104
104
  but I don't think there's any way around it. !!! FIXME: rework modplug? */
105
- size = SDL_RWsize(internal->rw);
105
+ size = SDL_GetIOSize(internal->io);
106
106
  BAIL_IF_MACRO(size <= 0 || size > (Sint64)0x7fffffff, "MODPLUG: Not a module file.", 0);
107
107
 
108
- if (internal->rw->type == SDL_RWOPS_MEMORY || internal->rw->type == SDL_RWOPS_MEMORY_RO)
109
- {
110
- data = internal->rw->hidden.mem.base;
111
- retval = 0;
112
- }
113
- else
114
- {
115
- data = SDL_malloc((size_t) size);
116
- BAIL_IF_MACRO(data == NULL, ERR_OUT_OF_MEMORY, 0);
117
- retval = SDL_RWread(internal->rw, data, 1, size);
118
- if (retval != (size_t)size) SDL_free(data);
119
- BAIL_IF_MACRO(retval != (size_t)size, ERR_IO_ERROR, 0);
120
- }
108
+ data = SDL_malloc((size_t) size);
109
+ BAIL_IF_MACRO(data == NULL, ERR_OUT_OF_MEMORY, 0);
110
+ retval = SDL_ReadIO(internal->io, data, size);
111
+ if (retval != (size_t)size) SDL_free(data);
112
+ BAIL_IF_MACRO(retval != (size_t)size, ERR_IO_ERROR, 0);
121
113
 
122
- SDL_memcpy(&sample->actual, &sample->desired, sizeof (Sound_AudioInfo));
123
- if (sample->actual.rate == 0) sample->actual.rate = 44100;
114
+ SDL_copyp(&sample->actual, &sample->desired);
115
+ if (sample->actual.freq == 0) sample->actual.freq = 44100;
124
116
  if (sample->actual.channels != 1) sample->actual.channels = 2;
125
- if (sample->actual.format == 0) sample->actual.format = AUDIO_S16SYS;
117
+ if (sample->actual.format == 0) sample->actual.format = SDL_AUDIO_S16;
126
118
 
127
119
  switch (sample->actual.format) {
128
- case AUDIO_U8:
129
- case AUDIO_S8:
130
- sample->actual.format = AUDIO_U8;
120
+ case SDL_AUDIO_U8:
121
+ case SDL_AUDIO_S8:
122
+ sample->actual.format = SDL_AUDIO_U8;
131
123
  break;
132
- case AUDIO_S32MSB:
133
- case AUDIO_S32LSB:
134
- case AUDIO_F32MSB:
135
- case AUDIO_F32LSB:
136
- sample->actual.format = AUDIO_S32SYS;
124
+ case SDL_AUDIO_S32BE:
125
+ case SDL_AUDIO_S32LE:
126
+ case SDL_AUDIO_F32BE:
127
+ case SDL_AUDIO_F32LE:
128
+ sample->actual.format = SDL_AUDIO_S32;
137
129
  break;
138
130
  default:
139
- sample->actual.format = AUDIO_S16SYS;
131
+ sample->actual.format = SDL_AUDIO_S16;
140
132
  break;
141
133
  }
142
134
 
@@ -157,7 +149,7 @@ static int MODPLUG_open(Sound_Sample *sample, const char *ext)
157
149
  settings.mSurroundDelay = 20;
158
150
  settings.mChannels = sample->actual.channels;
159
151
  settings.mBits = SDL_AUDIO_BITSIZE(sample->actual.format);
160
- settings.mFrequency = sample->actual.rate;
152
+ settings.mFrequency = sample->actual.freq;
161
153
  settings.mResamplingMode = MODPLUG_RESAMPLE_FIR;
162
154
  settings.mLoopCount = 0;
163
155
 
@@ -220,7 +212,7 @@ const Sound_DecoderFunctions __Sound_DecoderFunctions_MODPLUG =
220
212
  extensions_modplug,
221
213
  "Play modules through ModPlug",
222
214
  "Torbjörn Andersson <d91tan@Update.UU.SE>",
223
- "http://modplug-xmms.sourceforge.net/"
215
+ "https://modplug-xmms.sourceforge.net/"
224
216
  },
225
217
 
226
218
  MODPLUG_init, /* init() method */
@@ -28,6 +28,7 @@
28
28
  #define DRMP3_FREE(p) SDL_free((p))
29
29
  #define DRMP3_COPY_MEMORY(dst, src, sz) SDL_memcpy((dst), (src), (sz))
30
30
  #define DRMP3_MOVE_MEMORY(dst, src, sz) SDL_memmove((dst), (src), (sz))
31
+ #define DRMP3_CMP_MEMORY(src1,src2, sz) SDL_memcmp((src1),(src2), (sz))
31
32
  #define DRMP3_ZERO_MEMORY(p, sz) SDL_memset((p), 0, (sz))
32
33
 
33
34
  #include "dr_mp3.h"
@@ -37,13 +38,13 @@ static size_t mp3_read(void* pUserData, void* pBufferOut, size_t bytesToRead)
37
38
  Uint8 *ptr = (Uint8 *) pBufferOut;
38
39
  Sound_Sample *sample = (Sound_Sample *) pUserData;
39
40
  Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
40
- SDL_RWops *rwops = internal->rw;
41
+ SDL_IOStream *io = internal->io;
41
42
  size_t retval = 0;
42
43
 
43
44
  /* !!! FIXME: dr_mp3 treats returning less than bytesToRead as EOF. So we can't EAGAIN. */
44
45
  while (bytesToRead)
45
46
  {
46
- const size_t rc = SDL_RWread(rwops, ptr, 1, bytesToRead);
47
+ const size_t rc = SDL_ReadIO(io, ptr, bytesToRead);
47
48
  if (rc == 0) break;
48
49
  bytesToRead -= rc;
49
50
  retval += rc;
@@ -55,16 +56,37 @@ static size_t mp3_read(void* pUserData, void* pBufferOut, size_t bytesToRead)
55
56
 
56
57
  static drmp3_bool32 mp3_seek(void* pUserData, int offset, drmp3_seek_origin origin)
57
58
  {
58
- const int whence = (origin == drmp3_seek_origin_start) ? RW_SEEK_SET : RW_SEEK_CUR;
59
59
  Sound_Sample *sample = (Sound_Sample *) pUserData;
60
60
  Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
61
- return (SDL_RWseek(internal->rw, offset, whence) != -1) ? DRMP3_TRUE : DRMP3_FALSE;
61
+ int whence;
62
+ switch (origin) {
63
+ case DRMP3_SEEK_SET:
64
+ whence = SDL_IO_SEEK_SET;
65
+ break;
66
+ case DRMP3_SEEK_CUR:
67
+ whence = SDL_IO_SEEK_CUR;
68
+ break;
69
+ case DRMP3_SEEK_END:
70
+ whence = SDL_IO_SEEK_END;
71
+ break;
72
+ default:
73
+ return DRMP3_FALSE;
74
+ }
75
+ return (SDL_SeekIO(internal->io, offset, whence) != -1) ? DRMP3_TRUE : DRMP3_FALSE;
62
76
  } /* mp3_seek */
63
77
 
78
+ static drmp3_bool32 mp3_tell(void* pUserData, drmp3_int64* pCursor)
79
+ {
80
+ Sound_Sample *sample = (Sound_Sample *) pUserData;
81
+ Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
82
+ *pCursor = SDL_TellIO(internal->io);
83
+ return (*pCursor != -1) ? DRMP3_TRUE : DRMP3_FALSE;
84
+ } /* mp3_tell */
85
+
64
86
 
65
- static SDL_bool MP3_init(void)
87
+ static bool MP3_init(void)
66
88
  {
67
- return SDL_TRUE; /* always succeeds. */
89
+ return true; /* always succeeds. */
68
90
  } /* MP3_init */
69
91
 
70
92
 
@@ -80,7 +102,7 @@ static int MP3_open(Sound_Sample *sample, const char *ext)
80
102
  Uint64 frames;
81
103
 
82
104
  BAIL_IF_MACRO(!dr, ERR_OUT_OF_MEMORY, 0);
83
- if (drmp3_init(dr, mp3_read, mp3_seek, sample, NULL) != DRMP3_TRUE)
105
+ if (drmp3_init(dr, mp3_read, mp3_seek, mp3_tell, NULL, sample, NULL) != DRMP3_TRUE)
84
106
  {
85
107
  SDL_free(dr);
86
108
  BAIL_IF_MACRO(sample->flags & SOUND_SAMPLEFLAG_ERROR, ERR_IO_ERROR, 0);
@@ -91,17 +113,17 @@ static int MP3_open(Sound_Sample *sample, const char *ext)
91
113
  sample->flags = SOUND_SAMPLEFLAG_CANSEEK;
92
114
 
93
115
  sample->actual.channels = dr->channels;
94
- sample->actual.rate = dr->sampleRate;
95
- sample->actual.format = AUDIO_F32SYS; /* dr_mp3 only does float. */
116
+ sample->actual.freq = dr->sampleRate;
117
+ sample->actual.format = SDL_AUDIO_F32; /* dr_mp3 only does float. */
96
118
 
97
119
  frames = drmp3_get_pcm_frame_count(dr);
98
120
  if (frames == 0) /* ever possible ??? */
99
121
  internal->total_time = -1;
100
122
  else
101
123
  {
102
- const Uint32 rate = dr->sampleRate;
103
- internal->total_time = (frames / rate) * 1000;
104
- internal->total_time += ((frames % rate) * 1000) / rate;
124
+ const Uint32 freq = dr->sampleRate;
125
+ internal->total_time = (frames / freq) * 1000;
126
+ internal->total_time += ((frames % freq) * 1000) / freq;
105
127
  } /* else */
106
128
 
107
129
  internal->decoder_private = dr;
@@ -141,7 +163,7 @@ static int MP3_seek(Sound_Sample *sample, Uint32 ms)
141
163
  {
142
164
  Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
143
165
  drmp3 *dr = (drmp3 *) internal->decoder_private;
144
- const float frames_per_ms = ((float) sample->actual.rate) / 1000.0f;
166
+ const float frames_per_ms = ((float) sample->actual.freq) / 1000.0f;
145
167
  const drmp3_uint64 frame_offset = (drmp3_uint64) (frames_per_ms * ((float) ms));
146
168
  return (drmp3_seek_to_pcm_frame(dr, frame_offset) == DRMP3_TRUE);
147
169
  } /* MP3_seek */
@@ -28,9 +28,9 @@
28
28
 
29
29
  #if SOUND_SUPPORTS_RAW
30
30
 
31
- static SDL_bool RAW_init(void)
31
+ static bool RAW_init(void)
32
32
  {
33
- return SDL_TRUE; /* always succeeds. */
33
+ return true; /* always succeeds. */
34
34
  } /* RAW_init */
35
35
 
36
36
 
@@ -44,7 +44,7 @@ static int RAW_open(Sound_Sample *sample, const char *ext)
44
44
  {
45
45
  Sound_SampleInternal *internal = sample->opaque;
46
46
  Sint64 pos;
47
- Uint32 sample_rate;
47
+ Uint32 sample_freq;
48
48
 
49
49
  /*
50
50
  * We check this explicitly, since we have no other way to
@@ -59,7 +59,7 @@ static int RAW_open(Sound_Sample *sample, const char *ext)
59
59
  */
60
60
  if ( (sample->desired.channels < 1) ||
61
61
  (sample->desired.channels > 2) ||
62
- (sample->desired.rate == 0) ||
62
+ (sample->desired.freq == 0) ||
63
63
  (sample->desired.format == 0) )
64
64
  {
65
65
  BAIL_MACRO("RAW: invalid desired format.", 0);
@@ -70,19 +70,19 @@ static int RAW_open(Sound_Sample *sample, const char *ext)
70
70
  /*
71
71
  * We never convert raw samples; what you ask for is what you get.
72
72
  */
73
- SDL_memcpy(&sample->actual, &sample->desired, sizeof (Sound_AudioInfo));
73
+ SDL_copyp(&sample->actual, &sample->desired);
74
74
  sample->flags = SOUND_SAMPLEFLAG_CANSEEK;
75
75
 
76
- if ((pos = SDL_RWseek(internal->rw, 0, RW_SEEK_END)) <= 0) {
76
+ if ((pos = SDL_SeekIO(internal->io, 0, SDL_IO_SEEK_END)) <= 0) {
77
77
  BAIL_MACRO("RAW: can't seek to the end of the file.", 0);
78
78
  }
79
- if ( SDL_RWseek(internal->rw, 0, RW_SEEK_SET) != 0) {
79
+ if (SDL_SeekIO(internal->io, 0, SDL_IO_SEEK_SET) != 0) {
80
80
  BAIL_MACRO("RAW: can't reset file.", 0);
81
81
  }
82
82
 
83
- sample_rate = (sample->actual.rate * sample->actual.channels * ((sample->actual.format & 0x0018) >> 3));
84
- internal->total_time = ( pos ) / sample_rate * 1000;
85
- internal->total_time += (pos % sample_rate) * 1000 / sample_rate;
83
+ sample_freq = (sample->actual.freq * sample->actual.channels * ((sample->actual.format & 0x0018) >> 3));
84
+ internal->total_time = ( pos ) / sample_freq * 1000;
85
+ internal->total_time += (pos % sample_freq) * 1000 / sample_freq;
86
86
 
87
87
  return 1; /* we'll handle this data. */
88
88
  } /* RAW_open */
@@ -103,8 +103,8 @@ static Uint32 RAW_read(Sound_Sample *sample)
103
103
  * We don't actually do any decoding, so we read the raw data
104
104
  * directly into the internal buffer...
105
105
  */
106
- retval = SDL_RWread(internal->rw, internal->buffer,
107
- 1, internal->buffer_size);
106
+ retval = SDL_ReadIO(internal->io, internal->buffer,
107
+ internal->buffer_size);
108
108
 
109
109
  /* Make sure the read went smoothly... */
110
110
  if (retval == 0)
@@ -124,16 +124,15 @@ static Uint32 RAW_read(Sound_Sample *sample)
124
124
  static int RAW_rewind(Sound_Sample *sample)
125
125
  {
126
126
  Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
127
- BAIL_IF_MACRO(SDL_RWseek(internal->rw, 0, RW_SEEK_SET) != 0, ERR_IO_ERROR, 0);
127
+ BAIL_IF_MACRO(SDL_SeekIO(internal->io, 0, SDL_IO_SEEK_SET) != 0, ERR_IO_ERROR, 0);
128
128
  return 1;
129
129
  } /* RAW_rewind */
130
130
 
131
-
132
131
  static int RAW_seek(Sound_Sample *sample, Uint32 ms)
133
132
  {
134
133
  Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
135
134
  const Sint64 pos = __Sound_convertMsToBytePos(&sample->actual, ms);
136
- const int err = (SDL_RWseek(internal->rw, pos, RW_SEEK_SET) != pos);
135
+ const int err = (SDL_SeekIO(internal->io, pos, SDL_IO_SEEK_SET) != pos);
137
136
  BAIL_IF_MACRO(err, ERR_IO_ERROR, 0);
138
137
  return 1;
139
138
  } /* RAW_seek */