diff options
| author | Stefan Radomski <github@mintwerk.de> | 2014-05-23 13:01:34 (GMT) |
|---|---|---|
| committer | Stefan Radomski <github@mintwerk.de> | 2014-05-23 13:01:34 (GMT) |
| commit | 3709f5aa6bc3f458078b9e2b9ded67b75bbbcce4 (patch) | |
| tree | 35ae0afcd0e7f45a1bcbee14789bd6ee7b93450c /src/uscxml | |
| parent | 3bfa7a3dcf69edf13fb73f63e036ec5d3cc740ed (diff) | |
| parent | 53058d65f917bca3379444b72c22e4ae09a7465e (diff) | |
| download | uscxml-3709f5aa6bc3f458078b9e2b9ded67b75bbbcce4.zip uscxml-3709f5aa6bc3f458078b9e2b9ded67b75bbbcce4.tar.gz uscxml-3709f5aa6bc3f458078b9e2b9ded67b75bbbcce4.tar.bz2 | |
Merge pull request #36 from mathiasjohanson/master
not 100% cpu anymore and no crash on disconnect
Diffstat (limited to 'src/uscxml')
| -rw-r--r-- | src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp b/src/uscxml/plugins/invoker/miles/MilesSessionInvoker.cpp index 2dd05f2..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; @@ -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 */ |