From 214df108f893e5c9c86435a7122f63caf3d9ec46 Mon Sep 17 00:00:00 2001 From: Automerge script Date: Thu, 1 Jun 2006 22:05:50 +0000 Subject: [PATCH] automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@31585 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/res_musiconhold.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index a90585b217..8f4ef33d2a 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -221,10 +221,6 @@ static int ast_moh_files_next(struct ast_channel *chan) state->pos = state->pos % state->class->total_files; - if (ast_set_write_format(chan, AST_FORMAT_SLINEAR)) { - ast_log(LOG_WARNING, "Unable to set '%s' to linear format (write)\n", chan->name); - return -1; - } if (!ast_openstream_full(chan, state->class->filearray[state->pos], chan->language, 1)) { ast_log(LOG_WARNING, "Unable to open file '%s': %s\n", state->class->filearray[state->pos], strerror(errno)); state->pos++; @@ -299,14 +295,8 @@ static void *moh_files_alloc(struct ast_channel *chan, void *params) state->origwfmt = chan->writeformat; - if (ast_set_write_format(chan, AST_FORMAT_SLINEAR)) { - ast_log(LOG_WARNING, "Unable to set '%s' to linear format (write)\n", chan->name); - free(chan->music_state); - chan->music_state = NULL; - } else { - if (option_verbose > 2) - ast_verbose(VERBOSE_PREFIX_3 "Started music on hold, class '%s', on %s\n", class->name, chan->name); - } + if (option_verbose > 2) + ast_verbose(VERBOSE_PREFIX_3 "Started music on hold, class '%s', on %s\n", class->name, chan->name); } return chan->music_state;