Merge 1.2.0 changes back to master.
This commit is contained in:
commit
029563a4b9
@ -296,11 +296,18 @@ void guac_rdpsnd_wave_info_handler(guac_rdp_common_svc* svc,
|
|||||||
rdpsnd->next_pdu_is_wave = TRUE;
|
rdpsnd->next_pdu_is_wave = TRUE;
|
||||||
|
|
||||||
/* Reset audio stream if format has changed */
|
/* Reset audio stream if format has changed */
|
||||||
if (audio != NULL)
|
if (audio != NULL) {
|
||||||
guac_audio_stream_reset(audio, NULL,
|
if (format < sizeof(rdpsnd->formats))
|
||||||
rdpsnd->formats[format].rate,
|
guac_audio_stream_reset(audio, NULL,
|
||||||
rdpsnd->formats[format].channels,
|
rdpsnd->formats[format].rate,
|
||||||
rdpsnd->formats[format].bps);
|
rdpsnd->formats[format].channels,
|
||||||
|
rdpsnd->formats[format].bps);
|
||||||
|
|
||||||
|
else
|
||||||
|
guac_client_log(svc->client, GUAC_LOG_WARNING, "RDP server "
|
||||||
|
"attempted to specify an invalid audio format. Sound may "
|
||||||
|
"not work as expected.");
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user