[asterisk-commits] file: trunk r74816 - in /trunk: ./ res/res_musiconhold.c

[SVN commits to the Asterisk project]

Author: file
Date: Thu Jul 12 10:55:49 2007
New Revision: 74816

URL: http://svn.digium.com/view/asterisk?view=rev&rev=74816
Log:
Merged revisions 74815 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r74815 | file | 2007-07-12 12:53:55 -0300 (Thu, 12 Jul 2007) | 10 lines

Merged revisions 74814 via svnmerge from 
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)

........

................

Modified:
    trunk/   (props changed)
    trunk/res/res_musiconhold.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/res/res_musiconhold.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_musiconhold.c?view=diff&rev=74816&r1=74815&r2=74816
==============================================================================
--- trunk/res/res_musiconhold.c (original)
+++ trunk/res/res_musiconhold.c Thu Jul 12 10:55:49 2007
@@ -655,7 +655,7 @@
 }
 
 /*! \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;
 
@@ -664,7 +664,7 @@
 			break;
 	}
 
-	if (!moh)
+	if (!moh && warn)
 		ast_log(LOG_WARNING, "Music on Hold class '%s' not found\n", name);
 
 	return moh;
@@ -873,7 +873,7 @@
 	int x;
 #endif
 	AST_RWLIST_WRLOCK(&mohclasses);
-	if (get_mohbyname(moh->name)) {
+	if (get_mohbyname(moh->name, 0)) {
 		if (reload) {
 			ast_debug(1, "Music on Hold class '%s' left alone from initial load.\n", moh->name);
 		} else {
@@ -965,13 +965,13 @@
 	 */
 	AST_RWLIST_RDLOCK(&mohclasses);
 	if (!ast_strlen_zero(chan->musicclass))
-		mohclass = get_mohbyname(chan->musicclass);
+		mohclass = get_mohbyname(chan->musicclass, 1);
 	if (!mohclass && !ast_strlen_zero(mclass))
-		mohclass = get_mohbyname(mclass);
+		mohclass = get_mohbyname(mclass, 1);
 	if (!mohclass && !ast_strlen_zero(interpclass))
-		mohclass = get_mohbyname(interpclass);
+		mohclass = get_mohbyname(interpclass, 1);
 	if (!mohclass)	
-		mohclass = get_mohbyname("default");
+		mohclass = get_mohbyname("default", 1);
 	AST_RWLIST_UNLOCK(&mohclasses);
 
 	if (!mohclass)
@@ -1076,7 +1076,7 @@
 			numclasses++;
 		}
 	}
-	
+
 	ast_config_destroy(cfg);
 
 	return numclasses;