kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor tweaks with ast_moh_start() callers.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@397494 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2013-08-22 23:15:14 +00:00
parent 7b032c1adb
commit c25c093c67
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app_followme.c
View File

@@ -1424,7 +1424,7 @@ static int app_exec(struct ast_channel *chan, const char *data)
if (ast_waitstream(chan, "") < 0) if (ast_waitstream(chan, "") < 0)
goto outrun; goto outrun;
} }
ast_moh_start(chan, S_OR(targs->mohclass, NULL), NULL); ast_moh_start(chan, targs->mohclass, NULL);
} }
ast_channel_lock(chan); ast_channel_lock(chan);

2
bridges/bridge_holding.c
View File

@@ -204,7 +204,7 @@ static void participant_entertainment_start(struct ast_bridge_channel *bridge_ch
switch(hc->idle_mode) { switch(hc->idle_mode) {
case IDLE_MODE_MOH: case IDLE_MODE_MOH:
moh_class = ast_bridge_channel_get_role_option(bridge_channel, "holding_participant", "moh_class"); 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; break;
case IDLE_MODE_RINGING: case IDLE_MODE_RINGING:
ast_indicate(bridge_channel->chan, AST_CONTROL_RINGING); ast_indicate(bridge_channel->chan, AST_CONTROL_RINGING);

2
main/channel.c
View File

@@ -7193,7 +7193,6 @@ void ast_uninstall_music_functions(void)
ast_moh_cleanup_ptr = NULL; 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) int ast_moh_start(struct ast_channel *chan, const char *mclass, const char *interpclass)
{ {
if (ast_moh_start_ptr) 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; return 0;
} }
/*! \brief Turn off music on hold on a given channel */
void ast_moh_stop(struct ast_channel *chan) void ast_moh_stop(struct ast_channel *chan)
{ {
if (ast_moh_stop_ptr) if (ast_moh_stop_ptr)