kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-23 14:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 74814 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r74814 | file | 2007-07-12 12:51:24 -0300 (Thu, 12 Jul 2007) | 2 lines

Only print out a warning for situations where it is actually helpful. (issue #10187 reported by denke)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@74815 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-07-12 15:53:55 +00:00
parent 1eb3dd6381
commit 54b08bfe83
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
res/res_musiconhold.c
View File

@@ -625,7 +625,7 @@ static int moh4_exec(struct ast_channel *chan, void *data)
} }
/*! \note This function should be called with the mohclasses list locked */ /*! \note This function should be called with the mohclasses list locked */
static struct mohclass *get_mohbyname(const char *name) static struct mohclass *get_mohbyname(const char *name, int warn)
{ {
struct mohclass *moh = NULL; struct mohclass *moh = NULL;
@@ -634,7 +634,7 @@ static struct mohclass *get_mohbyname(const char *name)
break; break;
} }
if (!moh) if (!moh && warn)
ast_log(LOG_WARNING, "Music on Hold class '%s' not found\n", name); ast_log(LOG_WARNING, "Music on Hold class '%s' not found\n", name);
return moh; return moh;
@@ -842,7 +842,7 @@ static int moh_register(struct mohclass *moh, int reload)
int x; int x;
#endif #endif
AST_LIST_LOCK(&mohclasses); AST_LIST_LOCK(&mohclasses);
if (get_mohbyname(moh->name)) { if (get_mohbyname(moh->name, 0)) {
if (reload) { if (reload) {
ast_log(LOG_DEBUG, "Music on Hold class '%s' left alone from initial load.\n", moh->name); ast_log(LOG_DEBUG, "Music on Hold class '%s' left alone from initial load.\n", moh->name);
} else { } else {
@@ -934,13 +934,13 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con
*/ */
AST_LIST_LOCK(&mohclasses); AST_LIST_LOCK(&mohclasses);
if (!ast_strlen_zero(chan->musicclass)) if (!ast_strlen_zero(chan->musicclass))
mohclass = get_mohbyname(chan->musicclass); mohclass = get_mohbyname(chan->musicclass, 1);
if (!mohclass && !ast_strlen_zero(mclass)) if (!mohclass && !ast_strlen_zero(mclass))
mohclass = get_mohbyname(mclass); mohclass = get_mohbyname(mclass, 1);
if (!mohclass && !ast_strlen_zero(interpclass)) if (!mohclass && !ast_strlen_zero(interpclass))
mohclass = get_mohbyname(interpclass); mohclass = get_mohbyname(interpclass, 1);
if (!mohclass) if (!mohclass)
mohclass = get_mohbyname("default"); mohclass = get_mohbyname("default", 1);
AST_LIST_UNLOCK(&mohclasses); AST_LIST_UNLOCK(&mohclasses);
if (!mohclass) if (!mohclass)
@@ -1060,7 +1060,7 @@ static int load_moh_classes(int reload)
args = strchr(data, ','); args = strchr(data, ',');
if (args) if (args)
*args++ = '\0'; *args++ = '\0';
if (!(get_mohbyname(var->name))) { if (!(get_mohbyname(var->name, 0))) {
if (!(class = moh_class_malloc())) { if (!(class = moh_class_malloc())) {
return numclasses; return numclasses;
} }
@@ -1083,7 +1083,7 @@ static int load_moh_classes(int reload)
ast_log(LOG_WARNING, "The old musiconhold.conf syntax has been deprecated! Please refer to the sample configuration for information on the new syntax.\n"); ast_log(LOG_WARNING, "The old musiconhold.conf syntax has been deprecated! Please refer to the sample configuration for information on the new syntax.\n");
dep_warning = 1; dep_warning = 1;
} }
if (!(get_mohbyname(var->name))) { if (!(get_mohbyname(var->name, 0))) {
args = strchr(var->value, ','); args = strchr(var->value, ',');
if (args) if (args)
*args++ = '\0'; *args++ = '\0';