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
@@ -77,9 +77,9 @@ typedef struct vocstuff {
77
77
  #define VOC_DATA_16 9
78
78
 
79
79
 
80
- static SDL_bool VOC_init(void)
80
+ static bool VOC_init(void)
81
81
  {
82
- return SDL_TRUE; /* always succeeds. */
82
+ return true; /* always succeeds. */
83
83
  } /* VOC_init */
84
84
 
85
85
 
@@ -89,9 +89,9 @@ static void VOC_quit(void)
89
89
  } /* VOC_quit */
90
90
 
91
91
 
92
- static SDL_INLINE int voc_readbytes(SDL_RWops *src, vs_t *v, void *p, int size)
92
+ static SDL_INLINE int voc_readbytes(SDL_IOStream *src, vs_t *v, void *p, int size)
93
93
  {
94
- if (SDL_RWread(src, p, size, 1) != 1)
94
+ if (SDL_ReadIO(src, p, size) != size)
95
95
  {
96
96
  v->error = 1;
97
97
  BAIL_MACRO("VOC: i/o error", 0);
@@ -101,7 +101,7 @@ static SDL_INLINE int voc_readbytes(SDL_RWops *src, vs_t *v, void *p, int size)
101
101
  } /* voc_readbytes */
102
102
 
103
103
 
104
- static SDL_INLINE int voc_check_header(SDL_RWops *src)
104
+ static SDL_INLINE int voc_check_header(SDL_IOStream *src)
105
105
  {
106
106
  /* VOC magic header */
107
107
  Uint8 signature[20]; /* "Creative Voice File\032" */
@@ -120,9 +120,9 @@ static SDL_INLINE int voc_check_header(SDL_RWops *src)
120
120
  if (!voc_readbytes(src, &v, &datablockofs, sizeof (Uint16)))
121
121
  return 0;
122
122
 
123
- datablockofs = SDL_SwapLE16(datablockofs);
123
+ datablockofs = SDL_Swap16LE(datablockofs);
124
124
 
125
- if (SDL_RWseek(src, datablockofs, RW_SEEK_SET) != datablockofs)
125
+ if (SDL_SeekIO(src, datablockofs, SDL_IO_SEEK_SET) != datablockofs)
126
126
  {
127
127
  BAIL_MACRO("VOC: Failed to seek to data block.", 0);
128
128
  } /* if */
@@ -135,7 +135,7 @@ static SDL_INLINE int voc_check_header(SDL_RWops *src)
135
135
  static int voc_get_block(Sound_Sample *sample, vs_t *v)
136
136
  {
137
137
  Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
138
- SDL_RWops *src = internal->rw;
138
+ SDL_IOStream *src = internal->io;
139
139
  Uint8 bits24[3];
140
140
  Uint8 uc, block;
141
141
  Uint32 sblen;
@@ -149,15 +149,15 @@ static int voc_get_block(Sound_Sample *sample, vs_t *v)
149
149
  v->silent = 0;
150
150
  while (v->rest == 0)
151
151
  {
152
- if (SDL_RWread(src, &block, sizeof (block), 1) != 1)
152
+ if (SDL_ReadIO(src, &block, sizeof (block)) != sizeof (block))
153
153
  return 1; /* assume that's the end of the file. */
154
154
 
155
155
  if (block == VOC_TERM)
156
156
  return 1;
157
157
 
158
- if (SDL_RWread(src, bits24, sizeof (bits24), 1) != 1)
158
+ if (SDL_ReadIO(src, bits24, sizeof (bits24)) != sizeof (bits24))
159
159
  return 1; /* assume that's the end of the file. */
160
-
160
+
161
161
  /* Size is an 24-bit value. Ugh. */
162
162
  sblen = ( (bits24[0]) | (bits24[1] << 8) | (bits24[2] << 16) );
163
163
 
@@ -177,7 +177,7 @@ static int voc_get_block(Sound_Sample *sample, vs_t *v)
177
177
  BAIL_MACRO("VOC sample rate codes differ", 0);
178
178
 
179
179
  v->rate = uc;
180
- sample->actual.rate = 1000000.0/(256 - v->rate);
180
+ sample->actual.freq = 1000000.0/(256 - v->rate);
181
181
  sample->actual.channels = 1;
182
182
  v->channels = 1;
183
183
  } /* if */
@@ -191,7 +191,7 @@ static int voc_get_block(Sound_Sample *sample, vs_t *v)
191
191
  v->rest = sblen - 2;
192
192
  v->size = ST_SIZE_BYTE;
193
193
 
194
- bytes_per_second = sample->actual.rate * sample->actual.channels;
194
+ bytes_per_second = sample->actual.freq * sample->actual.channels;
195
195
  internal->total_time += ( v->rest ) / bytes_per_second * 1000;
196
196
  internal->total_time += (v->rest % bytes_per_second) * 1000
197
197
  / bytes_per_second;
@@ -201,14 +201,14 @@ static int voc_get_block(Sound_Sample *sample, vs_t *v)
201
201
  if (!voc_readbytes(src, v, &new_rate_long, sizeof (Uint32)))
202
202
  return 0;
203
203
 
204
- new_rate_long = SDL_SwapLE32(new_rate_long);
204
+ new_rate_long = SDL_Swap32LE(new_rate_long);
205
205
  BAIL_IF_MACRO(!new_rate_long, "VOC: Sample rate is zero?", 0);
206
206
 
207
207
  if ((v->rate != -1) && (new_rate_long != v->rate))
208
208
  BAIL_MACRO("VOC: sample rate codes differ", 0);
209
209
 
210
210
  v->rate = new_rate_long;
211
- sample->actual.rate = new_rate_long;
211
+ sample->actual.freq = new_rate_long;
212
212
 
213
213
  if (!voc_readbytes(src, v, &uc, sizeof (uc)))
214
214
  return 0;
@@ -229,7 +229,7 @@ static int voc_get_block(Sound_Sample *sample, vs_t *v)
229
229
  v->rest = sblen - 12;
230
230
 
231
231
  bytes_per_second = ((v->size == ST_SIZE_WORD) ? (2) : (1)) *
232
- sample->actual.rate * v->channels;
232
+ sample->actual.freq * v->channels;
233
233
  internal->total_time += v->rest / bytes_per_second * 1000;
234
234
  internal->total_time += ( v->rest % bytes_per_second ) * 1000
235
235
  / bytes_per_second;
@@ -243,7 +243,7 @@ static int voc_get_block(Sound_Sample *sample, vs_t *v)
243
243
  if (!voc_readbytes(src, v, &period, sizeof (period)))
244
244
  return 0;
245
245
 
246
- period = SDL_SwapLE16(period);
246
+ period = SDL_Swap16LE(period);
247
247
 
248
248
  if (!voc_readbytes(src, v, &uc, sizeof (uc)))
249
249
  return 0;
@@ -284,7 +284,7 @@ static int voc_get_block(Sound_Sample *sample, vs_t *v)
284
284
  if (!voc_readbytes(src, v, &new_rate_short, sizeof (Uint16)))
285
285
  return 0;
286
286
 
287
- new_rate_short = SDL_SwapLE16(new_rate_short);
287
+ new_rate_short = SDL_Swap16LE(new_rate_short);
288
288
  BAIL_IF_MACRO(!new_rate_short, "VOC: sample rate is zero", 0);
289
289
 
290
290
  if ((v->rate != -1) && (new_rate_short != v->rate))
@@ -307,7 +307,7 @@ static int voc_get_block(Sound_Sample *sample, vs_t *v)
307
307
 
308
308
  /* Needed number of channels before finishing
309
309
  compute for rate */
310
- sample->actual.rate =
310
+ sample->actual.freq =
311
311
  (256000000L/(65536L - v->rate)) / sample->actual.channels;
312
312
  /* An extended block must be followed by a data */
313
313
  /* block to be valid so loop back to top so it */
@@ -339,7 +339,7 @@ static int voc_get_block(Sound_Sample *sample, vs_t *v)
339
339
  static int voc_read_waveform(Sound_Sample *sample, int fill_buf, Uint32 max)
340
340
  {
341
341
  Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
342
- SDL_RWops *src = internal->rw;
342
+ SDL_IOStream *src = internal->io;
343
343
  vs_t *v = (vs_t *) internal->decoder_private;
344
344
  Sint64 done = 0;
345
345
  Uint8 silence = 0x80;
@@ -374,7 +374,7 @@ static int voc_read_waveform(Sound_Sample *sample, int fill_buf, Uint32 max)
374
374
  {
375
375
  if (fill_buf)
376
376
  {
377
- done = SDL_RWread(src, buf + v->bufpos, 1, max);
377
+ done = SDL_ReadIO(src, buf + v->bufpos, max);
378
378
  if (done < ((Sint64) max))
379
379
  {
380
380
  __Sound_SetError("VOC: i/o error");
@@ -385,10 +385,10 @@ static int voc_read_waveform(Sound_Sample *sample, int fill_buf, Uint32 max)
385
385
  else
386
386
  {
387
387
  Sint64 cur, rc;
388
- cur = SDL_RWtell(src);
388
+ cur = SDL_TellIO(src);
389
389
  if (cur >= 0)
390
390
  {
391
- rc = SDL_RWseek(src, max, RW_SEEK_CUR);
391
+ rc = SDL_SeekIO(src, max, SDL_IO_SEEK_CUR);
392
392
  if (rc >= 0)
393
393
  done = rc - cur;
394
394
  else
@@ -412,13 +412,13 @@ static int VOC_open(Sound_Sample *sample, const char *ext)
412
412
  Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
413
413
  vs_t *v = NULL;
414
414
 
415
- if (!voc_check_header(internal->rw))
415
+ if (!voc_check_header(internal->io))
416
416
  return 0;
417
417
 
418
418
  v = (vs_t *) SDL_calloc(1, sizeof (vs_t));
419
419
  BAIL_IF_MACRO(v == NULL, ERR_OUT_OF_MEMORY, 0);
420
420
 
421
- v->start_pos = SDL_RWtell(internal->rw);
421
+ v->start_pos = SDL_TellIO(internal->io);
422
422
  v->rate = -1;
423
423
  if (!voc_get_block(sample, v))
424
424
  {
@@ -433,7 +433,7 @@ static int VOC_open(Sound_Sample *sample, const char *ext)
433
433
  } /* if */
434
434
 
435
435
  SNDDBG(("VOC: Accepting data stream.\n"));
436
- sample->actual.format = (v->size == ST_SIZE_WORD) ? AUDIO_S16LSB:AUDIO_U8;
436
+ sample->actual.format = (v->size == ST_SIZE_WORD) ? SDL_AUDIO_S16LE : SDL_AUDIO_U8;
437
437
  sample->actual.channels = v->channels;
438
438
  sample->flags = SOUND_SAMPLEFLAG_CANSEEK;
439
439
  internal->decoder_private = v;
@@ -456,7 +456,7 @@ static Uint32 VOC_read(Sound_Sample *sample)
456
456
  v->bufpos = 0;
457
457
  while (v->bufpos < internal->buffer_size)
458
458
  {
459
- Uint32 rc = voc_read_waveform(sample, 1, internal->buffer_size);
459
+ Uint32 rc = voc_read_waveform(sample, 1, internal->buffer_size - v->bufpos);
460
460
  if (rc == 0)
461
461
  {
462
462
  sample->flags |= (v->error) ?
@@ -482,7 +482,7 @@ static int VOC_rewind(Sound_Sample *sample)
482
482
  {
483
483
  Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
484
484
  vs_t *v = (vs_t *) internal->decoder_private;
485
- const Sint64 rc = SDL_RWseek(internal->rw, v->start_pos, RW_SEEK_SET);
485
+ const Sint64 rc = SDL_SeekIO(internal->io, v->start_pos, SDL_IO_SEEK_SET);
486
486
  BAIL_IF_MACRO(rc != v->start_pos, ERR_IO_ERROR, 0);
487
487
  v->rest = 0;
488
488
  return 1;
@@ -504,7 +504,7 @@ static int VOC_seek(Sound_Sample *sample, Uint32 ms)
504
504
  Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
505
505
  vs_t *v = (vs_t *) internal->decoder_private;
506
506
  Uint32 offset = __Sound_convertMsToBytePos(&sample->actual, ms);
507
- const Sint64 origpos = SDL_RWtell(internal->rw);
507
+ const Sint64 origpos = SDL_TellIO(internal->io);
508
508
  const Uint32 origrest = v->rest;
509
509
 
510
510
  BAIL_IF_MACRO(!VOC_rewind(sample), NULL, 0);
@@ -516,7 +516,7 @@ static int VOC_seek(Sound_Sample *sample, Uint32 ms)
516
516
  Uint32 rc = voc_read_waveform(sample, 0, offset);
517
517
  if ( (rc == 0) || (!voc_get_block(sample, v)) )
518
518
  {
519
- SDL_RWseek(internal->rw, origpos, RW_SEEK_SET);
519
+ SDL_SeekIO(internal->io, origpos, SDL_IO_SEEK_SET);
520
520
  v->rest = origrest;
521
521
  return 0;
522
522
  } /* if */
@@ -23,18 +23,25 @@
23
23
  #if SOUND_SUPPORTS_VORBIS
24
24
 
25
25
  /* Configure and include stb_vorbis for compiling... */
26
+ #define STB_VORBIS_SDL 1 /* for SDL_sound-specific stuff. */
26
27
  #define STB_VORBIS_NO_STDIO 1
27
28
  #define STB_VORBIS_NO_CRT 1
28
29
  #define STB_VORBIS_NO_PUSHDATA_API 1
29
- #define STB_VORBIS_MAX_CHANNELS 6
30
+ #define STB_VORBIS_MAX_CHANNELS 8 /* For 7.1 surround sound */
30
31
  #define STB_VORBIS_NO_COMMENTS 1
31
32
  #define STB_FORCEINLINE SDL_FORCE_INLINE
32
33
  #if SDL_BYTEORDER == SDL_BIG_ENDIAN
33
34
  #define STB_VORBIS_BIG_ENDIAN 1
34
35
  #endif
35
- #define STBV_CDECL SDLCALL /* for SDL_qsort */
36
+ #define STBV_CDECL SDLCALL /* for SDL_qsort() */
36
37
 
37
38
  #if !defined(__clang_analyzer__)
39
+ /* stb_vorbis unconditionally includes some libc headers:
40
+ * include math.h here so that we don't choke on ldexp()
41
+ * in bits/mathcalls.h, and stdlib.h so that MSVC doesn't
42
+ * choke on qsort() calling convention. */
43
+ #include <math.h>
44
+ #include <stdlib.h>
38
45
  #ifdef assert
39
46
  #undef assert
40
47
  #endif
@@ -59,18 +66,14 @@
59
66
  #define cos(x) SDL_cos(x)
60
67
  #define sin(x) SDL_sin(x)
61
68
  #define log(x) SDL_log(x)
62
- #if SDL_VERSION_ATLEAST(2, 0, 9)
63
- #define exp SDL_exp
69
+ #define exp(x) SDL_exp(x)
64
70
  #endif
65
- #endif
66
-
67
71
  #include "stb_vorbis.h"
68
72
 
69
73
  static const char *vorbis_error_string(const int err)
70
74
  {
71
75
  switch (err)
72
76
  {
73
- case VORBIS__no_error: return NULL;
74
77
  case VORBIS_need_more_data: return "VORBIS: need more data";
75
78
  case VORBIS_invalid_api_mixing: return "VORBIS: can't mix API modes";
76
79
  case VORBIS_outofmem: return "VORBIS: out of memory";
@@ -95,9 +98,9 @@ static const char *vorbis_error_string(const int err)
95
98
  return "VORBIS: unknown error";
96
99
  } /* vorbis_error_string */
97
100
 
98
- static SDL_bool VORBIS_init(void)
101
+ static bool VORBIS_init(void)
99
102
  {
100
- return SDL_TRUE; /* always succeeds. */
103
+ return true; /* always succeeds. */
101
104
  } /* VORBIS_init */
102
105
 
103
106
  static void VORBIS_quit(void)
@@ -108,29 +111,29 @@ static void VORBIS_quit(void)
108
111
  static int VORBIS_open(Sound_Sample *sample, const char *ext)
109
112
  {
110
113
  Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
111
- SDL_RWops *rw = internal->rw;
114
+ SDL_IOStream *src = internal->io;
112
115
  int err = 0;
113
- stb_vorbis *stb = stb_vorbis_open_rwops(rw, 0, &err, NULL);
114
- unsigned int num_frames;
116
+ stb_vorbis *stb = stb_vorbis_open_io(src, 0, &err, NULL);
117
+ unsigned int num_frames, rate;
115
118
 
116
119
  BAIL_IF_MACRO(!stb, vorbis_error_string(err), 0);
117
120
 
121
+ num_frames = stb_vorbis_stream_length_in_samples(stb);
122
+ if (!num_frames) {
123
+ stb_vorbis_close(stb);
124
+ BAIL_MACRO("VORBIS: No samples in ogg/vorbis stream.", 0);
125
+ }
126
+
118
127
  SNDDBG(("VORBIS: Accepting data stream.\n"));
119
128
 
120
129
  internal->decoder_private = stb;
121
130
  sample->flags = SOUND_SAMPLEFLAG_CANSEEK;
122
- sample->actual.format = AUDIO_F32SYS;
131
+ sample->actual.format = SDL_AUDIO_F32;
123
132
  sample->actual.channels = stb->channels;
124
- sample->actual.rate = stb->sample_rate;
125
- num_frames = stb_vorbis_stream_length_in_samples(stb);
126
- if (!num_frames)
127
- internal->total_time = -1;
128
- else
129
- {
130
- const unsigned int rate = stb->sample_rate;
131
- internal->total_time = (num_frames / rate) * 1000;
132
- internal->total_time += (num_frames % rate) * 1000 / rate;
133
- } /* else */
133
+ sample->actual.freq = stb->sample_rate;
134
+ rate = stb->sample_rate;
135
+ internal->total_time = (num_frames / rate) * 1000;
136
+ internal->total_time += (num_frames % rate) * 1000 / rate;
134
137
 
135
138
  return 1; /* we'll handle this data. */
136
139
  } /* VORBIS_open */
@@ -149,13 +152,19 @@ static Uint32 VORBIS_read(Sound_Sample *sample)
149
152
  Uint32 retval;
150
153
  int rc;
151
154
  int err;
155
+ int has_deferred;
152
156
  Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
153
157
  stb_vorbis *stb = (stb_vorbis *) internal->decoder_private;
154
158
  const int channels = (int) sample->actual.channels;
155
159
  const int want_samples = (int) (internal->buffer_size / sizeof (float));
156
160
 
157
161
  stb_vorbis_get_error(stb); /* clear any error state */
158
- rc = stb_vorbis_get_samples_float_interleaved(stb, channels, (float *) internal->buffer, want_samples);
162
+
163
+ do {
164
+ has_deferred = stb->discard_samples_deferred > 0;
165
+ rc = stb_vorbis_get_samples_float_interleaved(stb, channels, (float *) internal->buffer, want_samples);
166
+ } while ((rc == 0) && has_deferred); /* if it's still flushing out garbage at the start of the stream, keep trying. */
167
+
159
168
  retval = (Uint32) (rc * channels * sizeof (float)); /* rc == number of sample frames read */
160
169
  err = stb_vorbis_get_error(stb);
161
170
 
@@ -190,7 +199,7 @@ static int VORBIS_seek(Sound_Sample *sample, Uint32 ms)
190
199
  {
191
200
  Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
192
201
  stb_vorbis *stb = (stb_vorbis *) internal->decoder_private;
193
- const float frames_per_ms = ((float) sample->actual.rate) / 1000.0f;
202
+ const float frames_per_ms = ((float) sample->actual.freq) / 1000.0f;
194
203
  const Uint32 frame_offset = (Uint32) (frames_per_ms * ((float) ms));
195
204
  const unsigned int sampnum = (unsigned int) frame_offset;
196
205
  BAIL_IF_MACRO(!stb_vorbis_seek(stb, sampnum), vorbis_error_string(stb_vorbis_get_error(stb)), 0);