merge Russell's 'hold_handling' branch, finally implementing music-on-hold handling the way it was decided at AstriDevCon Europe 2006 (and the way people really want it to be)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@37988 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 2 insertions, 2 deletions

diff --git a/pbx.c b/pbx.c
index bf6d14c7b..c8e6c5630 100644
--- a/pbx.c
+++ b/pbx.c
@@ -5170,7 +5170,7 @@ static int pbx_builtin_waitexten(struct ast_channel *chan, void *data)
 		ast_app_parse_options(waitexten_opts, &flags, opts, args.options);
 
 	if (ast_test_flag(&flags, WAITEXTEN_MOH))
-		ast_moh_start(chan, opts[0]);
+		ast_indicate_data(chan, AST_CONTROL_HOLD, opts[0], strlen(opts[0]));
 
 	/* Wait for "n" seconds */
 	if (args.timeout && (ms = atof(args.timeout)) > 0)
@@ -5195,7 +5195,7 @@ static int pbx_builtin_waitexten(struct ast_channel *chan, void *data)
 	}
 
 	if (ast_test_flag(&flags, WAITEXTEN_MOH))
-		ast_moh_stop(chan);
+		ast_indicate(chan, AST_CONTROL_UNHOLD);
 
 	return res;
 }