summaryrefslogtreecommitdiff
path: root/res/res_musiconhold.c
diff options
context:
space:
mode:
authorMark Spencer <markster@digium.com>2004-04-06 22:17:32 +0000
committerMark Spencer <markster@digium.com>2004-04-06 22:17:32 +0000
commit13bca43aa8d950e7db8c301a2718a2fe290c401a (patch)
treef9360f7b870da96fcd47e19ff8c203287e906599 /res/res_musiconhold.c
parentd0037ea2fde2bf8396ef9bb77892aae9ea86cb86 (diff)
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
Diffstat (limited to 'res/res_musiconhold.c')
-rwxr-xr-xres/res_musiconhold.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index febdaaa04..d0c1b640d 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, 0))
+ if (oldwfmt && ast_set_write_format(chan, oldwfmt))
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, 1)) {
+ if (ast_set_write_format(chan, AST_FORMAT_SLINEAR)) {
ast_log(LOG_WARNING, "Unable to set '%s' to signed linear format\n", chan->name);
moh_release(NULL, res);
res = NULL;