[Asterisk-cvs] asterisk/channels chan_zap.c,1.374,1.375

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv8220/channels

Modified Files:
	chan_zap.c 
Log Message:
Disable echo canceller for digital calls (bug #2785), fix build on MacOSX (bug #2803)


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -d -r1.374 -r1.375
--- chan_zap.c	5 Nov 2004 17:10:28 -0000	1.374
+++ chan_zap.c	7 Nov 2004 16:21:00 -0000	1.375
@@ -1213,11 +1213,17 @@
 {
 	int x;
 	int res;
+	if (!p)
+		return;
 	if (p->echocanon) {
 		ast_log(LOG_DEBUG, "Echo cancellation already on\n");
 		return;
 	}
-	if (p && p->echocancel) {
+	if (p->digital) {
+		ast_log(LOG_DEBUG, "Echo cancellation isn't required on digital connection\n");
+		return;
+	}
+	if (p->echocancel) {
 		if (p->sig == SIG_PRI) {
 			x = 1;
 			res = ioctl(p->subs[SUB_REAL].zfd, ZT_AUDIOMODE, &x);