kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-03 20:38:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 209197 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r209197 | mmichelson | 2009-07-27 15:11:42 -0500 (Mon, 27 Jul 2009) | 9 lines
  
  Honor channel's music class when using realtime music on hold.
  
  (closes issue #15051)
  Reported by: alexh
  Patches:
        15051.patch uploaded by mmichelson (license 60)
  Tested by: alexh
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@209198 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2009-07-27 20:16:28 +00:00
parent 881cdb00e5
commit 7f81823913
1 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
res/res_musiconhold.c
View File

@@ -1155,7 +1155,9 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con
{
struct mohclass *mohclass = NULL;
struct moh_files_state *state = chan->music_state;
struct ast_variable *var = NULL;
int res;
int realtime_possible = ast_check_realtime("musiconhold");
/* The following is the order of preference for which class to use:
* 1) The channels explicitly set musicclass, which should *only* be
@@ -1170,28 +1172,37 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con
*/
if (!ast_strlen_zero(chan->musicclass)) {
mohclass = get_mohbyname(chan->musicclass, 1);
}
if (!mohclass && !ast_strlen_zero(mclass)) {
mohclass = get_mohbyname(mclass, 1);
}
if (!mohclass && !ast_strlen_zero(interpclass)) {
mohclass = get_mohbyname(interpclass, 1);
}
/* If no moh class found in memory, then check RT */
if (!mohclass && ast_check_realtime("musiconhold")) {
struct ast_variable *var = NULL, *tmp = NULL;
if (!ast_strlen_zero(chan->musicclass)) {
if (!mohclass && realtime_possible) {
var = ast_load_realtime("musiconhold", "name", chan->musicclass, NULL);
}
if (!var && !ast_strlen_zero(mclass))
}
if (!mohclass && !var && !ast_strlen_zero(mclass)) {
mohclass = get_mohbyname(mclass, 1);
if (!mohclass && realtime_possible) {
var = ast_load_realtime("musiconhold", "name", mclass, NULL);
if (!var && !ast_strlen_zero(interpclass))
}
}
if (!mohclass && !var && !ast_strlen_zero(interpclass)) {
mohclass = get_mohbyname(interpclass, 1);
if (!mohclass && realtime_possible) {
var = ast_load_realtime("musiconhold", "name", interpclass, NULL);
if (!var)
}
}
if (!mohclass && !var) {
mohclass = get_mohbyname("default", 1);
if (!mohclass && realtime_possible) {
var = ast_load_realtime("musiconhold", "name", "default", NULL);
if (var && (mohclass = moh_class_malloc())) {
}
}
/* If no moh class found in memory, then check RT. Note that the logic used
* above guarantees that if var is non-NULL, then mohclass must be NULL.
*/
if (var) {
struct ast_variable *tmp = NULL;
if ((mohclass = moh_class_malloc())) {
mohclass->realtime = 1;
for (tmp = var; tmp; tmp = tmp->next) {
if (!strcasecmp(tmp->name, "name"))
@@ -1321,15 +1332,11 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con
return -1;
}
}
} else if (var) {
} else {
ast_variables_destroy(var);
}
}
if (!mohclass) {
mohclass = get_mohbyname("default", 1);
}
if (!mohclass) {
return -1;
}