[asterisk-commits] russell: branch group/vldtmf r39476 - /team/group/vldtmf/channels/chan_zap.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Wed Aug  9 01:53:16 2006
New Revision: 39476

URL: http://svn.digium.com/view/asterisk?rev=39476&view=rev
Log:
- we ignore DTMF_BEGIN if it *is* a PRI, not if it's not ...
- fix '*' and '#' ... oops

Modified:
    team/group/vldtmf/channels/chan_zap.c

Modified: team/group/vldtmf/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/group/vldtmf/channels/chan_zap.c?rev=39476&r1=39475&r2=39476&view=diff
==============================================================================
--- team/group/vldtmf/channels/chan_zap.c (original)
+++ team/group/vldtmf/channels/chan_zap.c Wed Aug  9 01:53:16 2006
@@ -1013,9 +1013,9 @@
 		return ZT_TONE_DTMF_A + (digit - 'A');
 	else if (digit >= 'a' && digit <= 'd')
 		return ZT_TONE_DTMF_A + (digit - 'a');
-	else if (digit == 's' || digit == 'S')
+	else if (digit == '*')
 		return ZT_TONE_DTMF_s;
-	else if (digit == 'p' || digit == 'P')
+	else if (digit == '#')
 		return ZT_TONE_DTMF_p;
 	else
 		return -1;
@@ -1028,9 +1028,9 @@
 	else if (dtmfindex >= ZT_TONE_DTMF_A && dtmfindex <= ZT_TONE_DTMF_D)
 		return 'A' + (dtmfindex - ZT_TONE_DTMF_A);
 	else if (dtmfindex == ZT_TONE_DTMF_s)
-		return 's';
+		return '*';
 	else if (dtmfindex == ZT_TONE_DTMF_p)
-		return 'p';
+		return '#';
 	else
 		return 'x';
 }
@@ -1040,7 +1040,7 @@
 	struct zt_pvt *pvt;
 	int index;
 	int dtmf = -1;
-
+	
 	pvt = chan->tech_pvt;
 
 	ast_mutex_lock(&pvt->lock);
@@ -1051,7 +1051,7 @@
 		goto out;
 
 #ifdef HAVE_PRI
-	if (pvt->sig != SIG_PRI)
+	if (pvt->sig == SIG_PRI)
 		goto out;
 #endif
 	dtmf = digit_to_dtmfindex(digit);
@@ -1078,7 +1078,7 @@
 	struct zt_pvt *pvt;
 	int res = 0;
 	int index;
-
+	
 	pvt = chan->tech_pvt;
 
 	ast_mutex_lock(&pvt->lock);