From 7f9549f651504e240487d5cd629be0b5f91cb9a6 Mon Sep 17 00:00:00 2001 From: Mark Date: Sat, 5 Nov 2022 17:03:16 -0700 Subject: [PATCH] Fixed sound Closes #17 --- assets/sounds.lua | 4 ++-- assets/sounds/volumedown-click.mp3 | Bin 1916 -> 0 bytes assets/sounds/volumedown.ogg | Bin 0 -> 4797 bytes assets/sounds/volumeup-click.mp3 | Bin 1917 -> 0 bytes assets/sounds/volumeup.ogg | Bin 0 -> 4826 bytes core/sound.lua | 2 +- 6 files changed, 3 insertions(+), 3 deletions(-) delete mode 100755 assets/sounds/volumedown-click.mp3 create mode 100755 assets/sounds/volumedown.ogg delete mode 100755 assets/sounds/volumeup-click.mp3 create mode 100755 assets/sounds/volumeup.ogg diff --git a/assets/sounds.lua b/assets/sounds.lua index 725c0ab..dbe0859 100755 --- a/assets/sounds.lua +++ b/assets/sounds.lua @@ -1,4 +1,4 @@ return { - volume_up = conf_dir .. "assets/sounds/volumeup-click.mp3", - volume_down = conf_dir .. "assets/sounds/volumedown-click.mp3" + volume_up = conf_dir .. "assets/sounds/volumeup.ogg", + volume_down = conf_dir .. "assets/sounds/volumedown.ogg" } diff --git a/assets/sounds/volumedown-click.mp3 b/assets/sounds/volumedown-click.mp3 deleted file mode 100755 index 66a3e8b0d288cd6e2547ccd165c644ce44664f7b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1916 zcmeZtF=l1}0ojmvoq{wpwv zkwX9feE=9iY!-}(TNoIa7aOjzH=V$_JyThuX#(R4{^kci>;eQ>_&6BTAP$>SP z_@9N(d;ib!|9|{`Iym0ru>Kcd_-8@V&h6`~q|RLBx#T0@Vdm+x{Yj-nPmyF_qa1^l zfQzB&5!H@n`{XB%M_u_OFMKG`kkxC;qzfEp>A3#$6k^wyn9{ zT^qAs_SKeMv)})}yK|*m(9B!cwtAcW-T&HgLFm@@V|piYi)9w~ov}`i%nw^z|NpN^ zRn@G0CO5q%KR>$b|LbWEz{C;H-XT9>!vTgJ(jE)*@_J0pv<6*T7%Q`_X3O2(lRunW zTBvj8|EY!xQhd*9+2ypOa@2+0+Pvj_I?C0i_+4Gdsru}Ed*TImhqfsZpM3mw9H}r< zTUD1j>0{m1)~|~vG;xc*X}u6ydM?kyKO<`HmP4&SPb3xQFf|`3maO>xYQ~uZ+iIpJ znVM}p8EN#z{Zzu;S;sAneO}JFdG?z`-iZnBmkPTw>|Pcd|5x>4nsAu$x!6*!)N`4s zb4ovbm>znxV`c9vv0`7TUgwLN)w?yyr%y_B$oLc;bfb|eO4M|5ie}fcO=%%VW_{kP zyPD_lrs-)y2WF?=;8&Ij;GcG)DcHu(H});3Q{X#Qwk6jKH?n?DouX7E`SR?MsoJxQ z0ChtA}vnia$_xlioTESdl6wIw=R8XRIgy_NZw^qg86@++p)RZwN~v9O&7 zy$+QuKIF43OZQh$^R4YyH>d3T&#yJ_t3MB`FsJwHp6Wf9jxO~3`S~TN?77--H8VH- z&Nl|GUD_`y+xR0_ng9QPqb|X8!j7^9b&RSD8Z|8)7CRic<1ry4t;$m&^>ohcCmy;h zCRCnUJ~ML~qe{k-DG!#OShga>=)8s2K?jY`f%VU4x%34uDvC?1U$xe(=BbRQ`uTfl zX=zz|&OBunJhtky#jVeGMCFvs&bKXfSrpiKd3lJa^xeX2LJ@I B*P8$U diff --git a/assets/sounds/volumedown.ogg b/assets/sounds/volumedown.ogg new file mode 100755 index 0000000000000000000000000000000000000000..8d77a74e4da95caa05af4ef3e56601e8b7434489 GIT binary patch literal 4797 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 diff --git a/assets/sounds/volumeup.ogg b/assets/sounds/volumeup.ogg new file mode 100755 index 0000000000000000000000000000000000000000..cbd695d4423fdae1287436f06113a3b8bfaae222 GIT binary patch literal 4826 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 5) then + if (sound.counter > 0) then return end sound.counter = sound.counter + 1