diff options
author | Russell Bryant <russell@russellbryant.com> | 2009-02-17 20:41:24 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2009-02-17 20:41:24 +0000 |
commit | 4ec301360cdd84be911b06cd0adda2459d66bc6e (patch) | |
tree | 106de0147974e2e7f7c18dec2d603d9060afebc2 /main/pbx.c | |
parent | 4ac9617be56f49ad4918d242c897e32b91298fb8 (diff) |
Merge a large set of updates to the Asterisk indications API.
This patch includes a number of changes to the indications API. The primary
motivation for this work was to improve stability. The object management
in this API was significantly flawed, and a number of trivial situations could
cause crashes.
The changes included are:
1) Remove the module res_indications. This included the critical functionality
that actually loaded the indications configuration. I have seen many people
have Asterisk problems because they accidentally did not have an
indications.conf present and loaded. Now, this code is in the core,
and Asterisk will fail to start without indications configuration.
There was one part of res_indications, the dialplan applications, which did
belong in a module, and have been moved to a new module, app_playtones.
2) Object management has been significantly changed. Tone zones are now
managed using astobj2, and it is no longer possible to crash Asterisk by
issuing a reload that destroys tone zones while they are in use.
3) The API documentation has been filled out.
4) The API has been updated to follow our naming conventions.
5) Various bits of code throughout the tree have been updated to account
for the API update.
6) Configuration parsing has been mostly re-written.
7) "Code cleanup"
The code is from svn/asterisk/team/russell/indications/.
Review: http://reviewboard.digium.com/r/149/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@176627 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/pbx.c')
-rw-r--r-- | main/pbx.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/main/pbx.c b/main/pbx.c index 4c2b27366..0807edf72 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -8562,11 +8562,13 @@ static int pbx_builtin_waitexten(struct ast_channel *chan, void *data) } else if (ast_test_flag(&flags, WAITEXTEN_MOH)) { ast_indicate_data(chan, AST_CONTROL_HOLD, opts[0], strlen(opts[0])); } else if (ast_test_flag(&flags, WAITEXTEN_DIALTONE)) { - const struct tone_zone_sound *ts = ast_get_indication_tone(chan->zone, "dial"); - if (ts) + struct ast_tone_zone_sound *ts = ast_get_indication_tone(chan->zone, "dial"); + if (ts) { ast_playtones_start(chan, 0, ts->data, 0); - else + ts = ast_tone_zone_sound_unref(ts); + } else { ast_tonepair_start(chan, 350, 440, 0, 0); + } } /* Wait for "n" seconds */ if (args.timeout && (s = atof(args.timeout)) > 0) |