From 4e43b79f0e8ce82ebb957f6df7280d85571662da Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 23 Oct 2012 19:45:16 -0700 Subject: [PATCH] Actually implement audio and video parts of preamble. --- .../protocol/ConfiguredGuacamoleSocket.java | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/ConfiguredGuacamoleSocket.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/ConfiguredGuacamoleSocket.java index 2fe2bcb14..0a7605ddb 100644 --- a/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/ConfiguredGuacamoleSocket.java +++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/ConfiguredGuacamoleSocket.java @@ -37,10 +37,10 @@ package net.sourceforge.guacamole.protocol; * * ***** END LICENSE BLOCK ***** */ -import net.sourceforge.guacamole.io.GuacamoleReader; -import net.sourceforge.guacamole.io.GuacamoleWriter; import net.sourceforge.guacamole.GuacamoleException; import net.sourceforge.guacamole.GuacamoleServerException; +import net.sourceforge.guacamole.io.GuacamoleReader; +import net.sourceforge.guacamole.io.GuacamoleWriter; import net.sourceforge.guacamole.net.GuacamoleSocket; import net.sourceforge.guacamole.protocol.GuacamoleInstruction.Operation; @@ -139,11 +139,19 @@ public class ConfiguredGuacamoleSocket implements GuacamoleSocket { ) ); - // Send supported audio formats (STUB) - writer.writeInstruction(new GuacamoleInstruction(Operation.CLIENT_AUDIO)); + // Send supported audio formats + writer.writeInstruction( + new GuacamoleInstruction( + Operation.CLIENT_AUDIO, + info.getAudioMimetypes().toArray(new String[0]) + )); - // Send supported video formats (STUB) - writer.writeInstruction(new GuacamoleInstruction(Operation.CLIENT_VIDEO)); + // Send supported video formats + writer.writeInstruction( + new GuacamoleInstruction( + Operation.CLIENT_VIDEO, + info.getAudioMimetypes().toArray(new String[0]) + )); // Send args writer.writeInstruction(new GuacamoleInstruction(Operation.CLIENT_CONNECT, args));