diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-04-06 22:17:32 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-04-06 22:17:32 +0000 |
commit | b837107b6b89ed55e1ac5e2ef829e72275914403 (patch) | |
tree | f9360f7b870da96fcd47e19ff8c203287e906599 /channels/chan_vpb.c | |
parent | 72df970e585d58cc41da5f90b28ce4676217ef0a (diff) |
Get rid of all that old needlock garbage now that we're using recursive mutexes
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2644 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_vpb.c')
-rwxr-xr-x | channels/chan_vpb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/chan_vpb.c b/channels/chan_vpb.c index fb0b7b3c8..68a99778a 100755 --- a/channels/chan_vpb.c +++ b/channels/chan_vpb.c @@ -635,7 +635,7 @@ static inline int monitor_handle_owned(struct vpb_pvt *p, VPB_EVENT *e) // Problem is that hangup holds p->owner->lock if (f.frametype >= 0 && f.frametype != AST_FRAME_NULL) { if (ast_mutex_trylock(&p->owner->lock)==0) { - ast_queue_frame(p->owner, &f, 0); + ast_queue_frame(p->owner, &f); ast_mutex_unlock(&p->owner->lock); } else { ast_verbose("Missed event %d/%d on %s\n", @@ -1151,7 +1151,7 @@ static int vpb_call(struct ast_channel *ast, char *dest, int timeout) ast_verbose(VERBOSE_PREFIX_3 " VPB Calling %s [t=%d] on %s returned %d\n", s, timeout, ast->name, res); if (res == 0) { ast_setstate(ast, AST_STATE_RINGING); - ast_queue_control(ast,AST_CONTROL_RINGING, 0); + ast_queue_control(ast,AST_CONTROL_RINGING); } pthread_create(&p->readthread, NULL, do_chanreads, (void *)p); @@ -1456,7 +1456,7 @@ static void *do_chanreads(void *pvt) // Using trylock here to prevent deadlock when channel is hungup // (ast_hangup() immediately gets lock) if (p->owner && (ast_mutex_trylock(&p->owner->lock)==0) ) { - ast_queue_frame(p->owner, fr, 0); + ast_queue_frame(p->owner, fr); ast_mutex_unlock(&p->owner->lock); if (option_verbose > 4) { short * data = (short*)readbuf; |