[svn-commits] mnicholson: branch mnicholson/chan-mobile-refactor r756 - /team/mnicholson/ch...

[SVN commits to the Digium repositories]

Author: mnicholson
Date: Wed Jan 28 09:12:49 2009
New Revision: 756

URL: http://svn.digium.com/svn-view/asterisk-addons?view=rev&rev=756
Log:
use ast_verb() instead of ast_verbose()

Modified:
    team/mnicholson/chan-mobile-refactor/channels/chan_mobile.c

Modified: team/mnicholson/chan-mobile-refactor/channels/chan_mobile.c
URL: http://svn.digium.com/svn-view/asterisk-addons/team/mnicholson/chan-mobile-refactor/channels/chan_mobile.c?view=diff&rev=756&r1=755&r2=756
==============================================================================
--- team/mnicholson/chan-mobile-refactor/channels/chan_mobile.c (original)
+++ team/mnicholson/chan-mobile-refactor/channels/chan_mobile.c Wed Jan 28 09:12:49 2009
@@ -1381,8 +1381,7 @@
 
 		if (waitfd = rfcomm_wait(pvt->rfcomm_socket, &t)) {
 			if ((s = rfcomm_read(pvt->rfcomm_socket, buf, sizeof(buf) - 1)) < 1) {
-				if (option_verbose > 2)
-					ast_verbose(VERBOSE_PREFIX_3  "Bluetooth Device %s has disconnected, reason (%d).\n", pvt->id, errno); 
+				ast_verb(3, "Bluetooth Device %s has disconnected, reason (%d).\n", pvt->id, errno); 
 				monitor = 0;
 				continue;
 			}
@@ -1445,7 +1444,7 @@
 				if ((p = strstr(buf, "+CIND:"))) {
 					p += 5;
 					if (*(p+(callp*2)) == '1') {
-						ast_verbose(VERBOSE_PREFIX_3 "Bluetooth Device %s has a call in progress - delaying connection.\n", pvt->id);
+						ast_verb(3, "Bluetooth Device %s has a call in progress - delaying connection.\n", pvt->id);
 						monitor = 0;
 					}
 				} else if (strstr(buf, "OK")) {
@@ -1661,7 +1660,7 @@
 				rfcomm_write(pvt->rfcomm_socket, "AT+CLIP=1\r");
 			} else if (pvt->state == MBL_STATE_PREIDLE) {
 				pvt->connected = 1;
-				ast_verbose(VERBOSE_PREFIX_3 "Bluetooth Device %s initialised and ready.\n", pvt->id);
+				ast_verb(3, "Bluetooth Device %s initialised and ready.\n", pvt->id);
 				pvt->state = MBL_STATE_IDLE;
 			} else if (pvt->state == MBL_STATE_DIAL) {
 				snprintf(buf, sizeof(buf), "ATD%s;\r", pvt->dial_number);
@@ -1751,8 +1750,7 @@
 		
 		if (waitfd = rfcomm_wait(pvt->rfcomm_socket, &t)) {
 			if ((s = rfcomm_read(pvt->rfcomm_socket, buf, sizeof(buf) - 1)) < 1) {
-				if (option_verbose > 2)
-					ast_verbose(VERBOSE_PREFIX_3  "Bluetooth Device %s has disconnected, reason (%d).\n", pvt->id, errno); 
+				ast_verb(3, "Bluetooth Device %s has disconnected, reason (%d).\n", pvt->id, errno); 
 				monitor = 0;
 				continue;
 			}
@@ -1784,7 +1782,7 @@
 		} else {	/* Timeouts */
 			if (pvt->state == MBL_STATE_PREIDLE) {
 				pvt->connected = 1;
-				ast_verbose(VERBOSE_PREFIX_3 "Bluetooth Device %s initialised and ready.\n", pvt->id);
+				ast_verb(3, "Bluetooth Device %s initialised and ready.\n", pvt->id);
 				pvt->state = MBL_STATE_IDLE;
 			} else if (pvt->state == MBL_STATE_RING) {
 				pvt->sco_socket = sco_connect(pvt->adapter->addr, pvt->addr);
@@ -1861,8 +1859,7 @@
 								pvt->connected = 1;
 								adapter->inuse = 1;
 								manager_event(EVENT_FLAG_SYSTEM, "MobileStatus", "Status: Connect\r\nDevice: %s\r\n", pvt->id);
-								if (option_verbose > 2)
-									ast_verbose(VERBOSE_PREFIX_3 "Bluetooth Device %s has connected.\n", pvt->id);
+								ast_verb(3, "Bluetooth Device %s has connected.\n", pvt->id);
 							}
 						}
 					}