From b136da672060040001450b66d93b70b09b6724ae Mon Sep 17 00:00:00 2001 From: David Rose Date: Fri, 4 Feb 2005 06:05:03 +0000 Subject: [PATCH] use wav instead of mp3 to avoid licensing issues (Schell Games) --- direct/src/gui/DirectGuiGlobals.py | 4 ++-- dmodels/src/audio/sfx/GUI_click.mp3 | Bin 1638 -> 0 bytes dmodels/src/audio/sfx/GUI_rollover.mp3 | Bin 1458 -> 0 bytes 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 dmodels/src/audio/sfx/GUI_click.mp3 delete mode 100644 dmodels/src/audio/sfx/GUI_rollover.mp3 diff --git a/direct/src/gui/DirectGuiGlobals.py b/direct/src/gui/DirectGuiGlobals.py index bd0d305e0e..9576a31632 100644 --- a/direct/src/gui/DirectGuiGlobals.py +++ b/direct/src/gui/DirectGuiGlobals.py @@ -78,7 +78,7 @@ panel = None def getDefaultRolloverSound(): global defaultRolloverSound if defaultRolloverSound == None: - defaultRolloverSound = base.loadSfx("audio/sfx/GUI_rollover.mp3") + defaultRolloverSound = base.loadSfx("audio/sfx/GUI_rollover.wav") return defaultRolloverSound def setDefaultRolloverSound(newSound): @@ -88,7 +88,7 @@ def setDefaultRolloverSound(newSound): def getDefaultClickSound(): global defaultClickSound if defaultClickSound == None: - defaultClickSound = base.loadSfx("audio/sfx/GUI_click.mp3") + defaultClickSound = base.loadSfx("audio/sfx/GUI_click.wav") return defaultClickSound def setDefaultClickSound(newSound): diff --git a/dmodels/src/audio/sfx/GUI_click.mp3 b/dmodels/src/audio/sfx/GUI_click.mp3 deleted file mode 100644 index a9acf0b7fc9ce52e72825abe1a9a69feeec6f39a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1638 zcmd7S=~t2o6bIn<6~iTB5S7SfQryVU!KBo35+*cUGLbA?vZP#d94gDT=@rY-)B;>W z%S2FA(oCJwZ1YHCQ8wX%<2que#jGqcb4wZhFXrBJ?w8-W=RTjVW}4j&0Du+~B(F>m zpk(PVO*5egSb{1t3lzTVg;lw(yZQG75xoN-st~q6Ob|v8Dk4lv2a?UYO4mcaQ5 zkZgf1w3;z7!7C6*0~nG+mWe()wZ1~I43_=PUA9?yI@*0+w>BfE)56RHMk*xBD%zbR zT#;Tano{oZ0*Z6u2Eb`Rh4}6VRw}Rx2u^^3c{)%;I}O`q568gIYRX*f2AxmBc6ovs z02r%TQP&0_FkY60H2}n-1YqZc@IW*ObwEcV6xbS+p+1-ml804CErr;dZkpwomF^Ta^A{Gv6Lu@~UpOH3*a-z8-9#O%J7*MC()dX&3nvqNK&}b+Lvu8C7 z@Eldex|y5^9BpK7!-AQBk*Qh50NfJ6u^?`aJY zmc~g17970raZvYz_fC!et7-$nu2N-@fC<7&6KxL9M4p^>=$SF^eS$;X%yLhD$qi(C zG_t^a30&NocZ@(hf}}70A>dalgKBVp^=C2y`RY-BT-&$l&BbP%NKupw{4f>Lr^~jz z;nA(ME2psJk*4L|5T9Va*L7?#>c#1y#NXehKM36;P4~5I)}_zXo)&e?x{v>pkb7$H zM+1J0S*4r4E)$cMKqoo&l zgKVT{U*xCQj1;GLbsz>PZH?(JYJqa$%4ix7TdNpcD|~F7!~J6yQSPpK2DRRt7%|vJt0ksd?vMv;SH2yV2C{knM|u?;MNsCHN}wfa;ApquVso z2UEnDu%5iu2J}GyX1GP8W}jQy)0ZGoR@+`LJCxQdIXi!qomnyPp^_(%(j5rn!6ok} z3ytETUwHY_RW)g2D1R#aaNcm8xKS;wy;~8qQoGSM)0(=uUR&krbmg1MA3krSp$M8}2!VfH#O&?j9`ZBC;xfOIEF=|5s z#xUG9AFH{yZ{Z_5Y@gUaNY6OcGxurhz`e56y62x))rTx`lRe=nd3WbV6=8qgGKmts z;U`f}axMfLCezU42@KK;0n4x)PUjx_=&;E`0S3ER=Vzxi{P^}nynlA*#`$< zFXQ#A>P#HtM_xITti?n;Na<-K9|p8JM#fT!H2V$;)>JIZ%JxOKZoWQIB5@UXbbFy8 zX)r}zktTe)j!#P ziW4L&t|oift-o`=w{K~a@6PmM_bc) zRuUfWqL~(GP%O?t+l1$!8?0&lT|68$@54$!$5ErZALXEZ@jUxMoL5WN%1-PPo)v+{ z+t4YZ=AetMX+>_8aV>IGfG#{A=V=zVJ?e}Z4O`fV^Jd6zg}&-pRZE@f;EdT9M9`Yn hTk5%ChT%N4a?F9suTPQIr{Jjh?mV15$^!WR^ncXd!LR@T diff --git a/dmodels/src/audio/sfx/GUI_rollover.mp3 b/dmodels/src/audio/sfx/GUI_rollover.mp3 deleted file mode 100644 index f98c73164518e79bc853a270f6477ca3fa985090..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1458 zcmezW`N9DP0wByO$diGQ?IVK?0|Q$IP%$?H7Xu>$69XgTHHK|KIESGL3jG+Q2pBem zrPnG?Y+1T`)%pXS+cQpmnrLVqXvp)FM~;o5UyZRcrr3|2knk(`E+n$eO6rv-{0 z+)#L0s}#0L%A>>2D2cQ44O~Tqcy(#`;y#Cz_dpxTmC%H1anB4oP_^89$(}*Lq%6qNKmB}mh z-<-Uk`{hlfp`*$q*Yvs9VoZ&6{^|VxTyS8OR@J?QqO)f(VRK&2RNZT@%eFH#UATPj zfQ+bAqMGV#Gl^}Q8eervmBivZLv49kecq(zT)9)EQP~spF>>L8!<+@%I9K?&AAFP4 z)F~8j=FAlJB^3uI*z~Q^4pw^evTk?OX5lp{6$gV)&e%Bdb8x4m(u-MZc4Z}PReHH3 zDdUz`TCQ4r$lbN8-kgvAmLFZ7sxV6{SoiKSQn@aPqI*Hi21)pc(YO2E3bp~ zYNcFKjc%{pRODtYi*xbS_$)TUET<*+N5{=|MaVb2{@6pv<=7#^D0}fQko@UD2SLL=-n048m`u`8~bXrXQ zb2462z1`thVRL&~sNCBXju+I@CN)a1y^xWxk>TYlP)z5t5$n?G_fbvg?iM-G@-Xpr zvZ&}DhsPgg8?V@K;!#e0l+ZKB(>uSvn&xm`N9K>{{g?iN{*l%u`~6Sb2C??PTiO;i zH!)vodIHD=B{H{Gg>I>AJ2~yU$|O&j2B-L&%%ypgHG5_*`_eHh`jGPker@c#QXxA*txIo<|7mOy$vigQ;Wuw1$OWYeoXZmT9X?ahp%(FQ zTPn+8RZT7imF3C4p`k6D_Iz7cE@kvx?A35Ad##xYYqOGK(kq;H=6VHI46TFYB)FeDAq3_~HM_#%~gfPV0ZwKCG8kB#<)As}^+m^0WnU%~NvS zkRcj*kL%R_|NoTgmx%uVbbQnCeH+3L#(y#i>e-swd0tHB|7U{(hCCKlb|y?gEJW+V TRp|ZyEN}oQ#}tF10JjVPAzuao