diff options
| author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-01 22:05:50 +0000 |
|---|---|---|
| committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-01 22:05:50 +0000 |
| commit | 02982d559906d3c8ed949fbe18f1792e16eefa88 (patch) | |
| tree | 91c6bb3f0c653954d6151afd9d676df6cab65fd3 /res | |
| parent | 753d04597224cca1e69bd4224012c92af62e1504 (diff) | |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@31585 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_musiconhold.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index a90585b21..8f4ef33d2 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; |