mirror of
https://github.com/asterisk/asterisk.git
synced 2026-06-09 03:45:27 +00:00
Fixup read/write locking
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2573 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -113,7 +113,7 @@ static int ices_exec(struct ast_channel *chan, void *data)
|
||||
}
|
||||
|
||||
oreadformat = chan->readformat;
|
||||
res = ast_set_read_format(chan, AST_FORMAT_SLINEAR);
|
||||
res = ast_set_read_format(chan, AST_FORMAT_SLINEAR, 0);
|
||||
if (res < 0) {
|
||||
close(fds[0]);
|
||||
close(fds[1]);
|
||||
@@ -164,7 +164,7 @@ static int ices_exec(struct ast_channel *chan, void *data)
|
||||
if (pid > -1)
|
||||
kill(pid, SIGKILL);
|
||||
if (!res && oreadformat)
|
||||
ast_set_read_format(chan, oreadformat);
|
||||
ast_set_read_format(chan, oreadformat, 0);
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
@@ -109,7 +109,7 @@ static int NBScat_exec(struct ast_channel *chan, void *data)
|
||||
ast_stopstream(chan);
|
||||
|
||||
owriteformat = chan->writeformat;
|
||||
res = ast_set_write_format(chan, AST_FORMAT_SLINEAR);
|
||||
res = ast_set_write_format(chan, AST_FORMAT_SLINEAR, 0);
|
||||
if (res < 0) {
|
||||
ast_log(LOG_WARNING, "Unable to set write format to signed linear\n");
|
||||
return -1;
|
||||
@@ -173,7 +173,7 @@ static int NBScat_exec(struct ast_channel *chan, void *data)
|
||||
if (pid > -1)
|
||||
kill(pid, SIGKILL);
|
||||
if (!res && owriteformat)
|
||||
ast_set_write_format(chan, owriteformat);
|
||||
ast_set_write_format(chan, owriteformat, 0);
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user