From e89b49ff12256ead8f0b4d265a2244099cf72708 Mon Sep 17 00:00:00 2001 From: Mathias Johanson Date: Fri, 23 May 2014 14:12:51 +0200 Subject: audio thread polling issue --- src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp b/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp index 2dd05f2..da9ff18 100644 --- a/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp +++ b/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp @@ -974,7 +974,7 @@ void MilesSessionInvoker::rtp_audio_receiver(struct miles_rtp_session *rtp_sessi /* Poll RTP socket, read all available RTP packets */ while (1) { - n = miles_net_poll_socket(rtp_session->socket); + n = miles_net_wait_socket(rtp_session->socket, 10); if(n<=0) return; /* Read RTP data */ -- cgit v0.12 From 53058d65f917bca3379444b72c22e4ae09a7465e Mon Sep 17 00:00:00 2001 From: Mathias Johanson Date: Fri, 23 May 2014 14:19:53 +0200 Subject: crash in audio device close fixed --- src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp b/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp index da9ff18..b29e827 100644 --- a/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp +++ b/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp @@ -629,7 +629,7 @@ void MilesSessionInvoker::processAudio() { if(audio_dev_playback) miles_audio_device_close(MILES_AUDIO_IO_OPENAL, audio_dev_playback, 0); if(audio_dev) - miles_audio_device_close(MILES_AUDIO_IO_OPENAL, audio_dev_playback, 1); + miles_audio_device_close(MILES_AUDIO_IO_OPENAL, audio_dev, 1); miles_audio_codec_destroy_encoder(audio_encoder); audio_available = 0; sendaudio_enabled = 0; -- cgit v0.12