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 zcmeAS@N?(olHy`uVBq!ia0y~yU{+vYU_8XZ#=yWJp1k%11A`F1r;B4qMcmu#)_p3T zd@L9C{y+K4N%=h!_mU)D|4YiN*RWspuV6adJ5OFU;s4L)^Xva{Gca8EFu#U@f#E}} zhyVk_0yjoR28OIr=4d#KCW2v+85;Qi{`&g*|0l~2)~qZH51hF;-e@X(IQF`A)70Pg zq5s~UyuZnO=h^zHfA&qjbNaX6r+J?5p4Mj0-hDQ|`2N#xpN;4Lf35QU)4$2L|M*Y; z?|$yUOeUuMC*9SP$kv<_uW|d1|Hm)i^S&ER|Lpm!$nIp!x%j8M-_6ajH!rsI-}dv& z)0$0Z?>^hU^L^2;KW{(J@i&_O`H9*8%TNDLG%i@ya6tOD_$jmR!8U*Q-rjrWY0ada zU=`s%*Hx?EK7Tgm+~i!lV$1nC#oK@8zS}*=uKu^p^T}tP+Uz|0zvO5A6P`IB|9@+p zwDY>n&+X6DxBrBhvVGn=-?;C~a`m3xJ83q5=N$FhHP4FdZay=bzisCi6MM_2+s_w+ z96NdW&y&l4{<(9x@?P<$OuPN;prE~XV_$&Lbo~{R>$B^MX79gyI_8}E%+r;xU*3CC znt$tA(7U-gpJ$$~+;lcw@A>3hz0aAmz5PE=4z7bbu5#A=npx-1+s=J%t3LnP=W2%i z!4404YcBc}>A$z0`KfZ==O4=K1}6`}z8wsnwPLPtHI0yz-pp`C`AydBvwb&uKJfWw}?eH((oW z4F2V`^KSK1^|gP(PgWP-yY((r@A=y0)sx@u1-W(m&*jy(|CmkB`@Zd`=Je<5D<^%Q zGw0Lo=a%#56fJ*#`}5@M_f$Sto_}fce9CjnOnpH@N=oK5Y*JMZ>>njH3T^^?7p z`MIE!bM5lpli%)Xn$KN+`_JXQxplL>w^xJxf8FL}wI3(|=J@;Vy!`p?&y(5tlYZ`b zUIO-i@Vw`9KG~!{@L_B;pSLd{?|a_o$+v&!eU7foKNk&43HwiBHF=JG>8^ZGglSHH zZdt!|k3Et*Gp*Rqi3n6Ye#!l;?7f-&&b{x=_D}u(Y|mC`O8B`t=l$HG%ayy%+TXqX zZ2QiV-P_Ol@3cApGkE#$ZRd;aW)@Y>`y77yH!Pk&?p#(3b!I}|_qd;)+V&^+f^z5N zw{g!tRr}c8o&6;4)-xmfooAne!p;9w%sumyzx|5zQ}w?4Kd(IRd9Qdh#=bx+RfyB=| z-+SQwAZa}`wAcOp^|k(|j76{m1A|` z_){_Wwtp@8e|hi8+<&W|fCA`V`K0flJnMb?PHx@o-+Djy`~16d@4nvu{yB}HqBAF6 z2Uhz13(?E{zHR67pX)dMy>sTN&CO@V(?6etSbO^0XJbg=c=OpmF;J;>Mns?@`FGOI zXLVi6_m}VfzPu=N_x7{4XX~fFeV(TG99&@eZ`*nMkJ*=4ioMekE)pGTCOGyQMJRLz>711hmzzr3eX z{~xu$gOiuxoiD)e$Ho5A%ch{ z*&O{M_%$@085T`|SUH+s|CRyYF&82kV`W|E%)f5}b-WA@!F1$(nn`R^Vb3 zQUMqnfWmpX{CEv&!?x%9Fn)STGuMT?lX`ko4@=4X2#XIY*&R6?=nm75*>_02_dcK>B zQszO*{D{2opN^JM(a_Nz(`e6ewA(yLYW>k64A}V1v-)+xJI;OC{>qVofq}u()z4*} HQ$iB}ZG6c* literal 15987 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