diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-03-27 06:50:12 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-03-27 06:50:12 +0000 |
| commit | 5acf40987d242dc3f7c9329b8b9b61b3e512113a (patch) | |
| tree | 8787e6295801bf6156269a895cc43bd31aaab412 /res | |
| parent | f23e53be88380f4dde772c5fd4c336271d01ebc4 (diff) | |
Make read/write mode have a lock parameter and use it properly.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2572 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rwxr-xr-x | res/res_adsi.c | 10 | ||||
| -rwxr-xr-x | res/res_musiconhold.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/res/res_adsi.c b/res/res_adsi.c index c581e7a4f..e23718947 100755 --- a/res/res_adsi.c +++ b/res/res_adsi.c @@ -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)) { + if (ast_set_write_format(chan, AST_FORMAT_ULAW, 1)) { ast_log(LOG_WARNING, "Unable to set write format to ULAW\n"); return -1; } - if (ast_set_read_format(chan, AST_FORMAT_ULAW)) { + if (ast_set_read_format(chan, AST_FORMAT_ULAW, 1)) { ast_log(LOG_WARNING, "Unable to set read format to ULAW\n"); if (writeformat) { - if (ast_set_write_format(chan, writeformat)) + if (ast_set_write_format(chan, writeformat, 1)) 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); + ast_set_write_format(chan, writeformat, 1); if (readformat) - ast_set_read_format(chan, readformat); + ast_set_read_format(chan, readformat, 1); return res; } diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index d0c1b640d..febdaaa04 100755 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -397,7 +397,7 @@ static void moh_release(struct ast_channel *chan, void *data) oldwfmt = moh->origwfmt; free(moh); if (chan) { - if (oldwfmt && ast_set_write_format(chan, oldwfmt)) + if (oldwfmt && ast_set_write_format(chan, oldwfmt, 0)) ast_log(LOG_WARNING, "Unable to restore channel '%s' to format %s\n", chan->name, ast_getformatname(oldwfmt)); if (option_verbose > 2) ast_verbose(VERBOSE_PREFIX_3 "Stopped music on hold on %s\n", chan->name); @@ -420,7 +420,7 @@ static void *moh_alloc(struct ast_channel *chan, void *params) ast_mutex_unlock(&moh_lock); if (res) { res->origwfmt = chan->writeformat; - if (ast_set_write_format(chan, AST_FORMAT_SLINEAR)) { + if (ast_set_write_format(chan, AST_FORMAT_SLINEAR, 1)) { ast_log(LOG_WARNING, "Unable to set '%s' to signed linear format\n", chan->name); moh_release(NULL, res); res = NULL; |