mirror of
https://github.com/gyurix1968/guacamole-client.git
synced 2025-09-06 13:17:41 +00:00
Remove old silence tests, test via canPlayType().
This commit is contained in:
@@ -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);
|
||||
|
||||
}
|
||||
|
@@ -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,33 +490,21 @@ 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");
|
||||
|
||||
})();
|
||||
|
||||
// Tie UI events / behavior to a specific Guacamole client
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user