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

GUAC-1517: Only allocate one audio stream for RDP connection.

Browse Source
This commit is contained in:
Michael Jumper 2016-03-31 14:25:31 -07:00
parent f611ea7b65
commit facc0a794e
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/protocols/rdp/client.c
View File

@ -34,6 +34,7 @@
#include <freerdp/cache/cache.h> #include <freerdp/cache/cache.h>
#include <freerdp/channels/channels.h> #include <freerdp/channels/channels.h>
#include <freerdp/freerdp.h> #include <freerdp/freerdp.h>
#include <guacamole/audio.h>
#include <guacamole/client.h> #include <guacamole/client.h>
#include <guacamole/socket.h> #include <guacamole/socket.h>
@ -124,6 +125,10 @@ int guac_rdp_client_free_handler(guac_client* client) {
guac_common_ssh_uninit(); guac_common_ssh_uninit();
#endif #endif
/* Clean up audio stream, if allocated */
if (rdp_client->audio != NULL)
guac_audio_stream_free(rdp_client->audio);
/* Free client data */ /* Free client data */
guac_common_clipboard_free(rdp_client->clipboard); guac_common_clipboard_free(rdp_client->clipboard);
free(rdp_client); free(rdp_client);

34
src/protocols/rdp/rdp.c
View File

@ -247,21 +247,6 @@ BOOL rdp_freerdp_pre_connect(freerdp* instance) {
guac_client_log(client, GUAC_LOG_WARNING, guac_client_log(client, GUAC_LOG_WARNING,
"Failed to load cliprdr plugin. Clipboard will not work."); "Failed to load cliprdr plugin. Clipboard will not work.");
/* If audio enabled, choose an encoder */
if (settings->audio_enabled) {
rdp_client->audio = guac_audio_stream_alloc(client, NULL,
GUAC_RDP_AUDIO_RATE,
GUAC_RDP_AUDIO_CHANNELS,
GUAC_RDP_AUDIO_BPS);
/* Warn if no audio encoding is available */
if (rdp_client->audio == NULL)
guac_client_log(client, GUAC_LOG_INFO,
"No available audio encoding. Sound disabled.");
} /* end if audio enabled */
/* If RDPSND/RDPDR required, load them */ /* If RDPSND/RDPDR required, load them */
if (settings->printing_enabled if (settings->printing_enabled
|| settings->drive_enabled || settings->drive_enabled
@ -917,10 +902,6 @@ static int guac_rdp_handle_connection(guac_client* client) {
freerdp_free(rdp_inst); freerdp_free(rdp_inst);
rdp_client->rdp_inst = NULL; rdp_client->rdp_inst = NULL;
/* Clean up audio stream, if allocated */
if (rdp_client->audio != NULL)
guac_audio_stream_free(rdp_client->audio);
/* Free SVC list */ /* Free SVC list */
guac_common_list_free(rdp_client->available_svc); guac_common_list_free(rdp_client->available_svc);
@ -938,6 +919,21 @@ void* guac_rdp_client_thread(void* data) {
guac_rdp_client* rdp_client = (guac_rdp_client*) client->data; guac_rdp_client* rdp_client = (guac_rdp_client*) client->data;
guac_rdp_settings* settings = rdp_client->settings; guac_rdp_settings* settings = rdp_client->settings;
/* If audio enabled, choose an encoder */
if (settings->audio_enabled) {
rdp_client->audio = guac_audio_stream_alloc(client, NULL,
GUAC_RDP_AUDIO_RATE,
GUAC_RDP_AUDIO_CHANNELS,
GUAC_RDP_AUDIO_BPS);
/* Warn if no audio encoding is available */
if (rdp_client->audio == NULL)
guac_client_log(client, GUAC_LOG_INFO,
"No available audio encoding. Sound disabled.");
} /* end if audio enabled */
/* Load filesystem if drive enabled */ /* Load filesystem if drive enabled */
if (settings->drive_enabled) { if (settings->drive_enabled) {