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

Merge "holding_bridge: ensure moh participants get frames" into 13

Browse Source
This commit is contained in:
Mark Michelson
2015-07-28 17:05:49 -05:00
committed by Gerrit Code Review
parent f78a4b52b8 8458b8d441
commit c9099d06cc
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bridges/bridge_holding.c
View File

@@ -205,7 +205,11 @@ 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, moh_class, NULL);
if (ast_moh_start(bridge_channel->chan, moh_class, NULL)) {
ast_log(LOG_WARNING, "Failed to start moh, starting silence generator instead\n");
hc->idle_mode = IDLE_MODE_SILENCE;
hc->silence_generator = ast_channel_start_silence_generator(bridge_channel->chan);
}
break;
case IDLE_MODE_RINGING:
ast_indicate(bridge_channel->chan, AST_CONTROL_RINGING);

2
main/channel.c
View File

@@ -7404,7 +7404,7 @@ int ast_moh_start(struct ast_channel *chan, const char *mclass, const char *inte
ast_verb(3, "Music class %s requested but no musiconhold loaded.\n", mclass ? mclass : (interpclass ? interpclass : "default"));
return 0;
return -1;
}
void ast_moh_stop(struct ast_channel *chan)