[asterisk-commits] tilghman: trunk r192938 - /trunk/channels/chan_unistim.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Thu May  7 12:13:36 2009
New Revision: 192938

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=192938
Log:
Send DTMF frame before playing back audio.
(closes issue #14858)
 Reported by: barryf
 Patches: 
       20090507__bug14858.diff.txt uploaded by tilghman (license 14)

Modified:
    trunk/channels/chan_unistim.c

Modified: trunk/channels/chan_unistim.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/channels/chan_unistim.c?view=diff&rev=192938&r1=192937&r2=192938
==============================================================================
--- trunk/channels/chan_unistim.c (original)
+++ trunk/channels/chan_unistim.c Thu May  7 12:13:36 2009
@@ -2469,14 +2469,17 @@
 
 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) {
@@ -2533,10 +2536,6 @@
 	}
 	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;
 }