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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@192939 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-05-07 17:14:26 +00:00
parent 2a0f0439e5
commit 6315384b63

View File

@@ -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;
}