kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-28 23:15:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

/ fix for bug 4550

Browse Source 
/ cleaned up most of the warning messages


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5979 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Ben Kramer
2005-06-22 23:54:47 +00:00
parent 9a56a10379
commit 32741dc1c6
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
channels/chan_vpb.c
View File

@@ -170,6 +170,7 @@ static int dtmf_idd = 3000;
#define TIMER_PERIOD_RINGBACK 2000 #define TIMER_PERIOD_RINGBACK 2000
#define TIMER_PERIOD_BUSY 700 #define TIMER_PERIOD_BUSY 700
#define TIMER_PERIOD_RING 4000 #define TIMER_PERIOD_RING 4000
static int timer_period_ring = TIMER_PERIOD_RING;
#define VPB_EVENTS_ALL (VPB_MRING|VPB_MDIGIT|VPB_MDTMF|VPB_MTONEDETECT|VPB_MTIMEREXP|VPB_MPLAY_UNDERFLOW \ #define VPB_EVENTS_ALL (VPB_MRING|VPB_MDIGIT|VPB_MDTMF|VPB_MTONEDETECT|VPB_MTIMEREXP|VPB_MPLAY_UNDERFLOW \
|VPB_MRECORD_OVERFLOW|VPB_MSTATION_OFFHOOK|VPB_MSTATION_ONHOOK \ |VPB_MRECORD_OVERFLOW|VPB_MSTATION_OFFHOOK|VPB_MSTATION_ONHOOK \
@@ -604,14 +605,17 @@ static void get_callerid(struct vpb_pvt *p)
double cid_record_time; double cid_record_time;
int rc; int rc;
struct ast_channel *owner = p->owner; struct ast_channel *owner = p->owner;
/*
void * ws; void * ws;
char callerid[AST_MAX_EXTENSION] = "";
*/
#ifdef ANALYSE_CID
char * file="cidsams.wav"; char * file="cidsams.wav";
#endif
if( ast_mutex_trylock(&p->record_lock) == 0 ) { if( ast_mutex_trylock(&p->record_lock) == 0 ) {
char callerid[AST_MAX_EXTENSION] = "";
cid_record_time = get_time_in_ms(); cid_record_time = get_time_in_ms();
if (option_verbose>3) if (option_verbose>3)
ast_verbose(VERBOSE_PREFIX_4 "CID record - start\n"); ast_verbose(VERBOSE_PREFIX_4 "CID record - start\n");
@@ -692,10 +696,14 @@ static void get_callerid_ast(struct vpb_pvt *p)
int rc=0,vrc; int rc=0,vrc;
int sam_count=0; int sam_count=0;
struct ast_channel *owner = p->owner; struct ast_channel *owner = p->owner;
float old_gain;
int which_cid; int which_cid;
/*
float old_gain;
*/
#ifdef ANALYSE_CID
void * ws; void * ws;
char * file="cidsams.wav"; char * file="cidsams.wav";
#endif
if(p->callerid_type == 1) { if(p->callerid_type == 1) {
if (option_verbose>3) ast_verbose(VERBOSE_PREFIX_4 "Collected caller ID already\n"); if (option_verbose>3) ast_verbose(VERBOSE_PREFIX_4 "Collected caller ID already\n");
@@ -1070,7 +1078,9 @@ static inline int monitor_handle_notowned(struct vpb_pvt *p, VPB_EVENT *e)
struct ast_channel *owner = p->owner; struct ast_channel *owner = p->owner;
char cid_num[256]; char cid_num[256];
char cid_name[256]; char cid_name[256];
/*
struct ast_channel *c; struct ast_channel *c;
*/
if (option_verbose > 3) { if (option_verbose > 3) {
char str[VPB_MAX_STR]; char str[VPB_MAX_STR];
@@ -1601,7 +1611,7 @@ static struct vpb_pvt *mkif(int board, int channel, int mode, int gains, float t
vpb_timer_open(&tmp->ringback_timer, tmp->handle, tmp->ringback_timer_id, TIMER_PERIOD_RINGBACK); vpb_timer_open(&tmp->ringback_timer, tmp->handle, tmp->ringback_timer_id, TIMER_PERIOD_RINGBACK);
tmp->ring_timer_id = vpb_timer_get_unique_timer_id(); tmp->ring_timer_id = vpb_timer_get_unique_timer_id();
vpb_timer_open(&tmp->ring_timer, tmp->handle, tmp->ring_timer_id, TIMER_PERIOD_RING); vpb_timer_open(&tmp->ring_timer, tmp->handle, tmp->ring_timer_id, timer_period_ring);
tmp->dtmfidd_timer_id = vpb_timer_get_unique_timer_id(); tmp->dtmfidd_timer_id = vpb_timer_get_unique_timer_id();
vpb_timer_open(&tmp->dtmfidd_timer, tmp->handle, tmp->dtmfidd_timer_id, dtmf_idd); vpb_timer_open(&tmp->dtmfidd_timer, tmp->handle, tmp->dtmfidd_timer_id, dtmf_idd);
@@ -2033,10 +2043,10 @@ static int vpb_hangup(struct ast_channel *ast)
static int vpb_answer(struct ast_channel *ast) static int vpb_answer(struct ast_channel *ast)
{ {
struct vpb_pvt *p = (struct vpb_pvt *)ast->tech_pvt; struct vpb_pvt *p = (struct vpb_pvt *)ast->tech_pvt;
VPB_EVENT je;
int ret;
int res = 0; int res = 0;
/* /*
VPB_EVENT je;
int ret;
if (option_verbose > 3) ast_verbose("%s: LOCKING in answer \n", p->dev); if (option_verbose > 3) ast_verbose("%s: LOCKING in answer \n", p->dev);
if (option_verbose > 3) ast_verbose("%s: LOCKING count[%d] owner[%d] \n", p->dev, p->lock.__m_count,p->lock.__m_owner); if (option_verbose > 3) ast_verbose("%s: LOCKING count[%d] owner[%d] \n", p->dev, p->lock.__m_count,p->lock.__m_owner);
*/ */
@@ -2751,6 +2761,9 @@ int load_module()
relaxdtmf = 1; relaxdtmf = 1;
ast_log(LOG_NOTICE,"VPB driver using Relaxed DTMF with Asterisk DTMF detections functions!\n"); ast_log(LOG_NOTICE,"VPB driver using Relaxed DTMF with Asterisk DTMF detections functions!\n");
} }
else if (strcasecmp(v->name, "timer_period_ring") ==0) {
timer_period_ring = atoi(v->value);
}
else if (strcasecmp(v->name, "ecsuppthres") ==0) { else if (strcasecmp(v->name, "ecsuppthres") ==0) {
ec_supp_threshold = atoi(v->value); ec_supp_threshold = atoi(v->value);
} }

1
configs/vpb.conf.sample
View File

@@ -9,6 +9,7 @@
; ast-dtmf-det=1 ( To use Asterisk DTMF detection ) ; ast-dtmf-det=1 ( To use Asterisk DTMF detection )
; relaxdtmf=1 ( Used with ast-dtmf-det ) ; relaxdtmf=1 ( Used with ast-dtmf-det )
; break-for-dtmf=no (When a native bridge occurs between 2 vpb channels, it will only break the connection for '#' and '*') ; break-for-dtmf=no (When a native bridge occurs between 2 vpb channels, it will only break the connection for '#' and '*')
; timer_period_ring=4000 (Set the maximum period between received rings, default 4000ms)
; ;
; For [interface] section ; For [interface] section
; board = board_number (1, 2, 3, ...) ; board = board_number (1, 2, 3, ...)