diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-29 19:06:02 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-29 19:06:02 +0000 |
| commit | 5eb941c58c2dd5a3f529c39685607e72037b7bdf (patch) | |
| tree | b33057bb8a56873c0a0bfa5130580546f0ca572f /apps/app_milliwatt.c | |
| parent | 9eab847177ad5594d8ab43d6092460bec6db73b5 (diff) | |
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!)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@119014 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_milliwatt.c')
| -rw-r--r-- | apps/app_milliwatt.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/apps/app_milliwatt.c b/apps/app_milliwatt.c index 940f3b9f7..09d26eca4 100644 --- a/apps/app_milliwatt.c +++ b/apps/app_milliwatt.c @@ -133,7 +133,7 @@ static int old_milliwatt_exec(struct ast_channel *chan) 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 @@ static int milliwatt_exec(struct ast_channel *chan, void *data) 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; |