[Freeswitch-svn] [commit] r5368 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe

[Freeswitch SVN]

Author: anthm
Date: Thu Jun 14 22:58:11 2007
New Revision: 5368

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c

Log:
fix spelling err

Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c	Thu Jun 14 22:58:11 2007
@@ -111,7 +111,8 @@
 	uint32_t samples_per_frame;
 	int dtmf_on;
 	int dtmf_off;
-	int suppres_dtmf_tone;
+	int suppress_dtmf_tone;
+	int ignore_dtmf_tone;
 	int configured_spans;
 	int configured_boost_spans;
 	char *dialplan;
@@ -524,8 +525,11 @@
 	tech_pvt->tone_session.rate = rate;
 	tech_pvt->tone_session.duration = globals.dtmf_on * (tech_pvt->tone_session.rate / 1000);
 	tech_pvt->tone_session.wait = globals.dtmf_off * (tech_pvt->tone_session.rate / 1000);
+
+	if (!globals.ignore_dtmf_tone) {	
+		teletone_dtmf_detect_init (&tech_pvt->dtmf_detect, rate);
+	}
 	
-	teletone_dtmf_detect_init (&tech_pvt->dtmf_detect, rate);
 	switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Audio init %s\n", switch_channel_get_name(channel));
 
 	switch_set_flag(tech_pvt, TFLAG_CODEC);
@@ -786,25 +790,26 @@
 
 	tech_pvt->read_frame.datalen = bytes;
 	tech_pvt->read_frame.samples = bytes / 2;
-
-	teletone_dtmf_detect (&tech_pvt->dtmf_detect, tech_pvt->read_frame.data, tech_pvt->read_frame.samples);
-	teletone_dtmf_get(&tech_pvt->dtmf_detect, digit_str, sizeof(digit_str));
 	
-	if(digit_str[0]) {
-		switch_channel_queue_dtmf(channel, digit_str);
-		if (globals.debug) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "DTMF DETECTED: [%s]\n", digit_str);
-		}
-		if (globals.suppres_dtmf_tone) {
-			tech_pvt->skip_read_frames = 20;
+	if (!globals.ignore_dtmf_tone) {
+		teletone_dtmf_detect (&tech_pvt->dtmf_detect, tech_pvt->read_frame.data, tech_pvt->read_frame.samples);
+		teletone_dtmf_get(&tech_pvt->dtmf_detect, digit_str, sizeof(digit_str));
+	
+		if(digit_str[0]) {
+			switch_channel_queue_dtmf(channel, digit_str);
+			if (globals.debug) {
+				switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "DTMF DETECTED: [%s]\n", digit_str);
+			}
+			if (globals.suppress_dtmf_tone) {
+				tech_pvt->skip_read_frames = 20;
+			}
 		}
-	}
 
-	if (tech_pvt->skip_read_frames > 0) {
-		memset(tech_pvt->read_frame.data, 0, tech_pvt->read_frame.datalen);
-		tech_pvt->skip_read_frames--;
+		if (tech_pvt->skip_read_frames > 0) {
+			memset(tech_pvt->read_frame.data, 0, tech_pvt->read_frame.datalen);
+			tech_pvt->skip_read_frames--;
+		}
 	}
-
 #ifdef DOTRACE	
 	write(tech_pvt->fd2, tech_pvt->read_frame.data, (int) tech_pvt->read_frame.datalen);
 #endif
@@ -2220,8 +2225,10 @@
 				globals.dtmf_off = atoi(val);
 			} else if (!strcmp(var, "dialplan")) {
 				set_global_dialplan(val);
-			} else if (!strcmp(var, "suppres-dtmf-tone")) {
-				globals.suppres_dtmf_tone = switch_true(val);
+			} else if (!strcmp(var, "suppress-dtmf-tone")) {
+				globals.suppress_dtmf_tone = switch_true(val);
+			} else if (!strcmp(var, "ignore-dtmf-tone")) {
+				globals.ignore_dtmf_tone = switch_true(val);
 			}
 		}
 	}