guacamole-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmuehl...@apache.org
Subject [09/26] incubator-guacamole-server git commit: GUACAMOLE-25: Set AudioCapture flag if audio input is enabled.
Date Thu, 02 Jun 2016 18:45:16 GMT
GUACAMOLE-25: Set AudioCapture flag if audio input is enabled.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/4fdcfebf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/4fdcfebf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/4fdcfebf

Branch: refs/heads/master
Commit: 4fdcfebf2548161d771e430bead6ce7c29a3fc98
Parents: 36cc9f4
Author: Michael Jumper <mjumper@apache.org>
Authored: Sat Apr 16 21:42:31 2016 -0700
Committer: Michael Jumper <mjumper@apache.org>
Committed: Wed May 25 13:50:28 2016 -0700

----------------------------------------------------------------------
 configure.ac                     | 12 ++++++++++++
 src/protocols/rdp/rdp_settings.c | 11 +++++++++++
 2 files changed, 23 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4fdcfebf/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index edd49b8..485c10d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -436,6 +436,7 @@ then
     have_freerdp=yes
     legacy_freerdp_extensions=no
     rdpsettings_interface=unknown
+    rdpsettings_audiocapture=yes
     rdpsettings_audioplayback=yes
     rdpsettings_deviceredirection=yes
     freerdp_interface=unknown
@@ -686,6 +687,11 @@ then
                          [rdpsettings_audioplayback=no],
                          [[#include <freerdp/freerdp.h>]])
 
+        # Legacy interface may not have AudioCapture settings
+        AC_CHECK_MEMBERS([rdpSettings.audio_capture],,
+                         [rdpsettings_audiocapture=no],
+                         [[#include <freerdp/freerdp.h>]])
+
         # Legacy interface may not have DeviceRedirection settings
         AC_CHECK_MEMBERS([rdpSettings.device_redirection],,
                          [rdpsettings_deviceredirection=no],
@@ -707,6 +713,12 @@ if test "x${have_freerdp}" = "xyes" -a "x${rdpsettings_audioplayback}"
= "xyes";
               [Whether the rdpSettings structure has AudioPlayback settings])
 fi
 
+# Activate audio capture settings if present
+if test "x${have_freerdp}" = "xyes" -a "x${rdpsettings_audiocapture}" = "xyes"; then
+    AC_DEFINE([HAVE_RDPSETTINGS_AUDIOCAPTURE],,
+              [Whether the rdpSettings structure has AudioCapture settings])
+fi
+
 # Activate device redirection settings if present
 if test "x${have_freerdp}" = "xyes" -a "x${rdpsettings_deviceredirection}" = "xyes"; then
     AC_DEFINE([HAVE_RDPSETTINGS_DEVICEREDIRECTION],,

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/4fdcfebf/src/protocols/rdp/rdp_settings.c
----------------------------------------------------------------------
diff --git a/src/protocols/rdp/rdp_settings.c b/src/protocols/rdp/rdp_settings.c
index 4f9343c..82af859 100644
--- a/src/protocols/rdp/rdp_settings.c
+++ b/src/protocols/rdp/rdp_settings.c
@@ -995,6 +995,17 @@ void guac_rdp_push_settings(guac_rdp_settings* guac_settings, freerdp*
rdp) {
 #endif
 #endif
 
+    /* Audio capture */
+#ifdef LEGACY_RDPSETTINGS
+#ifdef HAVE_RDPSETTINGS_AUDIOCAPTURE
+    rdp_settings->audio_capture = guac_settings->enable_audio_input;
+#endif
+#else
+#ifdef HAVE_RDPSETTINGS_AUDIOCAPTURE
+    rdp_settings->AudioCapture = guac_settings->enable_audio_input;
+#endif
+#endif
+
     /* Device redirection */
 #ifdef LEGACY_RDPSETTINGS
 #ifdef HAVE_RDPSETTINGS_DEVICEREDIRECTION


Mime
View raw message