From 2e681a1348de91a8e28fd6a151a089e06377f647 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 23 Oct 2012 19:05:32 -0700 Subject: [PATCH] Remove old silence tests, test via canPlayType(). --- guacamole/pom.xml | 2 +- guacamole/src/main/webapp/client.xhtml | 6 +++ .../src/main/webapp/scripts/interface.js | 39 +++++++----------- guacamole/src/main/webapp/sounds/silence.mp3 | Bin 2506 -> 0 bytes guacamole/src/main/webapp/sounds/silence.ogg | Bin 5267 -> 0 bytes guacamole/src/main/webapp/sounds/silence.wav | Bin 17684 -> 0 bytes 6 files changed, 22 insertions(+), 25 deletions(-) delete mode 100644 guacamole/src/main/webapp/sounds/silence.mp3 delete mode 100644 guacamole/src/main/webapp/sounds/silence.ogg delete mode 100644 guacamole/src/main/webapp/sounds/silence.wav diff --git a/guacamole/pom.xml b/guacamole/pom.xml index c60c62988..d8dea090f 100644 --- a/guacamole/pom.xml +++ b/guacamole/pom.xml @@ -30,7 +30,7 @@ org.apache.maven.plugins maven-war-plugin - + diff --git a/guacamole/src/main/webapp/client.xhtml b/guacamole/src/main/webapp/client.xhtml index 34e4ec4bc..11af52c2b 100644 --- a/guacamole/src/main/webapp/client.xhtml +++ b/guacamole/src/main/webapp/client.xhtml @@ -149,6 +149,12 @@ window.location.search.substring(1) + "&width=" + window.innerWidth + "&height=" + window.innerHeight; + + // Add audio mimetypes to connect_string + GuacamoleUI.supportedAudio.forEach(function(mimetype) { + connect_string += "&audio=" + mimetype; + }); + guac.connect(connect_string); } diff --git a/guacamole/src/main/webapp/scripts/interface.js b/guacamole/src/main/webapp/scripts/interface.js index 445b8d5b9..7ac5998ac 100644 --- a/guacamole/src/main/webapp/scripts/interface.js +++ b/guacamole/src/main/webapp/scripts/interface.js @@ -61,8 +61,11 @@ var GuacamoleUI = { }; -// Supported mimetypes -GuacamoleUI.supportedAudio = {}; +/** + * Array of all supported audio mimetypes, populated when this script is + * loaded. + */ +GuacamoleUI.supportedAudio = []; // Constant UI initialization and behavior (function() { @@ -487,32 +490,20 @@ GuacamoleUI.supportedAudio = {}; GuacamoleUI.eventTarget.style.top = window.pageYOffset + "px"; }); - function testAudio(url, mimetype) { + // Build array of supported audio formats + [ + 'audio/ogg; codecs="vorbis"', + 'audio/mpeg; codecs="mp3"', + 'audio/wav' + ].forEach(function(mimetype) { - // If browser says we can't play it, don't try var audio = new Audio(); - if (!audio.canPlayType(mimetype)) - return; + var support_level = audio.canPlayType(mimetype); - // Otherwise, test - audio.src = url; + if (support_level != "") + GuacamoleUI.supportedAudio.push(mimetype); - // On error, explicitly unsupported - audio.addEventListener("error", function() { - GuacamoleUI.supportedAudio[mimetype] = false; - }); - - // On successful play, explicitly supported - audio.addEventListener("ended", function() { - GuacamoleUI.supportedAudio[mimetype] = true; - }); - - audio.play(); - - } - - testAudio("sounds/silence.mp3", "audio/mpeg"); - testAudio("sounds/silence.ogg", "audio/ogg"); + }); })(); diff --git a/guacamole/src/main/webapp/sounds/silence.mp3 b/guacamole/src/main/webapp/sounds/silence.mp3 deleted file mode 100644 index 9dd6ef37ad5e388f9ffacc2a92a78ad58acb64a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2506 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�dR$&!u#K3&a+nFtQsj2Ja-;d*@>vh z3Iw59NCJ3tYI#1gg(kouw90%VE}dF{0B|=|7yiZQhfQ@L;C2hDW1HS~<4L{7#r3nFA1@ zMZ3IdKyNNb3pauR#yR0A+z=@lMe8j)xoV#Ggagz!KH^yb-H1Z3rgvMwynrtdh-w*H zEJx~@C~Odx3DD{nYz;wCiy+ojL61Pp)^#UF{47glTsS#)uNHu3dQ(8D&dk7-&NQp3 z4Av$pdSAK|(sE%+9)aT;SxfQ}Ec_}y3x6}<1w%f&rVCA|y4)jS11WKfw)?3;(9uub z{}W{olQV6G_F1D3{t!5WH_Pr;yIl3|2-*NWiV?$bzd}$F;*Gg9WdIg>AR!<)tA?BD zFi26{4&K@j-^#JGF6atl6vvxzX|#sGa6g&^L3s9cL0P<`<#`CN>P}F$L#3iCIIF5L zEZdv*{q5i^2g|uz`ITqxZaH2<2#=xLe@_U{Zor0a+G?-5w`E!*c5Vp6{!VZVvyspn zlBKMZXE`i=a}QxSbgctmSDG&H*tdVt3Cal>2R7dA8whZG~*dkC1wbXro{8G)^HH=0(gc;C1x-_ppu-sT~IAiw2sj>;?JZ1R^&E9jLjgp`stXg3a?;9+wh%-iRRU)nA z0g5csL6UzUz;OW2HRg_x5?9j<><1PRJLF*Kvb?yf-3x*z@)V0>L#&Q@YrD8o& z(e`WR+mfzMThmUXCz7FF0H%RwaDnT9scA>c#!XRMwxQk8iRV=;=*lROkt=r>A{g>$yxOLg?!n<*)AMD-0IC zdj0HqZ$cAC)nUROelq-!X#vK^`!0oheo&8}`>FEg&b6T>Klsd_*~GZVTXOGF=KgdR z$wl_|+^dCp0JnM1w)+F_}v4@zcL?{2n$NS=^l@1CC&|Bda>>O zyFG7zT{?8Q^{gBFR%fEcxbe#>`7Hm!!y@0Q`Xa%!-jtKWY<_4;g^%Bv{PD+y_r6-{ z&#&89OB-3eM^$FOxMA>I^dif%oxK+g**_m)6zC59_AYmk=hc5UymculOxRz)E~9Kf z!-yq$9P3Nq+cZ(QZeCHmwh-&5qgKv-A0-W3~lXf4ojT zf26J>x-gBhfF0g8V&n32#gB2V!?{}?hL>LmICxxdj#X;W%mi|~erXt%=(tq&w&&G0 zQ{W!-d-(ka>AE`39n|uc)xpbQ5)Z)JvBtsz<)I|sd71~?wtg8?_{YoNoJ(HCuA4oh zZ#3|MsANf2v4(hw-M9N@5u-?WB%w8V^aaJgd5Gn*%d8~k_RDjdA68Fq+q-nDDwzJj z_UJ#J`pk$-&*;T_F7$sq7JT+_YQ;!c{R-aBHsXlxt!J0pP93-)(C_W(eR9IUZDh?C zySkH?B^~Xc)hU0kcx|0*X82_RxXRo5{RAJw#=gs$D1-`%6_w?P@-@QpOpZBk) z%AtF{^$TOmf0_G-bjj&@|L;v0A4o2kxJNxRj;V_l)V{jE+Vux|)5(iNdv|Xxv6kw) zPF>eJ=eFJJyTr)lH8qzdQ~VN+xNV-jbD((s3rfnJZ5sX>>YeSlFW8&b5WnO&u{jP#45i|kK(MaYI$9A(j#fb6XE&~#kS=;j;2U7d8ySt zx(#)QcV@5ku_5AJWZPmiL4fz8gF8>w%mM801p*va<(6Px-t!_W0#@EkE<_EKv|2MAfQ3IC*xBS_Qm} zKK8BStzA`5`%A31y?<9CTHAs@V}0Nh>#%=8Ox_NYZ%4h@x`ho5-Sy>L*cr>$>^ePq zvLc4|?ylYO(q)B$WAfcg9?v<@75?^LY9EUR)y$!Rvm#!q*QF;lu^;A&YJ8u{o<3oA z60_2Wcb&JDzqxL#$;(VQe|vPwIx`35j`dqM4A%8m_1>!{7?QY`y(ndW^g)j$s2JI$fD?AmF;B+1;y_!#ubZ%^xeDLt(;>@L@Dyn%b_08Y*4XUM6GzrS%Ei&$ABe7`$68M8j{xz3B`w**mJzzG2V8X_ih6YksK-MZm%bRbUfN5Bv}2wEdj` diff --git a/guacamole/src/main/webapp/sounds/silence.wav b/guacamole/src/main/webapp/sounds/silence.wav deleted file mode 100644 index 4b2f5cc0968b4579e0b9baa416dfac538a8b7ace..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17684 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 mruMtXTX$oe_~j&g$s)#Z%g+|A