From ea6e3a88a0900b64151592e841506271fe913b9d Mon Sep 17 00:00:00 2001 From: iann Date: Thu, 13 Nov 2025 11:40:31 -0600 Subject: [PATCH] revert audio sound loading changes --- examples/audio/audio_sound_loading.c | 33 ++----------------------- examples/audio/audio_sound_loading.png | Bin 15987 -> 4680 bytes 2 files changed, 2 insertions(+), 31 deletions(-) diff --git a/examples/audio/audio_sound_loading.c b/examples/audio/audio_sound_loading.c index 997c93b19..97e26a450 100644 --- a/examples/audio/audio_sound_loading.c +++ b/examples/audio/audio_sound_loading.c @@ -4,7 +4,7 @@ * * Example complexity rating: [★☆☆☆] 1/4 * -* Example originally created with raylib 1.1, last time updated with raylib 6.0 +* Example originally created with raylib 1.1, last time updated with raylib 3.5 * * Example licensed under an unmodified zlib/libpng license, which is an OSI-certified, * BSD-like license that allows static linking with closed source software @@ -14,8 +14,6 @@ ********************************************************************************************/ #include "raylib.h" -#include // Required for: malloc(), free() -#include // Required for: memcpy() //------------------------------------------------------------------------------------ // Program main entry point @@ -34,17 +32,6 @@ int main(void) Sound fxWav = LoadSound("resources/sound.wav"); // Load WAV audio file Sound fxOgg = LoadSound("resources/target.ogg"); // Load OGG audio file - bool soundReversed = false; - - float *soundData = malloc(sizeof(float)*fxWav.frameCount*fxWav.stream.channels); - float *scratchSoundData = malloc(sizeof(float)*fxWav.frameCount*fxWav.stream.channels); - - Wave wave = LoadWave("resources/sound.wav"); - // Sounds always have 32bit sampleSize: - WaveFormat(&wave, fxWav.stream.sampleRate, 32, fxWav.stream.channels); - memcpy(soundData, wave.data, sizeof(float)*fxWav.frameCount*fxWav.stream.channels); - UnloadWave(wave); - SetTargetFPS(60); // Set our game to run at 60 frames-per-second //-------------------------------------------------------------------------------------- @@ -53,18 +40,6 @@ int main(void) { // Update //---------------------------------------------------------------------------------- - if (IsKeyPressed(KEY_R)) - { - soundReversed = !soundReversed; - for (unsigned int i = 0; i < fxWav.frameCount; i++) - { - unsigned int src = (soundReversed)? fxWav.frameCount - 1 - i : i; - // Sounds always have STEREO channels: - scratchSoundData[i * fxWav.stream.channels + 0] = soundData[src * fxWav.stream.channels + 0]; - scratchSoundData[i * fxWav.stream.channels + 1] = soundData[src * fxWav.stream.channels + 1]; - } - UpdateSound(fxWav, scratchSoundData, fxWav.frameCount); - } if (IsKeyPressed(KEY_SPACE)) PlaySound(fxWav); // Play WAV sound if (IsKeyPressed(KEY_ENTER)) PlaySound(fxOgg); // Play OGG sound //---------------------------------------------------------------------------------- @@ -76,9 +51,7 @@ int main(void) ClearBackground(RAYWHITE); DrawText("Press SPACE to PLAY the WAV sound!", 200, 180, 20, LIGHTGRAY); - DrawText(TextFormat("Press R to REVERSE the WAV sound : "), 120, 220, 20, LIGHTGRAY); - DrawText((soundReversed)? "BACKWARDS" : "FORWARDS", 525, 220, 20, (soundReversed)? MAROON : DARKGREEN); - DrawText("Press ENTER to PLAY the OGG sound!", 200, 260, 20, LIGHTGRAY); + DrawText("Press ENTER to PLAY the OGG sound!", 200, 220, 20, LIGHTGRAY); EndDrawing(); //---------------------------------------------------------------------------------- @@ -86,8 +59,6 @@ int main(void) // De-Initialization //-------------------------------------------------------------------------------------- - free(soundData); - free(scratchSoundData); UnloadSound(fxWav); // Unload sound data UnloadSound(fxOgg); // Unload sound data diff --git a/examples/audio/audio_sound_loading.png b/examples/audio/audio_sound_loading.png index 64b463f6c0f820c7837fe05c2966378d833542f1..94e0a842e1247f363c622b203472225c99514c4f 100644 GIT binary patch literal 4680 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