aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-06-01 21:46:50 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-06-01 21:46:50 +0000
commit30fbe985b70017efbedc931f4d38852f8a579bf9 (patch)
tree858a755d00db0a7c1462e7be365387798dbdb6b0
parent679808ef9fd335fcab98f2a909f2f5c2885caa65 (diff)
remove pointless forcing of the channel into SLINEAR mode; the write format will be set later based on the file that is chosen to be played to the channel
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@31555 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--res/res_musiconhold.c14
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;