From 678d21cd36d41917b65640c04d8843e127bf6938 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 16 Jul 2013 23:33:03 -0700 Subject: [PATCH] More winpr compat, fix include test. --- configure.ac | 3 +++ src/protocols/rdp/guac_rdpsnd/rdpsnd_messages.c | 16 ++++++++-------- src/protocols/rdp/guac_rdpsnd/rdpsnd_service.c | 4 ++-- src/protocols/rdp/guac_rdpsnd/rdpsnd_service.h | 2 +- src/protocols/rdp/winpr-compat/stream.h | 1 + 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index 928f09b3..a5d82d8e 100644 --- a/configure.ac +++ b/configure.ac @@ -244,6 +244,9 @@ AC_CHECK_LIB([freerdp-codec], [freerdp_image_convert], [RDP_LIBS="$RDP_LIBS -lfreerdp-codec"], [have_freerdp=no]) +# FreeRDP-specific headers +AC_CHECK_HEADERS([freerdp/locale/keyboard.h]) + # Check for stream support via WinPR AC_CHECK_HEADER(winpr/stream.h,, # <-- stable-1.1 [have_winpr=no, diff --git a/src/protocols/rdp/guac_rdpsnd/rdpsnd_messages.c b/src/protocols/rdp/guac_rdpsnd/rdpsnd_messages.c index 7b8b5c63..5bf8ff9c 100644 --- a/src/protocols/rdp/guac_rdpsnd/rdpsnd_messages.c +++ b/src/protocols/rdp/guac_rdpsnd/rdpsnd_messages.c @@ -58,14 +58,14 @@ /* MESSAGE HANDLERS */ void guac_rdpsnd_formats_handler(guac_rdpsndPlugin* rdpsnd, - audio_stream* audio, STREAM* input_stream, + audio_stream* audio, wStream* input_stream, guac_rdpsnd_pdu_header* header) { int server_format_count; int server_version; int i; - STREAM* output_stream; + wStream* output_stream; int output_body_size; unsigned char* output_stream_end; @@ -208,11 +208,11 @@ void guac_rdpsnd_formats_handler(guac_rdpsndPlugin* rdpsnd, /* server is getting a feel of the round trip time */ void guac_rdpsnd_training_handler(guac_rdpsndPlugin* rdpsnd, - audio_stream* audio, STREAM* input_stream, + audio_stream* audio, wStream* input_stream, guac_rdpsnd_pdu_header* header) { int data_size; - STREAM* output_stream; + wStream* output_stream; rdp_guac_client_data* guac_client_data = (rdp_guac_client_data*) audio->client->data; @@ -236,7 +236,7 @@ void guac_rdpsnd_training_handler(guac_rdpsndPlugin* rdpsnd, } void guac_rdpsnd_wave_info_handler(guac_rdpsndPlugin* rdpsnd, - audio_stream* audio, STREAM* input_stream, + audio_stream* audio, wStream* input_stream, guac_rdpsnd_pdu_header* header) { unsigned char buffer[4]; @@ -271,7 +271,7 @@ void guac_rdpsnd_wave_info_handler(guac_rdpsndPlugin* rdpsnd, } void guac_rdpsnd_wave_handler(guac_rdpsndPlugin* rdpsnd, - audio_stream* audio, STREAM* input_stream, + audio_stream* audio, wStream* input_stream, guac_rdpsnd_pdu_header* header) { rdpSvcPlugin* plugin = (rdpSvcPlugin*)rdpsnd; @@ -280,7 +280,7 @@ void guac_rdpsnd_wave_handler(guac_rdpsndPlugin* rdpsnd, (rdp_guac_client_data*) audio->client->data; /* Wave Confirmation PDU */ - STREAM* output_stream = stream_new(8); + wStream* output_stream = stream_new(8); /* Get wave data */ unsigned char* buffer = stream_get_head(input_stream) + 4; @@ -308,7 +308,7 @@ void guac_rdpsnd_wave_handler(guac_rdpsndPlugin* rdpsnd, } void guac_rdpsnd_close_handler(guac_rdpsndPlugin* rdpsnd, - audio_stream* audio, STREAM* input_stream, + audio_stream* audio, wStream* input_stream, guac_rdpsnd_pdu_header* header) { /* STUB: Do nothing for now */ diff --git a/src/protocols/rdp/guac_rdpsnd/rdpsnd_service.c b/src/protocols/rdp/guac_rdpsnd/rdpsnd_service.c index d049b46a..dc254901 100644 --- a/src/protocols/rdp/guac_rdpsnd/rdpsnd_service.c +++ b/src/protocols/rdp/guac_rdpsnd/rdpsnd_service.c @@ -78,12 +78,12 @@ void guac_rdpsnd_process_terminate(rdpSvcPlugin* plugin) { free(plugin); } -void guac_rdpsnd_process_event(rdpSvcPlugin* plugin, RDP_EVENT* event) { +void guac_rdpsnd_process_event(rdpSvcPlugin* plugin, wMessage* event) { freerdp_event_free(event); } void guac_rdpsnd_process_receive(rdpSvcPlugin* plugin, - STREAM* input_stream) { + wStream* input_stream) { guac_rdpsndPlugin* rdpsnd = (guac_rdpsndPlugin*) plugin; guac_rdpsnd_pdu_header header; diff --git a/src/protocols/rdp/guac_rdpsnd/rdpsnd_service.h b/src/protocols/rdp/guac_rdpsnd/rdpsnd_service.h index 841cd872..9c3ff56f 100644 --- a/src/protocols/rdp/guac_rdpsnd/rdpsnd_service.h +++ b/src/protocols/rdp/guac_rdpsnd/rdpsnd_service.h @@ -140,7 +140,7 @@ void guac_rdpsnd_process_terminate(rdpSvcPlugin* plugin); * Handler called when this plugin receives an event. For the sake of RDPSND, * all events will be ignored and simply free'd. */ -void guac_rdpsnd_process_event(rdpSvcPlugin* plugin, RDP_EVENT* event); +void guac_rdpsnd_process_event(rdpSvcPlugin* plugin, wMessage* event); #endif diff --git a/src/protocols/rdp/winpr-compat/stream.h b/src/protocols/rdp/winpr-compat/stream.h index 13101e65..5e40511b 100644 --- a/src/protocols/rdp/winpr-compat/stream.h +++ b/src/protocols/rdp/winpr-compat/stream.h @@ -41,6 +41,7 @@ #define Stream_Write_UINT8 stream_write_uint8 #define wStream STREAM +#define wMessage RDP_EVENT #endif