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.
- checksums.yaml +4 -4
- data/COPYING +2 -1
- data/dependencies/SDL/include/SDL3/SDL.h +91 -0
- data/dependencies/SDL/include/SDL3/SDL_assert.h +710 -0
- data/dependencies/SDL/include/SDL3/SDL_asyncio.h +550 -0
- data/dependencies/SDL/include/SDL3/SDL_atomic.h +692 -0
- data/dependencies/SDL/include/SDL3/SDL_audio.h +2382 -0
- data/dependencies/SDL/include/SDL3/SDL_begin_code.h +553 -0
- data/dependencies/SDL/include/{SDL_bits.h → SDL3/SDL_bits.h} +47 -27
- data/dependencies/SDL/include/{SDL_blendmode.h → SDL3/SDL_blendmode.h} +59 -55
- data/dependencies/SDL/include/SDL3/SDL_camera.h +535 -0
- data/dependencies/SDL/include/SDL3/SDL_clipboard.h +331 -0
- data/dependencies/SDL/include/{close_code.h → SDL3/SDL_close_code.h} +9 -8
- data/dependencies/SDL/include/{SDL_types.h → SDL3/SDL_copying.h} +2 -9
- data/dependencies/SDL/include/SDL3/SDL_cpuinfo.h +374 -0
- data/dependencies/SDL/include/SDL3/SDL_dialog.h +343 -0
- data/dependencies/SDL/include/SDL3/SDL_dlopennote.h +234 -0
- data/dependencies/SDL/include/{SDL_egl.h → SDL3/SDL_egl.h} +11 -8
- data/dependencies/SDL/include/SDL3/SDL_endian.h +645 -0
- data/dependencies/SDL/include/SDL3/SDL_error.h +226 -0
- data/dependencies/SDL/include/SDL3/SDL_events.h +1651 -0
- data/dependencies/SDL/include/SDL3/SDL_filesystem.h +537 -0
- data/dependencies/SDL/include/SDL3/SDL_gamepad.h +1657 -0
- data/dependencies/SDL/include/SDL3/SDL_gpu.h +4637 -0
- data/dependencies/SDL/include/SDL3/SDL_guid.h +106 -0
- data/dependencies/SDL/include/SDL3/SDL_haptic.h +1461 -0
- data/dependencies/SDL/include/SDL3/SDL_hidapi.h +571 -0
- data/dependencies/SDL/include/SDL3/SDL_hints.h +5041 -0
- data/dependencies/SDL/include/SDL3/SDL_init.h +508 -0
- data/dependencies/SDL/include/SDL3/SDL_intrin.h +410 -0
- data/dependencies/SDL/include/SDL3/SDL_iostream.h +1379 -0
- data/dependencies/SDL/include/SDL3/SDL_joystick.h +1385 -0
- data/dependencies/SDL/include/SDL3/SDL_keyboard.h +615 -0
- data/dependencies/SDL/include/SDL3/SDL_keycode.h +348 -0
- data/dependencies/SDL/include/SDL3/SDL_loadso.h +145 -0
- data/dependencies/SDL/include/{SDL_locale.h → SDL3/SDL_locale.h} +40 -24
- data/dependencies/SDL/include/SDL3/SDL_log.h +541 -0
- data/dependencies/SDL/include/SDL3/SDL_main.h +704 -0
- data/dependencies/SDL/include/SDL3/SDL_main_impl.h +149 -0
- data/dependencies/SDL/include/{SDL_messagebox.h → SDL3/SDL_messagebox.h} +85 -48
- data/dependencies/SDL/include/{SDL_metal.h → SDL3/SDL_metal.h} +29 -29
- data/dependencies/SDL/include/{SDL_misc.h → SDL3/SDL_misc.h} +13 -12
- data/dependencies/SDL/include/SDL3/SDL_mouse.h +813 -0
- data/dependencies/SDL/include/SDL3/SDL_mutex.h +1117 -0
- data/dependencies/SDL/include/SDL3/SDL_oldnames.h +1339 -0
- data/dependencies/SDL/include/{SDL_opengl.h → SDL3/SDL_opengl.h} +1247 -278
- data/dependencies/SDL/include/{SDL_opengl_glext.h → SDL3/SDL_opengl_glext.h} +5 -1
- data/dependencies/SDL/include/{SDL_opengles.h → SDL3/SDL_opengles.h} +6 -7
- data/dependencies/SDL/include/{SDL_opengles2.h → SDL3/SDL_opengles2.h} +10 -11
- data/dependencies/SDL/include/SDL3/SDL_pen.h +198 -0
- data/dependencies/SDL/include/SDL3/SDL_pixels.h +1441 -0
- data/dependencies/SDL/include/{SDL_test_log.h → SDL3/SDL_platform.h} +25 -26
- data/dependencies/SDL/include/SDL3/SDL_platform_defines.h +497 -0
- data/dependencies/SDL/include/{SDL_power.h → SDL3/SDL_power.h} +40 -20
- data/dependencies/SDL/include/SDL3/SDL_process.h +441 -0
- data/dependencies/SDL/include/SDL3/SDL_properties.h +572 -0
- data/dependencies/SDL/include/SDL3/SDL_rect.h +528 -0
- data/dependencies/SDL/include/SDL3/SDL_render.h +3034 -0
- data/dependencies/SDL/include/SDL3/SDL_revision.h +56 -0
- data/dependencies/SDL/include/{SDL_scancode.h → SDL3/SDL_scancode.h} +60 -68
- data/dependencies/SDL/include/SDL3/SDL_sensor.h +321 -0
- data/dependencies/SDL/include/SDL3/SDL_stdinc.h +6186 -0
- data/dependencies/SDL/include/SDL3/SDL_storage.h +686 -0
- data/dependencies/SDL/include/SDL3/SDL_surface.h +1769 -0
- data/dependencies/SDL/include/SDL3/SDL_system.h +840 -0
- data/dependencies/SDL/include/{SDL_test.h → SDL3/SDL_test.h} +16 -22
- data/dependencies/SDL/include/{SDL_test_assert.h → SDL3/SDL_test_assert.h} +27 -34
- data/dependencies/SDL/include/{SDL_test_common.h → SDL3/SDL_test_common.h} +109 -52
- data/dependencies/SDL/include/{SDL_test_compare.h → SDL3/SDL_test_compare.h} +22 -14
- data/dependencies/SDL/include/{SDL_test_crc32.h → SDL3/SDL_test_crc32.h} +27 -30
- data/dependencies/SDL/include/{SDL_test_font.h → SDL3/SDL_test_font.h} +50 -49
- data/dependencies/SDL/include/{SDL_test_fuzzer.h → SDL3/SDL_test_fuzzer.h} +64 -79
- data/dependencies/SDL/include/{SDL_test_harness.h → SDL3/SDL_test_harness.h} +47 -30
- data/dependencies/SDL/include/SDL3/SDL_test_log.h +83 -0
- data/dependencies/SDL/include/{SDL_test_md5.h → SDL3/SDL_test_md5.h} +21 -28
- data/dependencies/SDL/include/{SDL_test_memory.h → SDL3/SDL_test_memory.h} +19 -16
- data/dependencies/SDL/include/SDL3/SDL_thread.h +602 -0
- data/dependencies/SDL/include/SDL3/SDL_time.h +249 -0
- data/dependencies/SDL/include/SDL3/SDL_timer.h +454 -0
- data/dependencies/SDL/include/SDL3/SDL_touch.h +184 -0
- data/dependencies/SDL/include/SDL3/SDL_tray.h +544 -0
- data/dependencies/SDL/include/SDL3/SDL_version.h +198 -0
- data/dependencies/SDL/include/SDL3/SDL_video.h +3497 -0
- data/dependencies/SDL/include/SDL3/SDL_vulkan.h +287 -0
- data/dependencies/SDL/lib/x64/libSDL3.dll.a +0 -0
- data/dependencies/SDL/lib/x86/libSDL3.dll.a +0 -0
- data/dependencies/SDL_sound/SDL3_sound/SDL_sound.h +755 -0
- data/dependencies/SDL_sound/SDL_sound.c +136 -215
- data/dependencies/SDL_sound/SDL_sound_aiff.c +55 -54
- data/dependencies/SDL_sound/SDL_sound_au.c +32 -32
- data/dependencies/SDL_sound/SDL_sound_coreaudio.c +24 -41
- data/dependencies/SDL_sound/SDL_sound_flac.c +32 -12
- data/dependencies/SDL_sound/SDL_sound_internal.h +33 -48
- data/dependencies/SDL_sound/SDL_sound_modplug.c +21 -29
- data/dependencies/SDL_sound/SDL_sound_mp3.c +35 -13
- data/dependencies/SDL_sound/SDL_sound_raw.c +14 -15
- data/dependencies/SDL_sound/SDL_sound_shn.c +82 -82
- data/dependencies/SDL_sound/SDL_sound_voc.c +30 -30
- data/dependencies/SDL_sound/SDL_sound_vorbis.c +34 -25
- data/dependencies/SDL_sound/SDL_sound_wav.c +86 -82
- data/dependencies/SDL_sound/dr_flac.h +1890 -1301
- data/dependencies/SDL_sound/dr_mp3.h +1098 -660
- data/dependencies/SDL_sound/libmodplug/fastmix.c +1 -1
- data/dependencies/SDL_sound/libmodplug/libmodplug.h +5 -4
- data/dependencies/SDL_sound/libmodplug/load_ams.c +6 -3
- data/dependencies/SDL_sound/libmodplug/load_dsm.c +2 -1
- data/dependencies/SDL_sound/libmodplug/load_mt2.c +2 -2
- data/dependencies/SDL_sound/libmodplug/modplug.h +2 -1
- data/dependencies/SDL_sound/libmodplug/snd_fx.c +3 -3
- data/dependencies/SDL_sound/libmodplug/sndfile.c +3 -0
- data/dependencies/SDL_sound/libmodplug/sndmix.c +7 -3
- data/dependencies/SDL_sound/stb_vorbis.h +397 -342
- data/dependencies/mojoAL/AL/alc.h +2 -2
- data/dependencies/mojoAL/mojoal.c +2120 -1885
- data/dependencies/stb/stb_image.h +1190 -1379
- data/dependencies/stb/stb_image_write.h +329 -129
- data/dependencies/stb/stb_truetype.h +304 -60
- data/dependencies/utf8proc/utf8proc.c +133 -75
- data/dependencies/utf8proc/utf8proc.h +131 -50
- data/dependencies/utf8proc/utf8proc_data.h +16213 -15658
- data/ext/gosu-ffi/extconf.rb +103 -0
- data/ext/gosu-ffi/gosu-ffi.def +467 -0
- data/ffi/Gosu.cpp +330 -0
- data/ffi/Gosu.h +84 -0
- data/ffi/Gosu_Channel.cpp +62 -0
- data/ffi/Gosu_Channel.h +17 -0
- data/ffi/Gosu_Color.cpp +176 -0
- data/ffi/Gosu_Color.h +31 -0
- data/ffi/Gosu_Constants.cpp +334 -0
- data/ffi/Gosu_FFI.h +34 -0
- data/ffi/Gosu_FFI_internal.h +160 -0
- data/ffi/Gosu_Font.cpp +97 -0
- data/ffi/Gosu_Font.h +32 -0
- data/ffi/Gosu_Image.cpp +239 -0
- data/ffi/Gosu_Image.h +71 -0
- data/ffi/Gosu_Sample.cpp +29 -0
- data/ffi/Gosu_Sample.h +14 -0
- data/ffi/Gosu_Song.cpp +69 -0
- data/ffi/Gosu_Song.h +18 -0
- data/ffi/Gosu_TextInput.cpp +94 -0
- data/ffi/Gosu_TextInput.h +25 -0
- data/ffi/Gosu_Window.cpp +314 -0
- data/ffi/Gosu_Window.h +78 -0
- data/include/Gosu/Audio.hpp +6 -11
- data/include/Gosu/Bitmap.hpp +38 -53
- data/include/Gosu/Buffer.hpp +54 -0
- data/include/Gosu/Color.hpp +29 -36
- data/include/Gosu/Directories.hpp +25 -28
- data/include/Gosu/Drawable.hpp +58 -0
- data/include/Gosu/Font.hpp +6 -5
- data/include/Gosu/Fwd.hpp +4 -6
- data/include/Gosu/Gosu.hpp +5 -5
- data/include/Gosu/Graphics.hpp +53 -61
- data/include/Gosu/GraphicsBase.hpp +1 -11
- data/include/Gosu/Image.hpp +12 -15
- data/include/Gosu/Math.hpp +50 -72
- data/include/Gosu/Transform.hpp +32 -0
- data/include/Gosu/Utility.hpp +77 -1
- data/include/Gosu/Version.hpp +2 -2
- data/include/Gosu/Window.hpp +15 -9
- data/lib/SDL3.dll +0 -0
- data/lib/gosu/channel.rb +50 -0
- data/lib/gosu/color.rb +173 -0
- data/lib/gosu/compat.rb +130 -17
- data/lib/gosu/constants.rb +386 -0
- data/lib/gosu/ffi.rb +269 -0
- data/lib/gosu/font.rb +62 -0
- data/lib/gosu/gl_tex_info.rb +33 -0
- data/lib/gosu/gosu.rb +250 -0
- data/lib/gosu/image.rb +179 -0
- data/lib/gosu/numeric.rb +17 -0
- data/lib/gosu/preview.rb +6 -6
- data/lib/gosu/sample.rb +25 -0
- data/lib/gosu/song.rb +57 -0
- data/lib/gosu/text_input.rb +83 -0
- data/lib/gosu/window.rb +249 -0
- data/lib/gosu.rb +29 -8
- data/lib64/SDL3.dll +0 -0
- data/rdoc/gosu.rb +2 -2
- data/src/Audio.cpp +30 -24
- data/src/AudioFile.hpp +5 -4
- data/src/AudioFileAudioToolbox.cpp +8 -8
- data/src/AudioFileSDLSound.cpp +12 -15
- data/src/BinPacker.cpp +188 -0
- data/src/BinPacker.hpp +55 -0
- data/src/Bitmap.cpp +172 -143
- data/src/BitmapIO.cpp +60 -86
- data/src/Buffer.cpp +150 -0
- data/src/ClipRectStack.cpp +38 -0
- data/src/ClipRectStack.hpp +17 -83
- data/src/Color.cpp +75 -80
- data/src/Directories.cpp +47 -0
- data/src/DirectoriesUIKit.cpp +50 -0
- data/src/DrawOp.hpp +20 -18
- data/src/DrawOpQueue.hpp +27 -33
- data/src/Drawable.cpp +95 -0
- data/src/EmptyDrawable.hpp +38 -0
- data/src/FPS.cpp +31 -0
- data/src/Font.cpp +104 -74
- data/src/GosuGLView.cpp +13 -11
- data/src/GosuViewController.cpp +2 -10
- data/src/Graphics.cpp +86 -145
- data/src/GraphicsImpl.hpp +14 -68
- data/src/Image.cpp +41 -35
- data/src/Input.cpp +73 -78
- data/src/Macro.cpp +46 -29
- data/src/Macro.hpp +23 -17
- data/src/MarkupParser.cpp +5 -5
- data/src/Math.cpp +48 -22
- data/src/OffScreenTarget.cpp +47 -50
- data/src/OffScreenTarget.hpp +13 -11
- data/src/OpenGLContext.cpp +116 -0
- data/src/OpenGLContext.hpp +41 -0
- data/src/RenderState.hpp +49 -71
- data/src/Resolution.cpp +65 -53
- data/src/TexChunk.cpp +35 -80
- data/src/TexChunk.hpp +44 -35
- data/src/Text.cpp +1 -1
- data/src/TextBuilder.cpp +35 -21
- data/src/TextBuilder.hpp +6 -9
- data/src/TextInput.cpp +9 -9
- data/src/Texture.cpp +62 -80
- data/src/Texture.hpp +25 -23
- data/src/TiledDrawable.cpp +149 -0
- data/src/TiledDrawable.hpp +47 -0
- data/src/TimingApple.cpp +1 -1
- data/src/Transform.cpp +45 -50
- data/src/TransformStack.hpp +16 -16
- data/src/TrueTypeFont.cpp +59 -51
- data/src/TrueTypeFont.hpp +6 -7
- data/src/TrueTypeFontApple.cpp +28 -19
- data/src/TrueTypeFontUnix.cpp +39 -32
- data/src/TrueTypeFontWin.cpp +30 -30
- data/src/Utility.cpp +113 -37
- data/src/UtilityWin.cpp +49 -0
- data/src/Window.cpp +121 -151
- data/src/WindowUIKit.cpp +14 -14
- metadata +165 -118
- data/dependencies/SDL/include/SDL.h +0 -233
- data/dependencies/SDL/include/SDL_assert.h +0 -320
- data/dependencies/SDL/include/SDL_atomic.h +0 -415
- data/dependencies/SDL/include/SDL_audio.h +0 -1500
- data/dependencies/SDL/include/SDL_clipboard.h +0 -141
- data/dependencies/SDL/include/SDL_config.h +0 -331
- data/dependencies/SDL/include/SDL_cpuinfo.h +0 -594
- data/dependencies/SDL/include/SDL_endian.h +0 -348
- data/dependencies/SDL/include/SDL_error.h +0 -163
- data/dependencies/SDL/include/SDL_events.h +0 -1166
- data/dependencies/SDL/include/SDL_filesystem.h +0 -149
- data/dependencies/SDL/include/SDL_gamecontroller.h +0 -1074
- data/dependencies/SDL/include/SDL_gesture.h +0 -117
- data/dependencies/SDL/include/SDL_guid.h +0 -100
- data/dependencies/SDL/include/SDL_haptic.h +0 -1341
- data/dependencies/SDL/include/SDL_hidapi.h +0 -451
- data/dependencies/SDL/include/SDL_hints.h +0 -2569
- data/dependencies/SDL/include/SDL_joystick.h +0 -1066
- data/dependencies/SDL/include/SDL_keyboard.h +0 -353
- data/dependencies/SDL/include/SDL_keycode.h +0 -358
- data/dependencies/SDL/include/SDL_loadso.h +0 -115
- data/dependencies/SDL/include/SDL_log.h +0 -404
- data/dependencies/SDL/include/SDL_main.h +0 -275
- data/dependencies/SDL/include/SDL_mouse.h +0 -465
- data/dependencies/SDL/include/SDL_mutex.h +0 -471
- data/dependencies/SDL/include/SDL_name.h +0 -33
- data/dependencies/SDL/include/SDL_pixels.h +0 -644
- data/dependencies/SDL/include/SDL_platform.h +0 -261
- data/dependencies/SDL/include/SDL_quit.h +0 -58
- data/dependencies/SDL/include/SDL_rect.h +0 -376
- data/dependencies/SDL/include/SDL_render.h +0 -1919
- data/dependencies/SDL/include/SDL_revision.h +0 -7
- data/dependencies/SDL/include/SDL_rwops.h +0 -841
- data/dependencies/SDL/include/SDL_sensor.h +0 -322
- data/dependencies/SDL/include/SDL_shape.h +0 -155
- data/dependencies/SDL/include/SDL_stdinc.h +0 -830
- data/dependencies/SDL/include/SDL_surface.h +0 -997
- data/dependencies/SDL/include/SDL_system.h +0 -623
- data/dependencies/SDL/include/SDL_syswm.h +0 -386
- data/dependencies/SDL/include/SDL_test_images.h +0 -78
- data/dependencies/SDL/include/SDL_test_random.h +0 -115
- data/dependencies/SDL/include/SDL_thread.h +0 -464
- data/dependencies/SDL/include/SDL_timer.h +0 -222
- data/dependencies/SDL/include/SDL_touch.h +0 -150
- data/dependencies/SDL/include/SDL_version.h +0 -204
- data/dependencies/SDL/include/SDL_video.h +0 -2150
- data/dependencies/SDL/include/SDL_vulkan.h +0 -215
- data/dependencies/SDL/include/begin_code.h +0 -187
- data/dependencies/SDL/lib/x64/libSDL2.dll.a +0 -0
- data/dependencies/SDL/lib/x86/libSDL2.dll.a +0 -0
- data/dependencies/SDL_sound/SDL_sound.h +0 -725
- data/ext/gosu/extconf.rb +0 -119
- data/include/Gosu/IO.hpp +0 -254
- data/include/Gosu/ImageData.hpp +0 -53
- data/include/Gosu/Inspection.hpp +0 -7
- data/lib/SDL2.dll +0 -0
- data/lib/gosu/patches.rb +0 -66
- data/lib/gosu/run.rb +0 -20
- data/lib/gosu/swig_patches.rb +0 -110
- data/lib64/SDL2.dll +0 -0
- data/src/BlockAllocator.cpp +0 -131
- data/src/BlockAllocator.hpp +0 -32
- data/src/DirectoriesApple.cpp +0 -69
- data/src/DirectoriesUnix.cpp +0 -46
- data/src/DirectoriesWin.cpp +0 -65
- data/src/EmptyImageData.hpp +0 -52
- data/src/FileUnix.cpp +0 -99
- data/src/FileWin.cpp +0 -88
- data/src/IO.cpp +0 -60
- data/src/Iconv.hpp +0 -51
- data/src/Inspection.cpp +0 -27
- data/src/LargeImageData.cpp +0 -215
- data/src/LargeImageData.hpp +0 -39
- data/src/Log.hpp +0 -19
- data/src/RubyGosu.cxx +0 -13100
- data/src/RubyGosu.h +0 -49
- data/src/WinUtility.cpp +0 -61
- data/src/WinUtility.hpp +0 -27
- /data/dependencies/SDL/include/{SDL_opengles2_gl2.h → SDL3/SDL_opengles2_gl2.h} +0 -0
- /data/dependencies/SDL/include/{SDL_opengles2_gl2ext.h → SDL3/SDL_opengles2_gl2ext.h} +0 -0
- /data/dependencies/SDL/include/{SDL_opengles2_gl2platform.h → SDL3/SDL_opengles2_gl2platform.h} +0 -0
- /data/dependencies/SDL/include/{SDL_opengles2_khrplatform.h → SDL3/SDL_opengles2_khrplatform.h} +0 -0
|
@@ -162,30 +162,30 @@ static Uint32 SANE_to_Uint32 (Uint8 *sanebuf)
|
|
|
162
162
|
* Read in a comm_t from disk. This makes this process safe regardless of
|
|
163
163
|
* the processor's byte order or how the comm_t structure is packed.
|
|
164
164
|
*/
|
|
165
|
-
static int read_comm_chunk(
|
|
165
|
+
static int read_comm_chunk(SDL_IOStream *io, comm_t *comm)
|
|
166
166
|
{
|
|
167
167
|
Uint8 sampleRate[10];
|
|
168
168
|
|
|
169
169
|
/* skip reading the chunk ID, since it was already read at this point... */
|
|
170
170
|
comm->ckID = commID;
|
|
171
171
|
|
|
172
|
-
if (
|
|
172
|
+
if (SDL_ReadIO(io, &comm->ckDataSize, sizeof (comm->ckDataSize)) != sizeof (comm->ckDataSize))
|
|
173
173
|
return 0;
|
|
174
|
-
comm->ckDataSize =
|
|
174
|
+
comm->ckDataSize = SDL_Swap32BE(comm->ckDataSize);
|
|
175
175
|
|
|
176
|
-
if (
|
|
176
|
+
if (SDL_ReadIO(io, &comm->numChannels, sizeof (comm->numChannels)) != sizeof (comm->numChannels))
|
|
177
177
|
return 0;
|
|
178
|
-
comm->numChannels =
|
|
178
|
+
comm->numChannels = SDL_Swap16BE(comm->numChannels);
|
|
179
179
|
|
|
180
|
-
if (
|
|
180
|
+
if (SDL_ReadIO(io, &comm->numSampleFrames, sizeof (comm->numSampleFrames)) != sizeof (comm->numSampleFrames))
|
|
181
181
|
return 0;
|
|
182
|
-
comm->numSampleFrames =
|
|
182
|
+
comm->numSampleFrames = SDL_Swap32BE(comm->numSampleFrames);
|
|
183
183
|
|
|
184
|
-
if (
|
|
184
|
+
if (SDL_ReadIO(io, &comm->sampleSize, sizeof (comm->sampleSize)) != sizeof (comm->sampleSize))
|
|
185
185
|
return 0;
|
|
186
|
-
comm->sampleSize =
|
|
186
|
+
comm->sampleSize = SDL_Swap16BE(comm->sampleSize);
|
|
187
187
|
|
|
188
|
-
if (
|
|
188
|
+
if (SDL_ReadIO(io, sampleRate, sizeof (sampleRate)) != sizeof (sampleRate))
|
|
189
189
|
return 0;
|
|
190
190
|
comm->sampleRate = SANE_to_Uint32(sampleRate);
|
|
191
191
|
|
|
@@ -194,10 +194,10 @@ static int read_comm_chunk(SDL_RWops *rw, comm_t *comm)
|
|
|
194
194
|
+ sizeof(comm->sampleSize)
|
|
195
195
|
+ sizeof(sampleRate))
|
|
196
196
|
{
|
|
197
|
-
if (
|
|
198
|
-
sizeof (comm->compressionType)
|
|
197
|
+
if (SDL_ReadIO(io, &comm->compressionType,
|
|
198
|
+
sizeof (comm->compressionType)) != sizeof (comm->compressionType))
|
|
199
199
|
return 0;
|
|
200
|
-
comm->compressionType =
|
|
200
|
+
comm->compressionType = SDL_Swap32BE(comm->compressionType);
|
|
201
201
|
} /* if */
|
|
202
202
|
else
|
|
203
203
|
{
|
|
@@ -226,25 +226,25 @@ typedef struct
|
|
|
226
226
|
} ssnd_t;
|
|
227
227
|
|
|
228
228
|
|
|
229
|
-
static int read_ssnd_chunk(
|
|
229
|
+
static int read_ssnd_chunk(SDL_IOStream *io, ssnd_t *ssnd)
|
|
230
230
|
{
|
|
231
231
|
/* skip reading the chunk ID, since it was already read at this point... */
|
|
232
232
|
ssnd->ckID = ssndID;
|
|
233
233
|
|
|
234
|
-
if (
|
|
234
|
+
if (SDL_ReadIO(io, &ssnd->ckDataSize, sizeof (ssnd->ckDataSize)) != sizeof (ssnd->ckDataSize))
|
|
235
235
|
return 0;
|
|
236
|
-
ssnd->ckDataSize =
|
|
236
|
+
ssnd->ckDataSize = SDL_Swap32BE(ssnd->ckDataSize);
|
|
237
237
|
|
|
238
|
-
if (
|
|
238
|
+
if (SDL_ReadIO(io, &ssnd->offset, sizeof (ssnd->offset)) != sizeof (ssnd->offset))
|
|
239
239
|
return 0;
|
|
240
|
-
ssnd->offset =
|
|
240
|
+
ssnd->offset = SDL_Swap32BE(ssnd->offset);
|
|
241
241
|
|
|
242
|
-
if (
|
|
242
|
+
if (SDL_ReadIO(io, &ssnd->blockSize, sizeof (ssnd->blockSize)) != sizeof (ssnd->blockSize))
|
|
243
243
|
return 0;
|
|
244
|
-
ssnd->blockSize =
|
|
244
|
+
ssnd->blockSize = SDL_Swap32BE(ssnd->blockSize);
|
|
245
245
|
|
|
246
|
-
/* Leave the
|
|
247
|
-
if (
|
|
246
|
+
/* Leave the SDL_IOStream position indicator at the start of the samples */
|
|
247
|
+
if (SDL_SeekIO(io, ssnd->offset, SDL_IO_SEEK_CUR) == -1)
|
|
248
248
|
return 0;
|
|
249
249
|
|
|
250
250
|
return 1;
|
|
@@ -269,7 +269,7 @@ static Uint32 read_sample_fmt_normal(Sound_Sample *sample)
|
|
|
269
269
|
* We don't actually do any decoding, so we read the AIFF data
|
|
270
270
|
* directly into the internal buffer...
|
|
271
271
|
*/
|
|
272
|
-
retval =
|
|
272
|
+
retval = SDL_ReadIO(internal->io, internal->buffer, max);
|
|
273
273
|
|
|
274
274
|
a->bytesLeft -= retval;
|
|
275
275
|
|
|
@@ -302,7 +302,7 @@ static int seek_sample_fmt_normal(Sound_Sample *sample, Uint32 ms)
|
|
|
302
302
|
const fmt_t *fmt = &a->fmt;
|
|
303
303
|
const Uint32 offset = __Sound_convertMsToBytePos(&sample->actual, ms);
|
|
304
304
|
const Sint64 pos = (Sint64) (fmt->data_starting_offset + offset);
|
|
305
|
-
const Sint64 rc =
|
|
305
|
+
const Sint64 rc = SDL_SeekIO(internal->io, pos, SDL_IO_SEEK_SET);
|
|
306
306
|
BAIL_IF_MACRO(rc != pos, ERR_IO_ERROR, 0);
|
|
307
307
|
a->bytesLeft = fmt->total_bytes - offset;
|
|
308
308
|
return 1; /* success. */
|
|
@@ -315,9 +315,9 @@ static void free_fmt_normal(fmt_t *fmt)
|
|
|
315
315
|
} /* free_fmt_normal */
|
|
316
316
|
|
|
317
317
|
|
|
318
|
-
static int read_fmt_normal(
|
|
318
|
+
static int read_fmt_normal(SDL_IOStream *io, fmt_t *fmt)
|
|
319
319
|
{
|
|
320
|
-
/* (don't need to read more from the
|
|
320
|
+
/* (don't need to read more from the SDL_IOStream...) */
|
|
321
321
|
fmt->free = free_fmt_normal;
|
|
322
322
|
fmt->read_sample = read_sample_fmt_normal;
|
|
323
323
|
fmt->rewind_sample = rewind_sample_fmt_normal;
|
|
@@ -332,9 +332,9 @@ static int read_fmt_normal(SDL_RWops *rw, fmt_t *fmt)
|
|
|
332
332
|
* Everything else... *
|
|
333
333
|
*****************************************************************************/
|
|
334
334
|
|
|
335
|
-
static
|
|
335
|
+
static bool AIFF_init(void)
|
|
336
336
|
{
|
|
337
|
-
return
|
|
337
|
+
return true; /* always succeeds. */
|
|
338
338
|
} /* AIFF_init */
|
|
339
339
|
|
|
340
340
|
|
|
@@ -344,28 +344,28 @@ static void AIFF_quit(void)
|
|
|
344
344
|
} /* AIFF_quit */
|
|
345
345
|
|
|
346
346
|
|
|
347
|
-
static int find_chunk(
|
|
347
|
+
static int find_chunk(SDL_IOStream *io, Uint32 id)
|
|
348
348
|
{
|
|
349
349
|
Sint32 siz = 0;
|
|
350
350
|
Uint32 _id = 0;
|
|
351
351
|
|
|
352
352
|
while (1)
|
|
353
353
|
{
|
|
354
|
-
BAIL_IF_MACRO(
|
|
355
|
-
if (
|
|
354
|
+
BAIL_IF_MACRO(SDL_ReadIO(io, &_id, sizeof (_id)) != sizeof (_id), NULL, 0);
|
|
355
|
+
if (SDL_Swap32LE(_id) == id)
|
|
356
356
|
return 1;
|
|
357
357
|
|
|
358
|
-
BAIL_IF_MACRO(
|
|
359
|
-
siz =
|
|
358
|
+
BAIL_IF_MACRO(SDL_ReadIO(io, &siz, sizeof (siz)) != sizeof (siz), NULL, 0);
|
|
359
|
+
siz = SDL_Swap32BE(siz);
|
|
360
360
|
SDL_assert(siz > 0);
|
|
361
|
-
BAIL_IF_MACRO(
|
|
361
|
+
BAIL_IF_MACRO(SDL_SeekIO(io, siz, SDL_IO_SEEK_CUR) == -1, NULL, 0);
|
|
362
362
|
} /* while */
|
|
363
363
|
|
|
364
364
|
return 0; /* shouldn't hit this, but just in case... */
|
|
365
365
|
} /* find_chunk */
|
|
366
366
|
|
|
367
367
|
|
|
368
|
-
static int read_fmt(
|
|
368
|
+
static int read_fmt(SDL_IOStream *io, comm_t *c, fmt_t *fmt)
|
|
369
369
|
{
|
|
370
370
|
fmt->type = c->compressionType;
|
|
371
371
|
|
|
@@ -374,7 +374,7 @@ static int read_fmt(SDL_RWops *rw, comm_t *c, fmt_t *fmt)
|
|
|
374
374
|
{
|
|
375
375
|
case noneID:
|
|
376
376
|
SNDDBG(("AIFF: Appears to be uncompressed audio.\n"));
|
|
377
|
-
return read_fmt_normal(
|
|
377
|
+
return read_fmt_normal(io, fmt);
|
|
378
378
|
|
|
379
379
|
/* add other types here. */
|
|
380
380
|
|
|
@@ -389,7 +389,7 @@ static int read_fmt(SDL_RWops *rw, comm_t *c, fmt_t *fmt)
|
|
|
389
389
|
static int AIFF_open(Sound_Sample *sample, const char *ext)
|
|
390
390
|
{
|
|
391
391
|
Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
|
|
392
|
-
|
|
392
|
+
SDL_IOStream *io = internal->io;
|
|
393
393
|
Uint32 chunk_id;
|
|
394
394
|
Uint32 bytes_per_sample;
|
|
395
395
|
Sint64 pos;
|
|
@@ -397,33 +397,35 @@ static int AIFF_open(Sound_Sample *sample, const char *ext)
|
|
|
397
397
|
ssnd_t s;
|
|
398
398
|
aiff_t *a;
|
|
399
399
|
|
|
400
|
-
|
|
401
|
-
|
|
400
|
+
Uint32 value = 0;
|
|
401
|
+
SDL_ReadU32LE(io, &value);
|
|
402
|
+
BAIL_IF_MACRO(value != formID, "AIFF: Not a FORM file.", 0);
|
|
403
|
+
SDL_ReadU32BE(io, &value); /* throw the length away; we don't need it. */
|
|
402
404
|
|
|
403
|
-
chunk_id
|
|
405
|
+
SDL_ReadU32LE(io, &chunk_id);
|
|
404
406
|
BAIL_IF_MACRO(chunk_id != aiffID && chunk_id != aifcID,
|
|
405
407
|
"AIFF: Not an AIFF or AIFC file.", 0);
|
|
406
408
|
|
|
407
409
|
/* Chunks may appear in any order, so we establish base camp here. */
|
|
408
|
-
pos =
|
|
410
|
+
pos = SDL_TellIO(io);
|
|
409
411
|
|
|
410
|
-
BAIL_IF_MACRO(!find_chunk(
|
|
411
|
-
BAIL_IF_MACRO(!read_comm_chunk(
|
|
412
|
+
BAIL_IF_MACRO(!find_chunk(io, commID), "AIFF: No common chunk.", 0);
|
|
413
|
+
BAIL_IF_MACRO(!read_comm_chunk(io, &c),
|
|
412
414
|
"AIFF: Can't read common chunk.", 0);
|
|
413
415
|
|
|
414
416
|
BAIL_IF_MACRO(c.numChannels == 0, "AIFF: no channels specified.", 0);
|
|
415
417
|
|
|
416
418
|
sample->actual.channels = (Uint8) c.numChannels;
|
|
417
|
-
sample->actual.
|
|
419
|
+
sample->actual.freq = c.sampleRate;
|
|
418
420
|
|
|
419
421
|
if (c.sampleSize <= 8)
|
|
420
422
|
{
|
|
421
|
-
sample->actual.format =
|
|
423
|
+
sample->actual.format = SDL_AUDIO_S8;
|
|
422
424
|
bytes_per_sample = c.numChannels;
|
|
423
425
|
} /* if */
|
|
424
426
|
else if (c.sampleSize <= 16)
|
|
425
427
|
{
|
|
426
|
-
sample->actual.format =
|
|
428
|
+
sample->actual.format = SDL_AUDIO_S16BE;
|
|
427
429
|
bytes_per_sample = 2 * c.numChannels;
|
|
428
430
|
} /* if */
|
|
429
431
|
else
|
|
@@ -436,21 +438,21 @@ static int AIFF_open(Sound_Sample *sample, const char *ext)
|
|
|
436
438
|
a = (aiff_t *) SDL_malloc(sizeof(aiff_t));
|
|
437
439
|
BAIL_IF_MACRO(a == NULL, ERR_OUT_OF_MEMORY, 0);
|
|
438
440
|
|
|
439
|
-
if (!read_fmt(
|
|
441
|
+
if (!read_fmt(io, &c, &(a->fmt)))
|
|
440
442
|
{
|
|
441
443
|
SDL_free(a);
|
|
442
444
|
return 0;
|
|
443
445
|
} /* if */
|
|
444
446
|
|
|
445
|
-
|
|
447
|
+
SDL_SeekIO(io, pos, SDL_IO_SEEK_SET); /* if the seek fails, let it go... */
|
|
446
448
|
|
|
447
|
-
if (!find_chunk(
|
|
449
|
+
if (!find_chunk(io, ssndID))
|
|
448
450
|
{
|
|
449
451
|
SDL_free(a);
|
|
450
452
|
BAIL_MACRO("AIFF: No sound data chunk.", 0);
|
|
451
453
|
} /* if */
|
|
452
454
|
|
|
453
|
-
if (!read_ssnd_chunk(
|
|
455
|
+
if (!read_ssnd_chunk(io, &s))
|
|
454
456
|
{
|
|
455
457
|
SDL_free(a);
|
|
456
458
|
BAIL_MACRO("AIFF: Can't read sound data chunk.", 0);
|
|
@@ -465,7 +467,7 @@ static int AIFF_open(Sound_Sample *sample, const char *ext)
|
|
|
465
467
|
|
|
466
468
|
|
|
467
469
|
a->fmt.total_bytes = a->bytesLeft = bytes_per_sample * c.numSampleFrames;
|
|
468
|
-
a->fmt.data_starting_offset =
|
|
470
|
+
a->fmt.data_starting_offset = SDL_TellIO(io);
|
|
469
471
|
internal->decoder_private = (void *) a;
|
|
470
472
|
|
|
471
473
|
sample->flags = SOUND_SAMPLEFLAG_CANSEEK;
|
|
@@ -491,13 +493,12 @@ static Uint32 AIFF_read(Sound_Sample *sample)
|
|
|
491
493
|
return a->fmt.read_sample(sample);
|
|
492
494
|
} /* AIFF_read */
|
|
493
495
|
|
|
494
|
-
|
|
495
496
|
static int AIFF_rewind(Sound_Sample *sample)
|
|
496
497
|
{
|
|
497
498
|
Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
|
|
498
499
|
aiff_t *a = (aiff_t *) internal->decoder_private;
|
|
499
500
|
const fmt_t *fmt = &a->fmt;
|
|
500
|
-
const Sint64 rc =
|
|
501
|
+
const Sint64 rc = SDL_SeekIO(internal->io, fmt->data_starting_offset, SDL_IO_SEEK_SET);
|
|
501
502
|
BAIL_IF_MACRO(rc != fmt->data_starting_offset, ERR_IO_ERROR, 0);
|
|
502
503
|
a->bytesLeft = fmt->total_bytes;
|
|
503
504
|
return fmt->rewind_sample(sample);
|
|
@@ -517,7 +518,7 @@ const Sound_DecoderFunctions __Sound_DecoderFunctions_AIFF =
|
|
|
517
518
|
{
|
|
518
519
|
extensions_aiff,
|
|
519
520
|
"Audio Interchange File Format",
|
|
520
|
-
"
|
|
521
|
+
"Torbjörn Andersson <d91tan@Update.UU.SE>",
|
|
521
522
|
"https://icculus.org/SDL_sound/"
|
|
522
523
|
},
|
|
523
524
|
|
|
@@ -18,9 +18,9 @@
|
|
|
18
18
|
#if SOUND_SUPPORTS_AU
|
|
19
19
|
|
|
20
20
|
/* no init/deinit needed */
|
|
21
|
-
static
|
|
21
|
+
static bool AU_init(void)
|
|
22
22
|
{
|
|
23
|
-
return
|
|
23
|
+
return true;
|
|
24
24
|
} /* AU_init */
|
|
25
25
|
|
|
26
26
|
static void AU_quit(void)
|
|
@@ -73,31 +73,31 @@ struct audec
|
|
|
73
73
|
* regardless of the processor's byte order or how the au_file_hdr
|
|
74
74
|
* structure is packed.
|
|
75
75
|
*/
|
|
76
|
-
static int read_au_header(
|
|
76
|
+
static int read_au_header(SDL_IOStream *io, struct au_file_hdr *hdr)
|
|
77
77
|
{
|
|
78
|
-
if (
|
|
78
|
+
if (SDL_ReadIO(io, &hdr->magic, sizeof(hdr->magic)) != sizeof(hdr->magic))
|
|
79
79
|
return 0;
|
|
80
|
-
hdr->magic =
|
|
80
|
+
hdr->magic = SDL_Swap32BE(hdr->magic);
|
|
81
81
|
|
|
82
|
-
if (
|
|
82
|
+
if (SDL_ReadIO(io, &hdr->hdr_size, sizeof(hdr->hdr_size)) != sizeof(hdr->hdr_size))
|
|
83
83
|
return 0;
|
|
84
|
-
hdr->hdr_size =
|
|
84
|
+
hdr->hdr_size = SDL_Swap32BE(hdr->hdr_size);
|
|
85
85
|
|
|
86
|
-
if (
|
|
86
|
+
if (SDL_ReadIO(io, &hdr->data_size, sizeof(hdr->data_size)) != sizeof(hdr->data_size))
|
|
87
87
|
return 0;
|
|
88
|
-
hdr->data_size =
|
|
88
|
+
hdr->data_size = SDL_Swap32BE(hdr->data_size);
|
|
89
89
|
|
|
90
|
-
if (
|
|
90
|
+
if (SDL_ReadIO(io, &hdr->encoding, sizeof(hdr->encoding)) != sizeof(hdr->encoding))
|
|
91
91
|
return 0;
|
|
92
|
-
hdr->encoding =
|
|
92
|
+
hdr->encoding = SDL_Swap32BE(hdr->encoding);
|
|
93
93
|
|
|
94
|
-
if (
|
|
94
|
+
if (SDL_ReadIO(io, &hdr->sample_rate, sizeof(hdr->sample_rate)) != sizeof(hdr->sample_rate))
|
|
95
95
|
return 0;
|
|
96
|
-
hdr->sample_rate =
|
|
96
|
+
hdr->sample_rate = SDL_Swap32BE(hdr->sample_rate);
|
|
97
97
|
|
|
98
|
-
if (
|
|
98
|
+
if (SDL_ReadIO(io, &hdr->channels, sizeof(hdr->channels)) != sizeof(hdr->channels))
|
|
99
99
|
return 0;
|
|
100
|
-
hdr->channels =
|
|
100
|
+
hdr->channels = SDL_Swap32BE(hdr->channels);
|
|
101
101
|
|
|
102
102
|
return 1;
|
|
103
103
|
} /* read_au_header */
|
|
@@ -108,14 +108,14 @@ static int read_au_header(SDL_RWops *rw, struct au_file_hdr *hdr)
|
|
|
108
108
|
static int AU_open(Sound_Sample *sample, const char *ext)
|
|
109
109
|
{
|
|
110
110
|
Sound_SampleInternal *internal = sample->opaque;
|
|
111
|
-
|
|
111
|
+
SDL_IOStream *io = internal->io;
|
|
112
112
|
int hsize, i, bytes_per_second;
|
|
113
113
|
struct au_file_hdr hdr;
|
|
114
114
|
struct audec *dec;
|
|
115
115
|
char c;
|
|
116
116
|
|
|
117
117
|
/* read_au_header() will do byte order swapping. */
|
|
118
|
-
BAIL_IF_MACRO(!read_au_header(
|
|
118
|
+
BAIL_IF_MACRO(!read_au_header(io, &hdr), "AU: bad header", 0);
|
|
119
119
|
|
|
120
120
|
dec = SDL_malloc(sizeof *dec);
|
|
121
121
|
BAIL_IF_MACRO(dec == NULL, ERR_OUT_OF_MEMORY, 0);
|
|
@@ -131,15 +131,15 @@ static int AU_open(Sound_Sample *sample, const char *ext)
|
|
|
131
131
|
/* Convert 8-bit µ-law to 16-bit linear on the fly. This is
|
|
132
132
|
slightly wasteful if the audio driver must convert them
|
|
133
133
|
back, but µ-law only devices are rare (mostly _old_ Suns) */
|
|
134
|
-
sample->actual.format =
|
|
134
|
+
sample->actual.format = SDL_AUDIO_S16;
|
|
135
135
|
break;
|
|
136
136
|
|
|
137
137
|
case AU_ENC_LINEAR_8:
|
|
138
|
-
sample->actual.format =
|
|
138
|
+
sample->actual.format = SDL_AUDIO_S8;
|
|
139
139
|
break;
|
|
140
140
|
|
|
141
141
|
case AU_ENC_LINEAR_16:
|
|
142
|
-
sample->actual.format =
|
|
142
|
+
sample->actual.format = SDL_AUDIO_S16BE;
|
|
143
143
|
break;
|
|
144
144
|
|
|
145
145
|
default:
|
|
@@ -147,7 +147,7 @@ static int AU_open(Sound_Sample *sample, const char *ext)
|
|
|
147
147
|
BAIL_MACRO("AU: Unsupported .au encoding", 0);
|
|
148
148
|
} /* switch */
|
|
149
149
|
|
|
150
|
-
sample->actual.
|
|
150
|
+
sample->actual.freq = hdr.sample_rate;
|
|
151
151
|
sample->actual.channels = hdr.channels;
|
|
152
152
|
dec->remaining = hdr.data_size;
|
|
153
153
|
hsize = hdr.hdr_size;
|
|
@@ -155,7 +155,7 @@ static int AU_open(Sound_Sample *sample, const char *ext)
|
|
|
155
155
|
/* skip remaining part of header (input may be unseekable) */
|
|
156
156
|
for (i = HDR_SIZE; i < hsize; i++)
|
|
157
157
|
{
|
|
158
|
-
if (
|
|
158
|
+
if (SDL_ReadIO(io, &c, 1) != 1)
|
|
159
159
|
{
|
|
160
160
|
SDL_free(dec);
|
|
161
161
|
BAIL_MACRO(ERR_IO_ERROR, 0);
|
|
@@ -173,11 +173,11 @@ static int AU_open(Sound_Sample *sample, const char *ext)
|
|
|
173
173
|
|
|
174
174
|
SNDDBG(("AU: Invalid header, assuming raw 8kHz µ-law.\n"));
|
|
175
175
|
/* if seeking fails, we lose 24 samples. big deal */
|
|
176
|
-
|
|
176
|
+
SDL_SeekIO(io, -HDR_SIZE, SDL_IO_SEEK_CUR);
|
|
177
177
|
dec->encoding = AU_ENC_ULAW_8;
|
|
178
178
|
dec->remaining = (Uint32)-1; /* no limit */
|
|
179
|
-
sample->actual.format =
|
|
180
|
-
sample->actual.
|
|
179
|
+
sample->actual.format = SDL_AUDIO_S16;
|
|
180
|
+
sample->actual.freq = 8000;
|
|
181
181
|
sample->actual.channels = 1;
|
|
182
182
|
} /* else if */
|
|
183
183
|
|
|
@@ -185,10 +185,10 @@ static int AU_open(Sound_Sample *sample, const char *ext)
|
|
|
185
185
|
{
|
|
186
186
|
SDL_free(dec);
|
|
187
187
|
BAIL_MACRO("AU: Not an .AU stream.", 0);
|
|
188
|
-
} /* else */
|
|
188
|
+
} /* else */
|
|
189
189
|
|
|
190
190
|
bytes_per_second = ( ( dec->encoding == AU_ENC_LINEAR_16 ) ? 2 : 1 )
|
|
191
|
-
* sample->actual.
|
|
191
|
+
* sample->actual.freq * sample->actual.channels ;
|
|
192
192
|
internal->total_time = ((dec->remaining == -1) ? (-1) :
|
|
193
193
|
( ( dec->remaining / bytes_per_second ) * 1000 ) +
|
|
194
194
|
( ( dec->remaining % bytes_per_second ) * 1000 /
|
|
@@ -196,7 +196,7 @@ static int AU_open(Sound_Sample *sample, const char *ext)
|
|
|
196
196
|
|
|
197
197
|
sample->flags = SOUND_SAMPLEFLAG_CANSEEK;
|
|
198
198
|
dec->total = dec->remaining;
|
|
199
|
-
dec->start_offset =
|
|
199
|
+
dec->start_offset = SDL_TellIO(io);
|
|
200
200
|
|
|
201
201
|
SNDDBG(("AU: Accepting data stream.\n"));
|
|
202
202
|
return 1;
|
|
@@ -212,7 +212,7 @@ static void AU_close(Sound_Sample *sample)
|
|
|
212
212
|
|
|
213
213
|
/* table to convert from µ-law encoding to signed 16-bit samples,
|
|
214
214
|
generated by a throwaway perl script */
|
|
215
|
-
static Sint16 ulaw_to_linear[256] = {
|
|
215
|
+
static const Sint16 ulaw_to_linear[256] = {
|
|
216
216
|
-32124,-31100,-30076,-29052,-28028,-27004,-25980,-24956,
|
|
217
217
|
-23932,-22908,-21884,-20860,-19836,-18812,-17788,-16764,
|
|
218
218
|
-15996,-15484,-14972,-14460,-13948,-13436,-12924,-12412,
|
|
@@ -268,7 +268,7 @@ static Uint32 AU_read(Sound_Sample *sample)
|
|
|
268
268
|
|
|
269
269
|
if (maxlen > dec->remaining)
|
|
270
270
|
maxlen = dec->remaining;
|
|
271
|
-
ret =
|
|
271
|
+
ret = SDL_ReadIO(internal->io, buf, maxlen);
|
|
272
272
|
if (ret == 0)
|
|
273
273
|
sample->flags |= SOUND_SAMPLEFLAG_EOF;
|
|
274
274
|
else if (ret == -1) /** FIXME: this error check is broken **/
|
|
@@ -297,7 +297,7 @@ static int AU_rewind(Sound_Sample *sample)
|
|
|
297
297
|
{
|
|
298
298
|
Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
|
|
299
299
|
struct audec *dec = (struct audec *) internal->decoder_private;
|
|
300
|
-
const Sint64 rc =
|
|
300
|
+
const Sint64 rc = SDL_SeekIO(internal->io, dec->start_offset, SDL_IO_SEEK_SET);
|
|
301
301
|
BAIL_IF_MACRO(rc != dec->start_offset, ERR_IO_ERROR, 0);
|
|
302
302
|
dec->remaining = dec->total;
|
|
303
303
|
return 1;
|
|
@@ -316,7 +316,7 @@ static int AU_seek(Sound_Sample *sample, Uint32 ms)
|
|
|
316
316
|
offset >>= 1; /* halve the byte offset for compression. */
|
|
317
317
|
|
|
318
318
|
pos = (dec->start_offset + offset);
|
|
319
|
-
rc =
|
|
319
|
+
rc = SDL_SeekIO(internal->io, pos, SDL_IO_SEEK_SET);
|
|
320
320
|
BAIL_IF_MACRO(rc != pos, ERR_IO_ERROR, 0);
|
|
321
321
|
dec->remaining = dec->total - offset;
|
|
322
322
|
return 1;
|
|
@@ -22,9 +22,9 @@ typedef struct CoreAudioFileContainer
|
|
|
22
22
|
} CoreAudioFileContainer;
|
|
23
23
|
|
|
24
24
|
|
|
25
|
-
static
|
|
25
|
+
static bool CoreAudio_init(void)
|
|
26
26
|
{
|
|
27
|
-
return
|
|
27
|
+
return true; /* always succeeds. */
|
|
28
28
|
} /* CoreAudio_init */
|
|
29
29
|
|
|
30
30
|
|
|
@@ -158,7 +158,7 @@ static AudioFileTypeID CoreAudio_GetAudioTypeForExtension(const char* file_exten
|
|
|
158
158
|
static const char* CoreAudio_FourCCToString(Sint32 error_code)
|
|
159
159
|
{
|
|
160
160
|
static char return_string[16];
|
|
161
|
-
Uint32 big_endian_code =
|
|
161
|
+
Uint32 big_endian_code = SDL_Swap32BE((Uint32)error_code);
|
|
162
162
|
char* big_endian_str = (char*)&big_endian_code;
|
|
163
163
|
// see if it appears to be a 4-char-code
|
|
164
164
|
if(isprint(big_endian_str[0])
|
|
@@ -191,10 +191,10 @@ static const char* CoreAudio_FourCCToString(Sint32 error_code)
|
|
|
191
191
|
|
|
192
192
|
SInt64 CoreAudio_SizeCallback(void* inClientData)
|
|
193
193
|
{
|
|
194
|
-
|
|
195
|
-
const Sint64 current_position =
|
|
196
|
-
const Sint64 end_position =
|
|
197
|
-
|
|
194
|
+
SDL_IOStream *io = (SDL_IOStream *) inClientData;
|
|
195
|
+
const Sint64 current_position = SDL_TellIO(io);
|
|
196
|
+
const Sint64 end_position = SDL_SeekIO(io, 0, SDL_IO_SEEK_END);
|
|
197
|
+
SDL_SeekIO(io, current_position, SDL_IO_SEEK_SET);
|
|
198
198
|
// fprintf(stderr, "CoreAudio_SizeCallback:%d\n", end_position);
|
|
199
199
|
return end_position;
|
|
200
200
|
}
|
|
@@ -207,10 +207,10 @@ OSStatus CoreAudio_ReadCallback(
|
|
|
207
207
|
UInt32* actualCount
|
|
208
208
|
)
|
|
209
209
|
{
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
size_t bytes_actually_read =
|
|
213
|
-
// Not sure how to test for a read error with
|
|
210
|
+
SDL_IOStream* io = (SDL_IOStream *) inClientData;
|
|
211
|
+
SDL_SeekIO(io, inPosition, SDL_IO_SEEK_SET);
|
|
212
|
+
size_t bytes_actually_read = SDL_ReadIO(io, data_buffer, requestCount);
|
|
213
|
+
// Not sure how to test for a read error with SDL_IOStream
|
|
214
214
|
// fprintf(stderr, "CoreAudio_ReadCallback:%d, %d\n", requestCount, bytes_actually_read);
|
|
215
215
|
|
|
216
216
|
*actualCount = bytes_actually_read;
|
|
@@ -236,7 +236,7 @@ static int CoreAudio_open(Sound_Sample *sample, const char *ext)
|
|
|
236
236
|
BAIL_IF_MACRO(audio_file_id == NULL, ERR_OUT_OF_MEMORY, 0);
|
|
237
237
|
|
|
238
238
|
error_result = AudioFileOpenWithCallbacks(
|
|
239
|
-
internal->
|
|
239
|
+
internal->io,
|
|
240
240
|
CoreAudio_ReadCallback,
|
|
241
241
|
NULL,
|
|
242
242
|
CoreAudio_SizeCallback,
|
|
@@ -290,7 +290,7 @@ static int CoreAudio_open(Sound_Sample *sample, const char *ext)
|
|
|
290
290
|
internal->decoder_private = core_audio_file_container;
|
|
291
291
|
|
|
292
292
|
sample->flags = SOUND_SAMPLEFLAG_CANSEEK;
|
|
293
|
-
sample->actual.
|
|
293
|
+
sample->actual.freq = (UInt32) actual_format.mSampleRate;
|
|
294
294
|
sample->actual.channels = (UInt8)actual_format.mChannelsPerFrame;
|
|
295
295
|
internal->total_time = (SInt32)(estimated_duration * 1000.0 + 0.5);
|
|
296
296
|
|
|
@@ -302,22 +302,22 @@ static int CoreAudio_open(Sound_Sample *sample, const char *ext)
|
|
|
302
302
|
{
|
|
303
303
|
if(actual_format.mFormatFlags & kAudioFormatFlagIsBigEndian)
|
|
304
304
|
{
|
|
305
|
-
sample->actual.format =
|
|
305
|
+
sample->actual.format = SDL_AUDIO_F32BE;
|
|
306
306
|
}
|
|
307
307
|
else
|
|
308
308
|
{
|
|
309
|
-
sample->actual.format =
|
|
309
|
+
sample->actual.format = SDL_AUDIO_F32LE;
|
|
310
310
|
}
|
|
311
311
|
}
|
|
312
312
|
else
|
|
313
313
|
{
|
|
314
|
-
if(actual_format.mFormatFlags & kAudioFormatFlagIsBigEndian)
|
|
314
|
+
if (actual_format.mFormatFlags & kAudioFormatFlagIsBigEndian)
|
|
315
315
|
{
|
|
316
|
-
sample->actual.format =
|
|
316
|
+
sample->actual.format = SDL_AUDIO_S32BE;
|
|
317
317
|
}
|
|
318
318
|
else
|
|
319
319
|
{
|
|
320
|
-
sample->actual.format =
|
|
320
|
+
sample->actual.format = SDL_AUDIO_S32LE;
|
|
321
321
|
}
|
|
322
322
|
}
|
|
323
323
|
}
|
|
@@ -327,22 +327,11 @@ static int CoreAudio_open(Sound_Sample *sample, const char *ext)
|
|
|
327
327
|
{
|
|
328
328
|
if(actual_format.mFormatFlags & kAudioFormatFlagIsBigEndian)
|
|
329
329
|
{
|
|
330
|
-
sample->actual.format =
|
|
330
|
+
sample->actual.format = SDL_AUDIO_S16BE;
|
|
331
331
|
}
|
|
332
332
|
else
|
|
333
333
|
{
|
|
334
|
-
sample->actual.format =
|
|
335
|
-
}
|
|
336
|
-
}
|
|
337
|
-
else
|
|
338
|
-
{
|
|
339
|
-
if(actual_format.mFormatFlags & kAudioFormatFlagIsBigEndian)
|
|
340
|
-
{
|
|
341
|
-
sample->actual.format = AUDIO_U16MSB;
|
|
342
|
-
}
|
|
343
|
-
else
|
|
344
|
-
{
|
|
345
|
-
sample->actual.format = AUDIO_U16LSB;
|
|
334
|
+
sample->actual.format = SDL_AUDIO_S16LE;
|
|
346
335
|
}
|
|
347
336
|
}
|
|
348
337
|
}
|
|
@@ -350,17 +339,17 @@ static int CoreAudio_open(Sound_Sample *sample, const char *ext)
|
|
|
350
339
|
{
|
|
351
340
|
if(kAudioFormatFlagIsSignedInteger & actual_format.mFormatFlags)
|
|
352
341
|
{
|
|
353
|
-
sample->actual.format =
|
|
342
|
+
sample->actual.format = SDL_AUDIO_S8;
|
|
354
343
|
}
|
|
355
344
|
else
|
|
356
345
|
{
|
|
357
|
-
sample->actual.format =
|
|
346
|
+
sample->actual.format = SDL_AUDIO_U8;
|
|
358
347
|
}
|
|
359
348
|
}
|
|
360
349
|
else // might be 0 for undefined?
|
|
361
350
|
{
|
|
362
351
|
// This case seems to come up a lot for me. Maybe for file types like .m4a?
|
|
363
|
-
sample->actual.format =
|
|
352
|
+
sample->actual.format = SDL_AUDIO_S16;
|
|
364
353
|
SNDDBG(("Core Audio: Unsupported actual_format.mBitsPerChannel: [%d].\n", actual_format.mBitsPerChannel));
|
|
365
354
|
}
|
|
366
355
|
}
|
|
@@ -375,14 +364,8 @@ static int CoreAudio_open(Sound_Sample *sample, const char *ext)
|
|
|
375
364
|
sample->actual.format = sample->desired.format;
|
|
376
365
|
}
|
|
377
366
|
|
|
378
|
-
/* AUDIO_U16LSB and AUDIO_U16MSB don't seem to be supported by CoreAudio. */
|
|
379
|
-
if (sample->actual.format == AUDIO_U16LSB)
|
|
380
|
-
sample->actual.format = AUDIO_S16LSB;
|
|
381
|
-
if (sample->actual.format == AUDIO_U16MSB)
|
|
382
|
-
sample->actual.format = AUDIO_S16MSB;
|
|
383
|
-
|
|
384
367
|
SNDDBG(("CoreAudio: channels == (%d).\n", sample->actual.channels));
|
|
385
|
-
SNDDBG(("CoreAudio: sampling rate == (%d).\n",sample->actual.
|
|
368
|
+
SNDDBG(("CoreAudio: sampling rate == (%d).\n",sample->actual.freq));
|
|
386
369
|
SNDDBG(("CoreAudio: total seconds of sample == (%d).\n", internal->total_time));
|
|
387
370
|
SNDDBG(("CoreAudio: sample->actual.format == (%d).\n", sample->actual.format));
|
|
388
371
|
|