Merged revisions 63654 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r63654 | mattf | 2007-05-09 12:25:21 -0500 (Wed, 09 May 2007) | 10 lines

Merged revisions 63653 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r63653 | mattf | 2007-05-09 12:20:20 -0500 (Wed, 09 May 2007) | 2 lines

Make sure we only create a DSP if it's requested on SUB_REAL

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@63655 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_zap.c

@@ -5580,26 +5580,28 @@ static struct ast_channel *zt_new(struct zt_pvt *i, int state, int startpbx, int
 	i->subs[index].linear = 0;
 	zt_setlinear(i->subs[index].zfd, i->subs[index].linear);
 	features = 0;
-	if (i->busydetect && CANBUSYDETECT(i))
+	if (index == SUB_REAL) {
-		features |= DSP_FEATURE_BUSY_DETECT;
+		if (i->busydetect && CANBUSYDETECT(i))
-	if ((i->callprogress & 1) && CANPROGRESSDETECT(i))
+			features |= DSP_FEATURE_BUSY_DETECT;
-		features |= DSP_FEATURE_CALL_PROGRESS;
+		if ((i->callprogress & 1) && CANPROGRESSDETECT(i))
-	if ((!i->outgoing && (i->callprogress & 4)) || 
+			features |= DSP_FEATURE_CALL_PROGRESS;
-	    (i->outgoing && (i->callprogress & 2))) {
+		if ((!i->outgoing && (i->callprogress & 4)) || 
-		features |= DSP_FEATURE_FAX_DETECT;
+		    (i->outgoing && (i->callprogress & 2))) {
-	}
+			features |= DSP_FEATURE_FAX_DETECT;
+		}
 #ifdef ZT_TONEDETECT
-	x = ZT_TONEDETECT_ON | ZT_TONEDETECT_MUTE;
+		x = ZT_TONEDETECT_ON | ZT_TONEDETECT_MUTE;
-	if (ioctl(i->subs[index].zfd, ZT_TONEDETECT, &x)) {
+		if (ioctl(i->subs[index].zfd, ZT_TONEDETECT, &x)) {
 #endif		
-		i->hardwaredtmf = 0;
+			i->hardwaredtmf = 0;
-		features |= DSP_FEATURE_DTMF_DETECT;
+			features |= DSP_FEATURE_DTMF_DETECT;
 #ifdef ZT_TONEDETECT
-	} else if (NEED_MFDETECT(i)) {
+		} else if (NEED_MFDETECT(i)) {
-		i->hardwaredtmf = 1;
+			i->hardwaredtmf = 1;
-		features |= DSP_FEATURE_DTMF_DETECT;
+			features |= DSP_FEATURE_DTMF_DETECT;
-	}
+		}
 #endif
+	}
 	if (features) {
 		if (i->dsp) {
 			if (option_debug)