From 1b2dc7ef7560548b05d7b22a3c0c07db9d7d482f Mon Sep 17 00:00:00 2001 From: James Golovich Date: Thu, 8 Apr 2004 19:19:24 +0000 Subject: [PATCH] Remove more needlock stuff git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2662 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_agent.c | 2 +- channels/chan_alsa.c | 2 +- channels/chan_h323.c | 4 ++-- channels/chan_mgcp.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/channels/chan_agent.c b/channels/chan_agent.c index 885c4ca608..c12a8581a4 100755 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -380,7 +380,7 @@ static int agent_write(struct ast_channel *ast, struct ast_frame *f) return res; } -static int agent_fixup(struct ast_channel *oldchan, struct ast_channel *newchan, int needlock) +static int agent_fixup(struct ast_channel *oldchan, struct ast_channel *newchan) { struct agent_pvt *p = newchan->pvt->pvt; if (needlock) diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c index 7380d0a7ad..57d0fdb74c 100755 --- a/channels/chan_alsa.c +++ b/channels/chan_alsa.c @@ -718,7 +718,7 @@ static struct ast_frame *alsa_read(struct ast_channel *chan) } #endif -static int alsa_fixup(struct ast_channel *oldchan, struct ast_channel *newchan, int needlock) +static int alsa_fixup(struct ast_channel *oldchan, struct ast_channel *newchan) { struct chan_alsa_pvt *p = newchan->pvt->pvt; p->owner = newchan; diff --git a/channels/chan_h323.c b/channels/chan_h323.c index b1c6756622..ca68cb6817 100755 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -533,7 +533,7 @@ static struct ast_frame *oh323_rtp_read(struct oh323_pvt *p) /* Do in-band DTMF detection */ if (p->dtmfmode & H323_DTMF_INBAND) { - f = ast_dsp_process(p->owner,p->vad,f,0); + f = ast_dsp_process(p->owner,p->vad,f); if (f->frametype == AST_FRAME_DTMF) ast_log(LOG_DEBUG, "Got in-band digit %c.\n", f->subclass); } @@ -622,7 +622,7 @@ static int oh323_indicate(struct ast_channel *c, int condition) } // FIXME: WTF is this? Do I need this??? -static int oh323_fixup(struct ast_channel *oldchan, struct ast_channel *newchan, int needlock) +static int oh323_fixup(struct ast_channel *oldchan, struct ast_channel *newchan) { struct oh323_pvt *p = newchan->pvt->pvt; diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index 2545236efd..e2cf8e4a68 100755 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -1334,7 +1334,7 @@ static int rtpready(struct ast_rtp *rtp, struct ast_frame *f, void *data) ast_set_write_format(p->owner, p->owner->writeformat); } if (p->dtmfinband) { - f = ast_dsp_process(p->owner,p->dsp,f,0); + f = ast_dsp_process(p->owner,p->dsp,f); } } ast_queue_frame(p->owner, f);