[svn-commits] russell: branch 1.6.0 r119014 - in /branches/1.6.0: ./ apps/app_milliwatt.c

[SVN commits to the Digium repositories]

Author: russell
Date: Thu May 29 14:06:02 2008
New Revision: 119014

URL: http://svn.digium.com/view/asterisk?view=rev&rev=119014
Log:
Merged revisions 119013 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r119013 | russell | 2008-05-29 14:05:33 -0500 (Thu, 29 May 2008) | 12 lines

Merged revisions 119012 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r119012 | russell | 2008-05-29 14:04:52 -0500 (Thu, 29 May 2008) | 4 lines

 - Fix a typo in the argument to Playtones
 - use ast_safe_sleep() instead of calling the wait application
(thanks to tilghman for pointing these out!)

........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_milliwatt.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_milliwatt.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_milliwatt.c?view=diff&rev=119014&r1=119013&r2=119014
==============================================================================
--- branches/1.6.0/apps/app_milliwatt.c (original)
+++ branches/1.6.0/apps/app_milliwatt.c Thu May 29 14:06:02 2008
@@ -133,7 +133,7 @@
 static int milliwatt_exec(struct ast_channel *chan, void *data)
 {
 	const char *options = data;
-	struct ast_app *playtones_app, *wait_app;
+	struct ast_app *playtones_app;
 	int res = -1;
 
 	if (!ast_strlen_zero(options) && strchr(options, 'o')) {
@@ -145,15 +145,10 @@
 		return -1;
 	}
 
-	if (!(wait_app = pbx_findapp("Wait"))) {
-		ast_log(LOG_ERROR, "The Wait application is required to run Milliwatt()\n");
-		return -1;
-	}
-
-	res = pbx_exec(chan, playtones_app, "1004,1000");
+	res = pbx_exec(chan, playtones_app, "1004/1000");
 
 	while (!res) {
-		res = pbx_exec(chan, wait_app, "3600");
+		res = ast_safe_sleep(chan, 10000);
 	}
 
 	return res;