More winpr compat, fix include test.
This commit is contained in:
parent
bdc5d862db
commit
678d21cd36
@ -244,6 +244,9 @@ AC_CHECK_LIB([freerdp-codec], [freerdp_image_convert],
|
|||||||
[RDP_LIBS="$RDP_LIBS -lfreerdp-codec"],
|
[RDP_LIBS="$RDP_LIBS -lfreerdp-codec"],
|
||||||
[have_freerdp=no])
|
[have_freerdp=no])
|
||||||
|
|
||||||
|
# FreeRDP-specific headers
|
||||||
|
AC_CHECK_HEADERS([freerdp/locale/keyboard.h])
|
||||||
|
|
||||||
# Check for stream support via WinPR
|
# Check for stream support via WinPR
|
||||||
AC_CHECK_HEADER(winpr/stream.h,, # <-- stable-1.1
|
AC_CHECK_HEADER(winpr/stream.h,, # <-- stable-1.1
|
||||||
[have_winpr=no,
|
[have_winpr=no,
|
||||||
|
@ -58,14 +58,14 @@
|
|||||||
/* MESSAGE HANDLERS */
|
/* MESSAGE HANDLERS */
|
||||||
|
|
||||||
void guac_rdpsnd_formats_handler(guac_rdpsndPlugin* rdpsnd,
|
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) {
|
guac_rdpsnd_pdu_header* header) {
|
||||||
|
|
||||||
int server_format_count;
|
int server_format_count;
|
||||||
int server_version;
|
int server_version;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
STREAM* output_stream;
|
wStream* output_stream;
|
||||||
int output_body_size;
|
int output_body_size;
|
||||||
unsigned char* output_stream_end;
|
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 */
|
/* server is getting a feel of the round trip time */
|
||||||
void guac_rdpsnd_training_handler(guac_rdpsndPlugin* rdpsnd,
|
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) {
|
guac_rdpsnd_pdu_header* header) {
|
||||||
|
|
||||||
int data_size;
|
int data_size;
|
||||||
STREAM* output_stream;
|
wStream* output_stream;
|
||||||
|
|
||||||
rdp_guac_client_data* guac_client_data =
|
rdp_guac_client_data* guac_client_data =
|
||||||
(rdp_guac_client_data*) audio->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,
|
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) {
|
guac_rdpsnd_pdu_header* header) {
|
||||||
|
|
||||||
unsigned char buffer[4];
|
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,
|
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) {
|
guac_rdpsnd_pdu_header* header) {
|
||||||
|
|
||||||
rdpSvcPlugin* plugin = (rdpSvcPlugin*)rdpsnd;
|
rdpSvcPlugin* plugin = (rdpSvcPlugin*)rdpsnd;
|
||||||
@ -280,7 +280,7 @@ void guac_rdpsnd_wave_handler(guac_rdpsndPlugin* rdpsnd,
|
|||||||
(rdp_guac_client_data*) audio->client->data;
|
(rdp_guac_client_data*) audio->client->data;
|
||||||
|
|
||||||
/* Wave Confirmation PDU */
|
/* Wave Confirmation PDU */
|
||||||
STREAM* output_stream = stream_new(8);
|
wStream* output_stream = stream_new(8);
|
||||||
|
|
||||||
/* Get wave data */
|
/* Get wave data */
|
||||||
unsigned char* buffer = stream_get_head(input_stream) + 4;
|
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,
|
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) {
|
guac_rdpsnd_pdu_header* header) {
|
||||||
|
|
||||||
/* STUB: Do nothing for now */
|
/* STUB: Do nothing for now */
|
||||||
|
@ -78,12 +78,12 @@ void guac_rdpsnd_process_terminate(rdpSvcPlugin* plugin) {
|
|||||||
free(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);
|
freerdp_event_free(event);
|
||||||
}
|
}
|
||||||
|
|
||||||
void guac_rdpsnd_process_receive(rdpSvcPlugin* plugin,
|
void guac_rdpsnd_process_receive(rdpSvcPlugin* plugin,
|
||||||
STREAM* input_stream) {
|
wStream* input_stream) {
|
||||||
|
|
||||||
guac_rdpsndPlugin* rdpsnd = (guac_rdpsndPlugin*) plugin;
|
guac_rdpsndPlugin* rdpsnd = (guac_rdpsndPlugin*) plugin;
|
||||||
guac_rdpsnd_pdu_header header;
|
guac_rdpsnd_pdu_header header;
|
||||||
|
@ -140,7 +140,7 @@ void guac_rdpsnd_process_terminate(rdpSvcPlugin* plugin);
|
|||||||
* Handler called when this plugin receives an event. For the sake of RDPSND,
|
* Handler called when this plugin receives an event. For the sake of RDPSND,
|
||||||
* all events will be ignored and simply free'd.
|
* 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
|
#endif
|
||||||
|
|
||||||
|
@ -41,6 +41,7 @@
|
|||||||
|
|
||||||
#define Stream_Write_UINT8 stream_write_uint8
|
#define Stream_Write_UINT8 stream_write_uint8
|
||||||
#define wStream STREAM
|
#define wStream STREAM
|
||||||
|
#define wMessage RDP_EVENT
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user