Merge "chan_console: don't read and write at the same time"

pull/9/head
Jenkins2 7 years ago committed by Gerrit Code Review
commit e132f22a2e

@ -278,7 +278,9 @@ static void *stream_monitor(void *data)
for (;;) {
pthread_testcancel();
console_pvt_lock(pvt);
res = Pa_ReadStream(pvt->stream, buf, sizeof(buf) / sizeof(int16_t));
console_pvt_unlock(pvt);
pthread_testcancel();
if (!pvt->owner) {
@ -611,7 +613,9 @@ static int console_write(struct ast_channel *chan, struct ast_frame *f)
{
struct console_pvt *pvt = ast_channel_tech_pvt(chan);
console_pvt_lock(pvt);
Pa_WriteStream(pvt->stream, f->data.ptr, f->samples);
console_pvt_unlock(pvt);
return 0;
}

Loading…
Cancel
Save