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.1@192941 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c
index 52102af9492239aebd9f56808d8617ccac8386f6..9e2a32e08f9b11f2901bbffcbe40cfcd9a4d841e 100644 (file)
--- a/channels/chan_unistim.c
+++ b/channels/chan_unistim.c
@@ -2470,14 +2470,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) {
@@ -2534,10 +2537,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;
 }