maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUAC-874: Remove detection of FastPath settings. Rely on defaults.

Browse Source
This commit is contained in:
Michael Jumper 2014-10-05 14:30:55 -07:00
parent b2ab26c727
commit 3b8e2a5528
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@ -374,7 +374,6 @@ then
legacy_freerdp_extensions=no legacy_freerdp_extensions=no
rdpsettings_interface=unknown rdpsettings_interface=unknown
rdpsettings_audioplayback=yes rdpsettings_audioplayback=yes
rdpsettings_fastpath=yes
freerdp_interface=unknown freerdp_interface=unknown
event_interface=unknown event_interface=unknown
@ -597,12 +596,6 @@ then
AC_DEFINE([LEGACY_RDPSETTINGS],, AC_DEFINE([LEGACY_RDPSETTINGS],,
[Whether the legacy version of the rdpSettings API was found]) [Whether the legacy version of the rdpSettings API was found])
# Legacy interface may not have FastPath settings
AC_CHECK_MEMBERS([rdpSettings.fast_path_input,
rdpSettings.fast_path_output],,
[rdpsettings_fastpath=no],
[[#include <freerdp/freerdp.h>]])
# Legacy interface may not have AudioPlayback settings # Legacy interface may not have AudioPlayback settings
AC_CHECK_MEMBERS([rdpSettings.audio_playback],, AC_CHECK_MEMBERS([rdpSettings.audio_playback],,
[rdpsettings_audioplayback=no], [rdpsettings_audioplayback=no],
@ -618,12 +611,6 @@ then
fi fi
fi fi
# Activate FastPath settings if present
if test "x${have_freerdp}" = "xyes" -a "x${rdpsettings_fastpath}" = "xyes"; then
AC_DEFINE([HAVE_RDPSETTINGS_FASTPATH],,
[Whether the rdpSettings structure has FastPath settings])
fi
# Activate audio playback settings if present # Activate audio playback settings if present
if test "x${have_freerdp}" = "xyes" -a "x${rdpsettings_audioplayback}" = "xyes"; then if test "x${have_freerdp}" = "xyes" -a "x${rdpsettings_audioplayback}" = "xyes"; then
AC_DEFINE([HAVE_RDPSETTINGS_AUDIOPLAYBACK],, AC_DEFINE([HAVE_RDPSETTINGS_AUDIOPLAYBACK],,

8
src/protocols/rdp/rdp_settings.c
View File

@ -217,10 +217,6 @@ void guac_rdp_push_settings(guac_rdp_settings* guac_settings, freerdp* rdp) {
bitmap_cache = rdp_settings->bitmap_cache; bitmap_cache = rdp_settings->bitmap_cache;
rdp_settings->os_major_type = OSMAJORTYPE_UNSPECIFIED; rdp_settings->os_major_type = OSMAJORTYPE_UNSPECIFIED;
rdp_settings->os_minor_type = OSMINORTYPE_UNSPECIFIED; rdp_settings->os_minor_type = OSMINORTYPE_UNSPECIFIED;
#ifdef HAVE_RDPSETTINGS_FASTPATH
rdp_settings->fast_path_input = FALSE;
rdp_settings->fast_path_output = FALSE;
#endif
rdp_settings->desktop_resize = TRUE; rdp_settings->desktop_resize = TRUE;
rdp_settings->order_support[NEG_DSTBLT_INDEX] = TRUE; rdp_settings->order_support[NEG_DSTBLT_INDEX] = TRUE;
rdp_settings->order_support[NEG_PATBLT_INDEX] = FALSE; /* PATBLT not yet supported */ rdp_settings->order_support[NEG_PATBLT_INDEX] = FALSE; /* PATBLT not yet supported */
@ -250,10 +246,6 @@ void guac_rdp_push_settings(guac_rdp_settings* guac_settings, freerdp* rdp) {
bitmap_cache = rdp_settings->BitmapCacheEnabled; bitmap_cache = rdp_settings->BitmapCacheEnabled;
rdp_settings->OsMajorType = OSMAJORTYPE_UNSPECIFIED; rdp_settings->OsMajorType = OSMAJORTYPE_UNSPECIFIED;
rdp_settings->OsMinorType = OSMINORTYPE_UNSPECIFIED; rdp_settings->OsMinorType = OSMINORTYPE_UNSPECIFIED;
#ifdef HAVE_RDPSETTINGS_FASTPATH
rdp_settings->FastPathInput = FALSE;
rdp_settings->FastPathOutput = FALSE;
#endif
rdp_settings->DesktopResize = TRUE; rdp_settings->DesktopResize = TRUE;
rdp_settings->OrderSupport[NEG_DSTBLT_INDEX] = TRUE; rdp_settings->OrderSupport[NEG_DSTBLT_INDEX] = TRUE;
rdp_settings->OrderSupport[NEG_PATBLT_INDEX] = FALSE; /* PATBLT not yet supported */ rdp_settings->OrderSupport[NEG_PATBLT_INDEX] = FALSE; /* PATBLT not yet supported */