diff options
| -rw-r--r-- | apps/app_followme.c | 2 | ||||
| -rw-r--r-- | bridges/bridge_holding.c | 2 | ||||
| -rw-r--r-- | main/channel.c | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/apps/app_followme.c b/apps/app_followme.c index d12de3c1a..317100106 100644 --- a/apps/app_followme.c +++ b/apps/app_followme.c @@ -1424,7 +1424,7 @@ static int app_exec(struct ast_channel *chan, const char *data) if (ast_waitstream(chan, "") < 0) goto outrun; } - ast_moh_start(chan, S_OR(targs->mohclass, NULL), NULL); + ast_moh_start(chan, targs->mohclass, NULL); } ast_channel_lock(chan); diff --git a/bridges/bridge_holding.c b/bridges/bridge_holding.c index 44f754c41..9d0ba721a 100644 --- a/bridges/bridge_holding.c +++ b/bridges/bridge_holding.c @@ -204,7 +204,7 @@ static void participant_entertainment_start(struct ast_bridge_channel *bridge_ch switch(hc->idle_mode) { case IDLE_MODE_MOH: moh_class = ast_bridge_channel_get_role_option(bridge_channel, "holding_participant", "moh_class"); - ast_moh_start(bridge_channel->chan, ast_strlen_zero(moh_class) ? NULL : moh_class, NULL); + ast_moh_start(bridge_channel->chan, moh_class, NULL); break; case IDLE_MODE_RINGING: ast_indicate(bridge_channel->chan, AST_CONTROL_RINGING); diff --git a/main/channel.c b/main/channel.c index 5daf5825e..ea538c91f 100644 --- a/main/channel.c +++ b/main/channel.c @@ -7193,7 +7193,6 @@ void ast_uninstall_music_functions(void) ast_moh_cleanup_ptr = NULL; } -/*! \brief Turn on music on hold on a given channel */ int ast_moh_start(struct ast_channel *chan, const char *mclass, const char *interpclass) { if (ast_moh_start_ptr) @@ -7204,7 +7203,6 @@ int ast_moh_start(struct ast_channel *chan, const char *mclass, const char *inte return 0; } -/*! \brief Turn off music on hold on a given channel */ void ast_moh_stop(struct ast_channel *chan) { if (ast_moh_stop_ptr) |