mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-18 07:48:14 +00:00
Get rid of all that old needlock garbage now that we're using recursive mutexes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2644 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -367,15 +367,15 @@ int adsi_transmit_message(struct ast_channel *chan, unsigned char *msg, int msgl
|
||||
|
||||
ast_stopstream(chan);
|
||||
|
||||
if (ast_set_write_format(chan, AST_FORMAT_ULAW, 1)) {
|
||||
if (ast_set_write_format(chan, AST_FORMAT_ULAW)) {
|
||||
ast_log(LOG_WARNING, "Unable to set write format to ULAW\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (ast_set_read_format(chan, AST_FORMAT_ULAW, 1)) {
|
||||
if (ast_set_read_format(chan, AST_FORMAT_ULAW)) {
|
||||
ast_log(LOG_WARNING, "Unable to set read format to ULAW\n");
|
||||
if (writeformat) {
|
||||
if (ast_set_write_format(chan, writeformat, 1))
|
||||
if (ast_set_write_format(chan, writeformat))
|
||||
ast_log(LOG_WARNING, "Unable to restore write format to %d\n", writeformat);
|
||||
}
|
||||
return -1;
|
||||
@@ -385,9 +385,9 @@ int adsi_transmit_message(struct ast_channel *chan, unsigned char *msg, int msgl
|
||||
chan->adsicpe = (chan->adsicpe & ~ADSI_FLAG_DATAMODE) | newdatamode;
|
||||
|
||||
if (writeformat)
|
||||
ast_set_write_format(chan, writeformat, 1);
|
||||
ast_set_write_format(chan, writeformat);
|
||||
if (readformat)
|
||||
ast_set_read_format(chan, readformat, 1);
|
||||
ast_set_read_format(chan, readformat);
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user