From a0f5ccbcf0e6b5cc600e0d38111bbd744475481b Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 24 Sep 2013 14:26:26 -0700 Subject: [PATCH] Fix ordering of reads. --- .../src/main/resources/guacamole.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/guacamole-common-js/src/main/resources/guacamole.js b/guacamole-common-js/src/main/resources/guacamole.js index a91c9fc78..aa860b886 100644 --- a/guacamole-common-js/src/main/resources/guacamole.js +++ b/guacamole-common-js/src/main/resources/guacamole.js @@ -868,15 +868,14 @@ Guacamole.Client = function(tunnel) { "audio": function(parameters) { var stream_index = parseInt(parameters[0]); + var channel = getAudioChannel(parseInt(parameters[1])); + var mimetype = parameters[2]; + var duration = parseFloat(parameters[3]); // Create stream var stream = streams[stream_index] = new Guacamole.InputStream(mimetype); - var channel = getAudioChannel(parseInt(parameters[1])); - var mimetype = parameters[2]; - var duration = parseFloat(parameters[3]); - stream.onclose = function() { channel.play(mimetype, duration, stream.getBlob()); }; @@ -1421,15 +1420,14 @@ Guacamole.Client = function(tunnel) { "video": function(parameters) { var stream_index = parseInt(parameters[0]); + var layer = getLayer(parseInt(parameters[1])); + var mimetype = parameters[2]; + var duration = parseFloat(parameters[3]); // Create stream var stream = streams[stream_index] = new Guacamole.InputStream(mimetype); - var layer = getLayer(parseInt(parameters[1])); - var mimetype = parameters[2]; - var duration = parseFloat(parameters[3]); - // Play video once closed stream.onclose = function() {