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

Working sound

Browse Source
This commit is contained in:
Michael Jumper 2013-08-09 17:01:06 -07:00
parent 6e3bbe38d5
commit fa3dcea44b
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/protocols/vnc/pulse.c
View File

@ -35,6 +35,7 @@
* *
* ***** END LICENSE BLOCK ***** */ * ***** END LICENSE BLOCK ***** */
#include <guacamole/audio.h>
#include <guacamole/client.h> #include <guacamole/client.h>
#include <pulse/pulseaudio.h> #include <pulse/pulseaudio.h>
@ -45,12 +46,22 @@ static void __stream_read_callback(pa_stream* stream, size_t length,
void* data) { void* data) {
guac_client* client = (guac_client*) data; guac_client* client = (guac_client*) data;
vnc_guac_client_data* client_data = (vnc_guac_client_data*) client->data;
guac_audio_stream* audio = client_data->audio;
const void* buffer; const void* buffer;
/* Read data */ /* Read data */
pa_stream_peek(stream, &buffer, &length); pa_stream_peek(stream, &buffer, &length);
guac_client_log_info(client, "STUB: Received %i bytes", length); /* Write data */
guac_audio_stream_write_pcm(audio, buffer, length);
/* Flush occasionally */
if (audio->pcm_bytes_written > 10000) {
guac_audio_stream_end(audio);
guac_audio_stream_begin(client_data->audio, 44100, 2, 16);
}
/* Advance buffer */ /* Advance buffer */
pa_stream_drop(stream); pa_stream_drop(stream);
@ -121,7 +132,7 @@ static void __context_get_sink_info_callback(pa_context* context,
/* Start stream */ /* Start stream */
pa_stream_connect_record(stream, info->monitor_source_name, NULL, pa_stream_connect_record(stream, info->monitor_source_name, NULL,
PA_STREAM_DONT_INHIBIT_AUTO_SUSPEND); PA_STREAM_DONT_INHIBIT_AUTO_SUSPEND);
} }
@ -200,6 +211,7 @@ void guac_pa_start_stream(guac_client* client) {
pa_context* context; pa_context* context;
guac_client_log_info(client, "Starting audio stream"); guac_client_log_info(client, "Starting audio stream");
guac_audio_stream_begin(client_data->audio, 44100, 2, 16);
/* Init main loop */ /* Init main loop */
client_data->pa_mainloop = pa_threaded_mainloop_new(); client_data->pa_mainloop = pa_threaded_mainloop_new();