[Asterisk-cvs] asterisk/channels chan_vpb.c,1.40,1.41

[bkramer at lists.digium.com]

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

Modified Files:
	chan_vpb.c 
Log Message:
 changed it to not play a received DTMF frame if native bridged!


Index: chan_vpb.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_vpb.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- chan_vpb.c	6 Oct 2004 10:37:57 -0000	1.40
+++ chan_vpb.c	6 Oct 2004 10:54:58 -0000	1.41
@@ -550,14 +550,8 @@
 
 		case VPB_DTMF:
 			if (p->owner->_state == AST_STATE_UP) {
-				if ((strcmp(p->owner->type,"vpb"))||(e->data == '#')||(e->data == '*')){
 					f.frametype = AST_FRAME_DTMF;
 					f.subclass = e->data;
-				}
-				else {
-					if (option_verbose > 3) 
-						ast_verbose(VERBOSE_PREFIX_4 "%s: handle_owned: Not transmiting DTMF frame on native bridge\n", p->dev);
-				}
 			} else
 				f.frametype = -1;
 			break;
@@ -1835,9 +1829,15 @@
 			// This DTMF is played by asterisk and leads to an annoying trailing beep on CISCO phones
 			if( !ignore_dtmf) 
 				vpb_set_event_mask(p->handle, VPB_EVENTS_NODTMF );
-			vpb_dial_sync(p->handle,p->play_dtmf);
-			if(option_verbose>1) 
-				ast_verbose( VERBOSE_PREFIX_2 "%s: Played DTMF %s\n",p->dev,p->play_dtmf);
+			if (strcmp(p->owner->type,"vpb")){
+				vpb_dial_sync(p->handle,p->play_dtmf);
+				if(option_verbose>1) 
+					ast_verbose( VERBOSE_PREFIX_2 "%s: chanreads: Played DTMF %s\n",p->dev,p->play_dtmf);
+			}
+			else {
+				if (option_verbose > 1) 
+					ast_verbose(VERBOSE_PREFIX_2 "%s: chanreads: Not playing DTMF frame on native bridge\n", p->dev);
+			}
 			p->play_dtmf[0] = '\0';
 			ast_mutex_unlock(&p->play_dtmf_lock);
 			vpb_sleep(700); // Long enough to miss echo and DTMF event