diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-07 17:14:26 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-07 17:14:26 +0000 |
| commit | f68ecad7e22ebede09ff89d798a5a107e8daa935 (patch) | |
| tree | ed834010f0b51ad527a16365c4776430eafe3d3e /channels/chan_unistim.c | |
| parent | 4a2ae99455da805289a58c0279a2712abc3ce3bd (diff) | |
Merged revisions 192938 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r192938 | tilghman | 2009-05-07 12:13:36 -0500 (Thu, 07 May 2009) | 6 lines
Send DTMF frame before playing back audio.
(closes issue #14858)
Reported by: barryf
Patches:
20090507__bug14858.diff.txt uploaded by tilghman (license 14)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@192939 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_unistim.c')
| -rw-r--r-- | channels/chan_unistim.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c index b25cf39ff..90ed73b3c 100644 --- a/channels/chan_unistim.c +++ b/channels/chan_unistim.c @@ -2464,14 +2464,17 @@ static void HandleCallIncoming(struct unistimsession *s) static int unistim_do_senddigit(struct unistimsession *pte, char digit) { - - struct ast_frame f = { 0, }; + struct ast_frame f = { .frametype = AST_FRAME_DTMF, .subclass = digit, .src = "unistim" }; struct unistim_subchannel *sub; sub = pte->device->lines->subs[SUB_REAL]; if (!sub->owner || sub->alreadygone) { ast_log(LOG_WARNING, "Unable to find subchannel in dtmf senddigit\n"); return -1; } + + /* Send DTMF indication _before_ playing sounds */ + ast_queue_frame(sub->owner, &f); + if (unistimdebug) ast_verb(0, "Send Digit %c\n", digit); switch (digit) { @@ -2528,10 +2531,6 @@ static int unistim_do_senddigit(struct unistimsession *pte, char digit) } usleep(150000); /* XXX Less than perfect, blocking an important thread is not a good idea */ send_tone(pte, 0, 0); - f.frametype = AST_FRAME_DTMF; - f.subclass = digit; - f.src = "unistim"; - ast_queue_frame(sub->owner, &f); return 0; } |