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
|
@@ -175,11 +175,11 @@ static const Uint8 ulaw_outward[13][256] = {
|
|
|
175
175
|
#endif
|
|
176
176
|
|
|
177
177
|
|
|
178
|
-
static int word_get(shn_t *shn,
|
|
178
|
+
static int word_get(shn_t *shn, SDL_IOStream *io, Uint32 *word)
|
|
179
179
|
{
|
|
180
180
|
if (shn->nbyteget < 4)
|
|
181
181
|
{
|
|
182
|
-
shn->nbyteget +=
|
|
182
|
+
shn->nbyteget += SDL_ReadIO(io, shn->getbuf, SHN_BUFSIZ);
|
|
183
183
|
BAIL_IF_MACRO(shn->nbyteget < 4, NULL, 0);
|
|
184
184
|
shn->getbufp = shn->getbuf;
|
|
185
185
|
} /* if */
|
|
@@ -199,13 +199,13 @@ static int word_get(shn_t *shn, SDL_RWops *rw, Uint32 *word)
|
|
|
199
199
|
} /* word_get */
|
|
200
200
|
|
|
201
201
|
|
|
202
|
-
static int uvar_get(int nbin, shn_t *shn,
|
|
202
|
+
static int uvar_get(int nbin, shn_t *shn, SDL_IOStream *io, Sint32 *word)
|
|
203
203
|
{
|
|
204
204
|
Sint32 result;
|
|
205
205
|
|
|
206
206
|
if (shn->nbitget == 0)
|
|
207
207
|
{
|
|
208
|
-
BAIL_IF_MACRO(!word_get(shn,
|
|
208
|
+
BAIL_IF_MACRO(!word_get(shn, io, &shn->gbuffer), NULL, 0);
|
|
209
209
|
shn->nbitget = 32;
|
|
210
210
|
} /* if */
|
|
211
211
|
|
|
@@ -213,7 +213,7 @@ static int uvar_get(int nbin, shn_t *shn, SDL_RWops *rw, Sint32 *word)
|
|
|
213
213
|
{
|
|
214
214
|
if (shn->nbitget == 0)
|
|
215
215
|
{
|
|
216
|
-
BAIL_IF_MACRO(!word_get(shn,
|
|
216
|
+
BAIL_IF_MACRO(!word_get(shn, io, &shn->gbuffer), NULL, 0);
|
|
217
217
|
shn->nbitget = 32;
|
|
218
218
|
} /* if */
|
|
219
219
|
} /* for */
|
|
@@ -232,7 +232,7 @@ static int uvar_get(int nbin, shn_t *shn, SDL_RWops *rw, Sint32 *word)
|
|
|
232
232
|
{
|
|
233
233
|
result = (result << shn->nbitget) |
|
|
234
234
|
(shn->gbuffer & mask_table[shn->nbitget]);
|
|
235
|
-
BAIL_IF_MACRO(!word_get(shn,
|
|
235
|
+
BAIL_IF_MACRO(!word_get(shn, io, &shn->gbuffer), NULL, 0);
|
|
236
236
|
nbin -= shn->nbitget;
|
|
237
237
|
shn->nbitget = 32;
|
|
238
238
|
} /* else */
|
|
@@ -245,9 +245,9 @@ static int uvar_get(int nbin, shn_t *shn, SDL_RWops *rw, Sint32 *word)
|
|
|
245
245
|
} /* uvar_get */
|
|
246
246
|
|
|
247
247
|
|
|
248
|
-
static int var_get(int nbin, shn_t *shn,
|
|
248
|
+
static int var_get(int nbin, shn_t *shn, SDL_IOStream *io, Sint32 *word)
|
|
249
249
|
{
|
|
250
|
-
BAIL_IF_MACRO(!uvar_get(nbin + 1, shn,
|
|
250
|
+
BAIL_IF_MACRO(!uvar_get(nbin + 1, shn, io, word), NULL, 0);
|
|
251
251
|
|
|
252
252
|
if ((*word) & 1)
|
|
253
253
|
*word = (Sint32) ~((*word) >> 1);
|
|
@@ -258,12 +258,12 @@ static int var_get(int nbin, shn_t *shn, SDL_RWops *rw, Sint32 *word)
|
|
|
258
258
|
} /* var_get */
|
|
259
259
|
|
|
260
260
|
|
|
261
|
-
static int ulong_get(shn_t *shn,
|
|
261
|
+
static int ulong_get(shn_t *shn, SDL_IOStream *io, Sint32 *word)
|
|
262
262
|
{
|
|
263
263
|
Sint32 nbit;
|
|
264
264
|
Sint32 retval;
|
|
265
|
-
BAIL_IF_MACRO(!uvar_get(SHN_ULONGSIZE, shn,
|
|
266
|
-
BAIL_IF_MACRO(!uvar_get(nbit, shn,
|
|
265
|
+
BAIL_IF_MACRO(!uvar_get(SHN_ULONGSIZE, shn, io, &nbit), NULL, 0);
|
|
266
|
+
BAIL_IF_MACRO(!uvar_get(nbit, shn, io, &retval), NULL, 0);
|
|
267
267
|
|
|
268
268
|
if (word != NULL)
|
|
269
269
|
*word = retval;
|
|
@@ -272,15 +272,15 @@ static int ulong_get(shn_t *shn, SDL_RWops *rw, Sint32 *word)
|
|
|
272
272
|
} /* ulong_get */
|
|
273
273
|
|
|
274
274
|
|
|
275
|
-
static SDL_INLINE int uint_get(int nbit, shn_t *shn,
|
|
275
|
+
static SDL_INLINE int uint_get(int nbit, shn_t *shn, SDL_IOStream *io, Sint32 *w)
|
|
276
276
|
{
|
|
277
|
-
return (shn->version == 0) ? uvar_get(nbit, shn,
|
|
277
|
+
return (shn->version == 0) ? uvar_get(nbit, shn, io, w) : ulong_get(shn, io, w);
|
|
278
278
|
} /* uint_get */
|
|
279
279
|
|
|
280
280
|
|
|
281
|
-
static
|
|
281
|
+
static bool SHN_init(void)
|
|
282
282
|
{
|
|
283
|
-
return
|
|
283
|
+
return true; /* initialization always successful. */
|
|
284
284
|
} /* SHN_init */
|
|
285
285
|
|
|
286
286
|
|
|
@@ -296,17 +296,17 @@ static void SHN_quit(void)
|
|
|
296
296
|
*/
|
|
297
297
|
static SDL_INLINE int extended_shn_magic_search(Sound_Sample *sample)
|
|
298
298
|
{
|
|
299
|
-
|
|
299
|
+
SDL_IOStream *io = ((Sound_SampleInternal *) sample->opaque)->io;
|
|
300
300
|
Uint32 word = 0;
|
|
301
301
|
Uint8 ch;
|
|
302
302
|
|
|
303
303
|
while (1)
|
|
304
304
|
{
|
|
305
|
-
BAIL_IF_MACRO(
|
|
305
|
+
BAIL_IF_MACRO(SDL_ReadIO(io, &ch, sizeof (ch)) != sizeof (ch), NULL, -1);
|
|
306
306
|
word = ((word << 8) & 0xFFFFFF00) | ch;
|
|
307
|
-
if (
|
|
307
|
+
if (SDL_Swap32BE(word) == SHN_MAGIC)
|
|
308
308
|
{
|
|
309
|
-
BAIL_IF_MACRO(
|
|
309
|
+
BAIL_IF_MACRO(SDL_ReadIO(io, &ch, sizeof (ch)) != sizeof (ch), NULL, -1);
|
|
310
310
|
return (int) ch;
|
|
311
311
|
} /* if */
|
|
312
312
|
} /* while */
|
|
@@ -315,11 +315,11 @@ static SDL_INLINE int extended_shn_magic_search(Sound_Sample *sample)
|
|
|
315
315
|
} /* extended_shn_magic_search */
|
|
316
316
|
|
|
317
317
|
|
|
318
|
-
/* look for the magic number in the
|
|
318
|
+
/* look for the magic number in the SDL_IOStream and see what kind of file this is. */
|
|
319
319
|
static SDL_INLINE int determine_shn_version(Sound_Sample *sample,
|
|
320
320
|
const char *ext)
|
|
321
321
|
{
|
|
322
|
-
|
|
322
|
+
SDL_IOStream *io = ((Sound_SampleInternal *) sample->opaque)->io;
|
|
323
323
|
Uint32 magic;
|
|
324
324
|
Uint8 ch;
|
|
325
325
|
|
|
@@ -334,9 +334,9 @@ static SDL_INLINE int determine_shn_version(Sound_Sample *sample,
|
|
|
334
334
|
if (ext != NULL && SDL_strcasecmp(ext, "shn") == 0)
|
|
335
335
|
return extended_shn_magic_search(sample);
|
|
336
336
|
|
|
337
|
-
BAIL_IF_MACRO(
|
|
338
|
-
BAIL_IF_MACRO(
|
|
339
|
-
BAIL_IF_MACRO(
|
|
337
|
+
BAIL_IF_MACRO(SDL_ReadIO(io, &magic, sizeof (magic)) != sizeof (magic), NULL, -1);
|
|
338
|
+
BAIL_IF_MACRO(SDL_Swap32LE(magic) != SHN_MAGIC, "SHN: Not a SHN file", -1);
|
|
339
|
+
BAIL_IF_MACRO(SDL_ReadIO(io, &ch, sizeof (ch)) != sizeof (ch), NULL, -1);
|
|
340
340
|
BAIL_IF_MACRO(ch > 3, "SHN: Unsupported file version", -1);
|
|
341
341
|
|
|
342
342
|
return (int) ch;
|
|
@@ -386,7 +386,7 @@ static SDL_INLINE Uint16 cvt_shnftype_to_sdlfmt(Sint16 shntype)
|
|
|
386
386
|
switch (shntype)
|
|
387
387
|
{
|
|
388
388
|
case SHN_TYPE_S8:
|
|
389
|
-
return
|
|
389
|
+
return SDL_AUDIO_S8;
|
|
390
390
|
|
|
391
391
|
case SHN_TYPE_ALAW:
|
|
392
392
|
case SHN_TYPE_ULAW:
|
|
@@ -394,35 +394,35 @@ static SDL_INLINE Uint16 cvt_shnftype_to_sdlfmt(Sint16 shntype)
|
|
|
394
394
|
case SHN_TYPE_AU2:
|
|
395
395
|
case SHN_TYPE_AU3:
|
|
396
396
|
case SHN_TYPE_U8:
|
|
397
|
-
return
|
|
397
|
+
return SDL_AUDIO_U8;
|
|
398
398
|
|
|
399
399
|
case SHN_TYPE_S16HL:
|
|
400
|
-
return
|
|
400
|
+
return SDL_AUDIO_S16BE;
|
|
401
401
|
|
|
402
402
|
case SHN_TYPE_S16LH:
|
|
403
|
-
return
|
|
403
|
+
return SDL_AUDIO_S16LE;
|
|
404
404
|
|
|
405
405
|
case SHN_TYPE_U16HL:
|
|
406
|
-
return
|
|
406
|
+
return SDL_AUDIO_S16BE;
|
|
407
407
|
|
|
408
408
|
case SHN_TYPE_U16LH:
|
|
409
|
-
return
|
|
409
|
+
return SDL_AUDIO_S16LE;
|
|
410
410
|
} /* switch */
|
|
411
411
|
|
|
412
412
|
return 0;
|
|
413
413
|
} /* cvt_shnftype_to_sdlfmt */
|
|
414
414
|
|
|
415
415
|
|
|
416
|
-
static SDL_INLINE int skip_bits(shn_t *shn,
|
|
416
|
+
static SDL_INLINE int skip_bits(shn_t *shn, SDL_IOStream *io)
|
|
417
417
|
{
|
|
418
418
|
int i;
|
|
419
419
|
Sint32 skip;
|
|
420
420
|
Sint32 trash;
|
|
421
421
|
|
|
422
|
-
BAIL_IF_MACRO(!uint_get(SHN_NSKIPSIZE, shn,
|
|
422
|
+
BAIL_IF_MACRO(!uint_get(SHN_NSKIPSIZE, shn, io, &skip), NULL, 0);
|
|
423
423
|
for(i = 0; i < skip; i++)
|
|
424
424
|
{
|
|
425
|
-
BAIL_IF_MACRO(!uint_get(SHN_XBYTESIZE, shn,
|
|
425
|
+
BAIL_IF_MACRO(!uint_get(SHN_XBYTESIZE, shn, io, &trash), NULL, 0);
|
|
426
426
|
} /* for */
|
|
427
427
|
|
|
428
428
|
return 1;
|
|
@@ -451,7 +451,7 @@ static Sint32 **shn_long2d(Uint32 n0, Uint32 n1)
|
|
|
451
451
|
#define fmtID 0x20746D66 /* "fmt ", in ascii. */
|
|
452
452
|
#define dataID 0x61746164 /* "data", in ascii. */
|
|
453
453
|
|
|
454
|
-
static int verb_ReadLE32(shn_t *shn,
|
|
454
|
+
static int verb_ReadLE32(shn_t *shn, SDL_IOStream *io, Uint32 *word)
|
|
455
455
|
{
|
|
456
456
|
int i;
|
|
457
457
|
Uint8 chars[4];
|
|
@@ -459,19 +459,19 @@ static int verb_ReadLE32(shn_t *shn, SDL_RWops *rw, Uint32 *word)
|
|
|
459
459
|
|
|
460
460
|
for (i = 0; i < 4; i++)
|
|
461
461
|
{
|
|
462
|
-
if (!uvar_get(SHN_VERBATIM_BYTE_SIZE, shn,
|
|
462
|
+
if (!uvar_get(SHN_VERBATIM_BYTE_SIZE, shn, io, &byte))
|
|
463
463
|
return 0;
|
|
464
464
|
chars[i] = (Uint8) byte;
|
|
465
465
|
} /* for */
|
|
466
466
|
|
|
467
467
|
SDL_memcpy(word, chars, sizeof (*word));
|
|
468
|
-
*word =
|
|
468
|
+
*word = SDL_Swap32LE(*word);
|
|
469
469
|
|
|
470
470
|
return 1;
|
|
471
471
|
} /* verb_ReadLE32 */
|
|
472
472
|
|
|
473
473
|
|
|
474
|
-
static int verb_ReadLE16(shn_t *shn,
|
|
474
|
+
static int verb_ReadLE16(shn_t *shn, SDL_IOStream *io, Uint16 *word)
|
|
475
475
|
{
|
|
476
476
|
int i;
|
|
477
477
|
Uint8 chars[2];
|
|
@@ -479,13 +479,13 @@ static int verb_ReadLE16(shn_t *shn, SDL_RWops *rw, Uint16 *word)
|
|
|
479
479
|
|
|
480
480
|
for (i = 0; i < 2; i++)
|
|
481
481
|
{
|
|
482
|
-
if (!uvar_get(SHN_VERBATIM_BYTE_SIZE, shn,
|
|
482
|
+
if (!uvar_get(SHN_VERBATIM_BYTE_SIZE, shn, io, &byte))
|
|
483
483
|
return 0;
|
|
484
484
|
chars[i] = (Uint8) byte;
|
|
485
485
|
} /* for */
|
|
486
486
|
|
|
487
487
|
SDL_memcpy(word, chars, sizeof (*word));
|
|
488
|
-
*word =
|
|
488
|
+
*word = SDL_Swap16LE(*word);
|
|
489
489
|
|
|
490
490
|
return 1;
|
|
491
491
|
} /* verb_ReadLE16 */
|
|
@@ -494,39 +494,39 @@ static int verb_ReadLE16(shn_t *shn, SDL_RWops *rw, Uint16 *word)
|
|
|
494
494
|
static SDL_INLINE int parse_riff_header(shn_t *shn, Sound_Sample *sample)
|
|
495
495
|
{
|
|
496
496
|
Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
|
|
497
|
-
|
|
497
|
+
SDL_IOStream *io = internal->io;
|
|
498
498
|
Uint16 u16;
|
|
499
499
|
Uint32 u32;
|
|
500
500
|
Sint32 cklen;
|
|
501
501
|
Uint32 bytes_per_second;
|
|
502
502
|
|
|
503
|
-
BAIL_IF_MACRO(!uvar_get(SHN_VERBATIM_CKSIZE_SIZE, shn,
|
|
503
|
+
BAIL_IF_MACRO(!uvar_get(SHN_VERBATIM_CKSIZE_SIZE, shn, io, &cklen), NULL, 0);
|
|
504
504
|
|
|
505
|
-
BAIL_IF_MACRO(!verb_ReadLE32(shn,
|
|
505
|
+
BAIL_IF_MACRO(!verb_ReadLE32(shn, io, &u32), NULL, 0); /* RIFF header */
|
|
506
506
|
BAIL_IF_MACRO(u32 != riffID, "SHN: No RIFF header.", 0);
|
|
507
|
-
BAIL_IF_MACRO(!verb_ReadLE32(shn,
|
|
507
|
+
BAIL_IF_MACRO(!verb_ReadLE32(shn, io, &u32), NULL, 0); /* length */
|
|
508
508
|
|
|
509
|
-
BAIL_IF_MACRO(!verb_ReadLE32(shn,
|
|
509
|
+
BAIL_IF_MACRO(!verb_ReadLE32(shn, io, &u32), NULL, 0); /* WAVE header */
|
|
510
510
|
BAIL_IF_MACRO(u32 != waveID, "SHN: No WAVE header.", 0);
|
|
511
511
|
|
|
512
|
-
BAIL_IF_MACRO(!verb_ReadLE32(shn,
|
|
512
|
+
BAIL_IF_MACRO(!verb_ReadLE32(shn, io, &u32), NULL, 0); /* 'fmt ' header */
|
|
513
513
|
BAIL_IF_MACRO(u32 != fmtID, "SHN: No 'fmt ' header.", 0);
|
|
514
514
|
|
|
515
|
-
BAIL_IF_MACRO(!verb_ReadLE32(shn,
|
|
516
|
-
BAIL_IF_MACRO(!verb_ReadLE16(shn,
|
|
517
|
-
BAIL_IF_MACRO(!verb_ReadLE16(shn,
|
|
515
|
+
BAIL_IF_MACRO(!verb_ReadLE32(shn, io, &u32), NULL, 0); /* chunksize */
|
|
516
|
+
BAIL_IF_MACRO(!verb_ReadLE16(shn, io, &u16), NULL, 0); /* format */
|
|
517
|
+
BAIL_IF_MACRO(!verb_ReadLE16(shn, io, &u16), NULL, 0); /* channels */
|
|
518
518
|
sample->actual.channels = u16;
|
|
519
|
-
BAIL_IF_MACRO(!verb_ReadLE32(shn,
|
|
520
|
-
sample->actual.
|
|
519
|
+
BAIL_IF_MACRO(!verb_ReadLE32(shn, io, &u32), NULL, 0); /* sample rate */
|
|
520
|
+
sample->actual.freq = u32;
|
|
521
521
|
|
|
522
|
-
BAIL_IF_MACRO(!verb_ReadLE32(shn,
|
|
522
|
+
BAIL_IF_MACRO(!verb_ReadLE32(shn, io, &u32), NULL, 0); /* bytespersec */
|
|
523
523
|
bytes_per_second = u32;
|
|
524
|
-
BAIL_IF_MACRO(!verb_ReadLE16(shn,
|
|
525
|
-
BAIL_IF_MACRO(!verb_ReadLE16(shn,
|
|
524
|
+
BAIL_IF_MACRO(!verb_ReadLE16(shn, io, &u16), NULL, 0); /* blockalign */
|
|
525
|
+
BAIL_IF_MACRO(!verb_ReadLE16(shn, io, &u16), NULL, 0); /* bitspersample */
|
|
526
526
|
|
|
527
|
-
BAIL_IF_MACRO(!verb_ReadLE32(shn,
|
|
527
|
+
BAIL_IF_MACRO(!verb_ReadLE32(shn, io, &u32), NULL, 0); /* 'data' header */
|
|
528
528
|
BAIL_IF_MACRO(u32 != dataID, "SHN: No 'data' header.", 0);
|
|
529
|
-
BAIL_IF_MACRO(!verb_ReadLE32(shn,
|
|
529
|
+
BAIL_IF_MACRO(!verb_ReadLE32(shn, io, &u32), NULL, 0); /* chunksize */
|
|
530
530
|
internal->total_time = u32 / bytes_per_second * 1000;
|
|
531
531
|
internal->total_time += (u32 % bytes_per_second) * 1000 / bytes_per_second;
|
|
532
532
|
return 1;
|
|
@@ -536,7 +536,7 @@ static SDL_INLINE int parse_riff_header(shn_t *shn, Sound_Sample *sample)
|
|
|
536
536
|
static int SHN_open(Sound_Sample *sample, const char *ext)
|
|
537
537
|
{
|
|
538
538
|
Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
|
|
539
|
-
|
|
539
|
+
SDL_IOStream *io = internal->io;
|
|
540
540
|
shn_t _shn;
|
|
541
541
|
shn_t *shn = &_shn; /* malloc and copy later. */
|
|
542
542
|
Sint32 cmd;
|
|
@@ -552,8 +552,8 @@ static int SHN_open(Sound_Sample *sample, const char *ext)
|
|
|
552
552
|
shn->version = determine_shn_version(sample, ext);
|
|
553
553
|
|
|
554
554
|
if (shn->version == -1) goto shn_open_puke;
|
|
555
|
-
if (!uint_get(SHN_TYPESIZE, shn,
|
|
556
|
-
if (!uint_get(SHN_CHANNELSIZE, shn,
|
|
555
|
+
if (!uint_get(SHN_TYPESIZE, shn, io, &shn->datatype)) goto shn_open_puke;
|
|
556
|
+
if (!uint_get(SHN_CHANNELSIZE, shn, io, &shn->nchan)) goto shn_open_puke;
|
|
557
557
|
|
|
558
558
|
sample->actual.format = cvt_shnftype_to_sdlfmt(shn->datatype);
|
|
559
559
|
if (sample->actual.format == 0)
|
|
@@ -565,11 +565,11 @@ static int SHN_open(Sound_Sample *sample, const char *ext)
|
|
|
565
565
|
if (shn->version > 0)
|
|
566
566
|
{
|
|
567
567
|
int rc = uint_get((int) (SDL_log((double) DEFAULT_BLOCK_SIZE) / M_LN2),
|
|
568
|
-
shn,
|
|
568
|
+
shn, io, &shn->blocksize);
|
|
569
569
|
if (!rc) goto shn_open_puke;;
|
|
570
|
-
if (!uint_get(SHN_LPCQSIZE, shn,
|
|
571
|
-
if (!uint_get(0, shn,
|
|
572
|
-
if (!skip_bits(shn,
|
|
570
|
+
if (!uint_get(SHN_LPCQSIZE, shn, io, &shn->maxnlpc)) goto shn_open_puke;
|
|
571
|
+
if (!uint_get(0, shn, io, &shn->nmean)) goto shn_open_puke;
|
|
572
|
+
if (!skip_bits(shn, io)) goto shn_open_puke;
|
|
573
573
|
} /* else */
|
|
574
574
|
|
|
575
575
|
shn->nwrap = (shn->maxnlpc > 3) ? shn->maxnlpc : 3;
|
|
@@ -602,7 +602,7 @@ static int SHN_open(Sound_Sample *sample, const char *ext)
|
|
|
602
602
|
init_shn_offset(shn->offset, shn->nchan,
|
|
603
603
|
MAX_MACRO(1, shn->nmean), shn->datatype);
|
|
604
604
|
|
|
605
|
-
if ( (!uvar_get(SHN_FNSIZE, shn,
|
|
605
|
+
if ( (!uvar_get(SHN_FNSIZE, shn, io, &cmd)) ||
|
|
606
606
|
(cmd != SHN_FN_VERBATIM) ||
|
|
607
607
|
(!parse_riff_header(shn, sample)) )
|
|
608
608
|
{
|
|
@@ -613,7 +613,7 @@ static int SHN_open(Sound_Sample *sample, const char *ext)
|
|
|
613
613
|
return 0;
|
|
614
614
|
} /* if */
|
|
615
615
|
|
|
616
|
-
shn->start_pos =
|
|
616
|
+
shn->start_pos = SDL_TellIO(io);
|
|
617
617
|
|
|
618
618
|
shn = (shn_t *) SDL_malloc(sizeof (shn_t));
|
|
619
619
|
if (shn == NULL)
|
|
@@ -919,18 +919,18 @@ static Uint32 put_to_buffers(Sound_Sample *sample, Uint32 bw)
|
|
|
919
919
|
case SHN_TYPE_U16HL:
|
|
920
920
|
case SHN_TYPE_U16LH:
|
|
921
921
|
{
|
|
922
|
-
|
|
922
|
+
Sint16 *writebufp = (Sint16 *) shn->backBuffer;
|
|
923
923
|
if (shn->nchan == 1)
|
|
924
924
|
{
|
|
925
925
|
for (i = 0; i < nitem; i++)
|
|
926
|
-
*writebufp++ = CAPMAXUSHORT(data0[i]);
|
|
926
|
+
*writebufp++ = CAPMAXUSHORT(data0[i]) ^ 0x8000;
|
|
927
927
|
} /* if */
|
|
928
928
|
else
|
|
929
929
|
{
|
|
930
930
|
for (i = 0; i < nitem; i++)
|
|
931
931
|
{
|
|
932
932
|
for (chan = 0; chan < shn->nchan; chan++)
|
|
933
|
-
*writebufp++ = CAPMAXUSHORT(shn->buffer[chan][i]);
|
|
933
|
+
*writebufp++ = CAPMAXUSHORT(shn->buffer[chan][i]) ^ 0x8000;
|
|
934
934
|
} /* for */
|
|
935
935
|
} /* else */
|
|
936
936
|
} /* case */
|
|
@@ -1017,7 +1017,7 @@ static Uint32 SHN_read(Sound_Sample *sample)
|
|
|
1017
1017
|
Uint32 retval = 0;
|
|
1018
1018
|
Sint32 chan = 0;
|
|
1019
1019
|
Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque;
|
|
1020
|
-
|
|
1020
|
+
SDL_IOStream *io = internal->io;
|
|
1021
1021
|
shn_t *shn = (shn_t *) internal->decoder_private;
|
|
1022
1022
|
Sint32 cmd;
|
|
1023
1023
|
|
|
@@ -1035,7 +1035,7 @@ static Uint32 SHN_read(Sound_Sample *sample)
|
|
|
1035
1035
|
/* get commands from file and execute them */
|
|
1036
1036
|
while (retval < internal->buffer_size)
|
|
1037
1037
|
{
|
|
1038
|
-
if (!uvar_get(SHN_FNSIZE, shn,
|
|
1038
|
+
if (!uvar_get(SHN_FNSIZE, shn, io, &cmd))
|
|
1039
1039
|
{
|
|
1040
1040
|
sample->flags |= SOUND_SAMPLEFLAG_ERROR;
|
|
1041
1041
|
return retval;
|
|
@@ -1062,7 +1062,7 @@ static Uint32 SHN_read(Sound_Sample *sample)
|
|
|
1062
1062
|
|
|
1063
1063
|
if (cmd != SHN_FN_ZERO)
|
|
1064
1064
|
{
|
|
1065
|
-
if (!uvar_get(SHN_ENERGYSIZE, shn,
|
|
1065
|
+
if (!uvar_get(SHN_ENERGYSIZE, shn, io, &resn))
|
|
1066
1066
|
{
|
|
1067
1067
|
sample->flags |= SOUND_SAMPLEFLAG_ERROR;
|
|
1068
1068
|
return retval;
|
|
@@ -1098,7 +1098,7 @@ static Uint32 SHN_read(Sound_Sample *sample)
|
|
|
1098
1098
|
case SHN_FN_DIFF0:
|
|
1099
1099
|
for(i = 0; i < shn->blocksize; i++)
|
|
1100
1100
|
{
|
|
1101
|
-
if (!var_get(resn, shn,
|
|
1101
|
+
if (!var_get(resn, shn, io, &cbuffer[i]))
|
|
1102
1102
|
{
|
|
1103
1103
|
sample->flags |= SOUND_SAMPLEFLAG_ERROR;
|
|
1104
1104
|
return retval;
|
|
@@ -1110,7 +1110,7 @@ static Uint32 SHN_read(Sound_Sample *sample)
|
|
|
1110
1110
|
case SHN_FN_DIFF1:
|
|
1111
1111
|
for(i = 0; i < shn->blocksize; i++)
|
|
1112
1112
|
{
|
|
1113
|
-
if (!var_get(resn, shn,
|
|
1113
|
+
if (!var_get(resn, shn, io, &cbuffer[i]))
|
|
1114
1114
|
{
|
|
1115
1115
|
sample->flags |= SOUND_SAMPLEFLAG_ERROR;
|
|
1116
1116
|
return retval;
|
|
@@ -1122,7 +1122,7 @@ static Uint32 SHN_read(Sound_Sample *sample)
|
|
|
1122
1122
|
case SHN_FN_DIFF2:
|
|
1123
1123
|
for (i = 0; i < shn->blocksize; i++)
|
|
1124
1124
|
{
|
|
1125
|
-
if (!var_get(resn, shn,
|
|
1125
|
+
if (!var_get(resn, shn, io, &cbuffer[i]))
|
|
1126
1126
|
{
|
|
1127
1127
|
sample->flags |= SOUND_SAMPLEFLAG_ERROR;
|
|
1128
1128
|
return retval;
|
|
@@ -1134,7 +1134,7 @@ static Uint32 SHN_read(Sound_Sample *sample)
|
|
|
1134
1134
|
case SHN_FN_DIFF3:
|
|
1135
1135
|
for (i = 0; i < shn->blocksize; i++)
|
|
1136
1136
|
{
|
|
1137
|
-
if (!var_get(resn, shn,
|
|
1137
|
+
if (!var_get(resn, shn, io, &cbuffer[i]))
|
|
1138
1138
|
{
|
|
1139
1139
|
sample->flags |= SOUND_SAMPLEFLAG_ERROR;
|
|
1140
1140
|
return retval;
|
|
@@ -1144,7 +1144,7 @@ static Uint32 SHN_read(Sound_Sample *sample)
|
|
|
1144
1144
|
break;
|
|
1145
1145
|
|
|
1146
1146
|
case SHN_FN_QLPC:
|
|
1147
|
-
if (!uvar_get(SHN_LPCQSIZE, shn,
|
|
1147
|
+
if (!uvar_get(SHN_LPCQSIZE, shn, io, &nlpc))
|
|
1148
1148
|
{
|
|
1149
1149
|
sample->flags |= SOUND_SAMPLEFLAG_ERROR;
|
|
1150
1150
|
return retval;
|
|
@@ -1152,7 +1152,7 @@ static Uint32 SHN_read(Sound_Sample *sample)
|
|
|
1152
1152
|
|
|
1153
1153
|
for(i = 0; i < nlpc; i++)
|
|
1154
1154
|
{
|
|
1155
|
-
if (!var_get(SHN_LPCQUANT, shn,
|
|
1155
|
+
if (!var_get(SHN_LPCQUANT, shn, io, &shn->qlpc[i]))
|
|
1156
1156
|
{
|
|
1157
1157
|
sample->flags |= SOUND_SAMPLEFLAG_ERROR;
|
|
1158
1158
|
return retval;
|
|
@@ -1169,7 +1169,7 @@ static Uint32 SHN_read(Sound_Sample *sample)
|
|
|
1169
1169
|
for(j = 0; j < nlpc; j++)
|
|
1170
1170
|
sum += shn->qlpc[j] * cbuffer[i - j - 1];
|
|
1171
1171
|
|
|
1172
|
-
if (!var_get(resn, shn,
|
|
1172
|
+
if (!var_get(resn, shn, io, &cbuffer[i]))
|
|
1173
1173
|
{
|
|
1174
1174
|
sample->flags |= SOUND_SAMPLEFLAG_ERROR;
|
|
1175
1175
|
return retval;
|
|
@@ -1221,7 +1221,7 @@ static Uint32 SHN_read(Sound_Sample *sample)
|
|
|
1221
1221
|
|
|
1222
1222
|
case SHN_FN_BLOCKSIZE:
|
|
1223
1223
|
if (!uint_get((int) (SDL_log((double) shn->blocksize) / M_LN2),
|
|
1224
|
-
shn,
|
|
1224
|
+
shn, io, &shn->blocksize))
|
|
1225
1225
|
{
|
|
1226
1226
|
sample->flags |= SOUND_SAMPLEFLAG_ERROR;
|
|
1227
1227
|
return retval;
|
|
@@ -1229,7 +1229,7 @@ static Uint32 SHN_read(Sound_Sample *sample)
|
|
|
1229
1229
|
break;
|
|
1230
1230
|
|
|
1231
1231
|
case SHN_FN_BITSHIFT:
|
|
1232
|
-
if (!uvar_get(SHN_BITSHIFTSIZE, shn,
|
|
1232
|
+
if (!uvar_get(SHN_BITSHIFTSIZE, shn, io, &shn->bitshift))
|
|
1233
1233
|
{
|
|
1234
1234
|
sample->flags |= SOUND_SAMPLEFLAG_ERROR;
|
|
1235
1235
|
return retval;
|
|
@@ -1253,18 +1253,18 @@ static int SHN_rewind(Sound_Sample *sample)
|
|
|
1253
1253
|
|
|
1254
1254
|
#if 0
|
|
1255
1255
|
shn_t *shn = (shn_t *) internal->decoder_private;
|
|
1256
|
-
Sint64 rc =
|
|
1256
|
+
Sint64 rc = SDL_SeekIO(internal->io, shn->start_pos, SDL_IO_SEEK_SET);
|
|
1257
1257
|
BAIL_IF_MACRO(rc != shn->start_pos, ERR_IO_ERROR, 0);
|
|
1258
1258
|
/* !!! FIXME: set state. */
|
|
1259
1259
|
return 1;
|
|
1260
1260
|
#else
|
|
1261
1261
|
/*
|
|
1262
1262
|
* !!! FIXME: This is really unacceptable; state should be reset and
|
|
1263
|
-
* !!! FIXME: the
|
|
1263
|
+
* !!! FIXME: the SDL_IOStream should be pointed to the start of the data
|
|
1264
1264
|
* !!! FIXME: to decode. The below kludge adds unneeded overhead and
|
|
1265
1265
|
* !!! FIXME: risk of failure.
|
|
1266
1266
|
*/
|
|
1267
|
-
BAIL_IF_MACRO(
|
|
1267
|
+
BAIL_IF_MACRO(SDL_SeekIO(internal->io, 0, SDL_IO_SEEK_SET) != 0, ERR_IO_ERROR, 0);
|
|
1268
1268
|
SHN_close(sample);
|
|
1269
1269
|
return SHN_open(sample, "SHN");
|
|
1270
1270
|
#endif
|