[Asterisk-cvs] asterisk/res res_musiconhold.c,1.68,1.69

[russell]

Update of /usr/cvsroot/asterisk/res
In directory mongoose.digium.com:/tmp/cvs-serv23791/res

Modified Files:
	res_musiconhold.c 
Log Message:
ensure that the MOH_QUIET flag gets set for the mode "quietmp3nb"
add mode to the output of the "moh classes show" cli command


Index: res_musiconhold.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_musiconhold.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- res_musiconhold.c	25 Aug 2005 23:29:30 -0000	1.68
+++ res_musiconhold.c	31 Aug 2005 01:16:48 -0000	1.69
@@ -799,9 +799,11 @@
 
 		if (!strcasecmp(moh->mode, "custom"))
 			ast_set_flag(moh, MOH_CUSTOM);
-		else if (!strcasecmp(moh->mode, "mp3nb") || !strcasecmp(moh->mode, "quietmp3nb"))
+		else if (!strcasecmp(moh->mode, "mp3nb"))
 			ast_set_flag(moh, MOH_SINGLE);
-		else if (!strcasecmp(moh->mode, "quietmp3") || !strcasecmp(moh->mode, "quietmp3nb"))
+		else if (!strcasecmp(moh->mode, "quietmp3nb"))
+			ast_set_flag(moh, MOH_SINGLE | MOH_QUIET);
+		else if (!strcasecmp(moh->mode, "quietmp3"))
 			ast_set_flag(moh, MOH_QUIET);
 		
 		moh->srcfd = -1;
@@ -1119,6 +1121,7 @@
 	ast_mutex_lock(&moh_lock);
 	for (class = mohclasses; class; class = class->next) {
 		ast_cli(fd, "Class: %s\n", class->name);
+		ast_cli(fd, "\tMode: %s\n", ast_strlen_zero(class->mode) ? "<none>" : class->mode);
 		ast_cli(fd, "\tDirectory: %s\n", ast_strlen_zero(class->dir) ? "<none>" : class->dir);
 		if (ast_test_flag(class, MOH_CUSTOM))
 			ast_cli(fd, "\tApplication: %s\n", ast_strlen_zero(class->args) ? "<none>" : class->args);