[Asterisk-cvs] asterisk Makefile,1.186,1.187 dsp.c,1.45,1.46

[russell at lists.digium.com]

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

Modified Files:
	Makefile dsp.c 
Log Message:
remove the need to have the BUSYDETECT routine defined in the CFLAGS unless
you want to use one other than the default


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -d -r1.186 -r1.187
--- Makefile	20 Jul 2005 00:53:21 -0000	1.186
+++ Makefile	25 Jul 2005 21:57:14 -0000	1.187
@@ -78,7 +78,7 @@
 BUSYDETECT = #-DBUSYDETECT
 
 # Improved busydetect routine, comment the previous one if you use this one
-BUSYDETECT+= -DBUSYDETECT_MARTIN 
+BUSYDETECT+= #-DBUSYDETECT_MARTIN 
 # Detect the busy signal looking only at tone lengths
 # For example if you have 3 beeps 100ms tone, 100ms silence separated by 500 ms of silence
 BUSYDETECT+= #-DBUSYDETECT_TONEONLY

Index: dsp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/dsp.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- dsp.c	28 Jun 2005 14:36:56 -0000	1.45
+++ dsp.c	25 Jul 2005 21:57:14 -0000	1.46
@@ -151,6 +151,10 @@
 #define BELL_MF_RELATIVE_PEAK	12.6    /* 11dB */
 #endif
 
+#if !defined(BUSYDETECT_MARTIN) && !defined(BUSYDETECT) && !defined(BUSYDETECT_TONEONLY) && !defined(BUSYDETECT_COMPARE_TONE_AND_SILENCE)
+#define BUSYDETECT_MARTIN
+#endif
+
 typedef struct {
 	float v2;
 	float v3;