[Asterisk-cvs] asterisk/channels chan_vpb.c,1.36,1.37

[bkramer at lists.digium.com]

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

Modified Files:
	chan_vpb.c 
Log Message:
/ fixed operation with record_play


Index: chan_vpb.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_vpb.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- chan_vpb.c	20 Aug 2004 02:55:29 -0000	1.36
+++ chan_vpb.c	17 Sep 2004 00:14:48 -0000	1.37
@@ -8,6 +8,11 @@
  * Copyright (C) 2004, Ben Kramer
  * Ben Kramer <ben at voicetronix.com.au>
  *
+ * Daniel Bichara <daniel at bichara.com.br> - Brazilian CallerID detection (c)2004 
+ *
+ * Welber Silveira - welberms at magiclink.com.br - (c)2004
+ * Copying CLID string to propper structure after detection
+ *
  * This program is free software, distributed under the terms of
  * the GNU General Public License
  */
@@ -101,6 +106,7 @@
 #define MODE_FXO	3
 
 /* Pick a country or add your own! */
+/* These are the tones that are played to the user */
 #define TONES_AU
 #ifdef TONES_AU
 static VPB_TONE Dialtone     = {440,   	440, 	440, 	-10,  	-10, 	-10, 	5000,	0   };
@@ -222,6 +228,8 @@
 	char language[MAX_LANGUAGE];		/* language being used */
 	char callerid[AST_MAX_EXTENSION];	/* CallerId used for directly connected phone */
 
+	int brcallerpos;			/* Brazilian CallerID detection */
+
 	int lastoutput;				/* Holds the last Audio format output'ed */
 	int lastinput;				/* Holds the last Audio format input'ed */
 	int last_ignore_dtmf;
@@ -548,6 +556,8 @@
 
 		case VPB_TONEDETECT:
 			if (e->data == VPB_BUSY || e->data == VPB_BUSY_308 || e->data == VPB_BUSY_AUST ) {
+				if (option_verbose > 3) 
+					ast_verbose(VERBOSE_PREFIX_4 "%s: handle_owned: got event: BUSY\n",
 				if (p->owner->_state == AST_STATE_UP) {
 					f.subclass = AST_CONTROL_HANGUP;
 				}
@@ -1500,7 +1510,7 @@
 			ast_verbose(VERBOSE_PREFIX_4 "%s: Answering channel\n",p->dev);
 
 	if (p->mode == MODE_FXO){
-		if (option_verbose > 4)
+		if (option_verbose > 3)
 				ast_verbose("%s: Disabling Loop Drop detection\n",p->dev);
 		vpb_disable_event(p->handle, VPB_MDROP);
 	}
@@ -1543,7 +1553,7 @@
 	}
 	vpb_sleep(500);
 	if (p->mode == MODE_FXO){
-		if (option_verbose > 4)
+		if (option_verbose > 3)
 				ast_verbose("%s: Re-enabling Loop Drop detection\n",p->dev);
 		vpb_enable_event(p->handle,VPB_MDROP);
 	}
@@ -1772,7 +1782,8 @@
 			}
 		}
 
-		if ( (p->owner->_state != AST_STATE_UP) || !bridgerec) {
+//		if ( (p->owner->_state != AST_STATE_UP) || !bridgerec) {
+		if ( (p->owner->_state != AST_STATE_UP) ) {
 			if (option_verbose > 4) {
 				if (p->owner->_state != AST_STATE_UP)
 					ast_verbose("%s: chanreads: Im not up[%d]\n", p->dev,p->owner->_state);