[Asterisk-cvs] asterisk/res res_musiconhold.c,1.40,1.41

[markster at lists.digium.com]

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

Modified Files:
	res_musiconhold.c 
Log Message:
Make music on hold truly optional (bug #2998)


Index: res_musiconhold.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_musiconhold.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- res_musiconhold.c	17 Nov 2004 18:16:08 -0000	1.40
+++ res_musiconhold.c	9 Dec 2004 19:55:01 -0000	1.41
@@ -588,7 +588,7 @@
 	return 0;
 }
 
-int ast_moh_start(struct ast_channel *chan, char *class)
+static int local_ast_moh_start(struct ast_channel *chan, char *class)
 {
 	if (!class || ast_strlen_zero(class))
 		class = chan->musicclass;
@@ -597,7 +597,7 @@
 	return ast_activate_generator(chan, &mohgen, class);
 }
 
-void ast_moh_stop(struct ast_channel *chan)
+static void local_ast_moh_stop(struct ast_channel *chan)
 {
 	ast_deactivate_generator(chan);
 }
@@ -659,6 +659,7 @@
 {
 	int res;
 	load_moh_classes();
+	ast_install_music_functions(local_ast_moh_start, local_ast_moh_stop);
 	res = ast_register_application(app0, moh0_exec, synopsis0, descrip0);
 	ast_register_atexit(ast_moh_destroy);
 	if (!res)