mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
Remove more needlock stuff
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2662 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -380,7 +380,7 @@ static int agent_write(struct ast_channel *ast, struct ast_frame *f)
|
|||||||
return res;
|
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;
|
struct agent_pvt *p = newchan->pvt->pvt;
|
||||||
if (needlock)
|
if (needlock)
|
||||||
|
@@ -718,7 +718,7 @@ static struct ast_frame *alsa_read(struct ast_channel *chan)
|
|||||||
}
|
}
|
||||||
#endif
|
#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;
|
struct chan_alsa_pvt *p = newchan->pvt->pvt;
|
||||||
p->owner = newchan;
|
p->owner = newchan;
|
||||||
|
@@ -533,7 +533,7 @@ static struct ast_frame *oh323_rtp_read(struct oh323_pvt *p)
|
|||||||
|
|
||||||
/* Do in-band DTMF detection */
|
/* Do in-band DTMF detection */
|
||||||
if (p->dtmfmode & H323_DTMF_INBAND) {
|
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)
|
if (f->frametype == AST_FRAME_DTMF)
|
||||||
ast_log(LOG_DEBUG, "Got in-band digit %c.\n", f->subclass);
|
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???
|
// 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;
|
struct oh323_pvt *p = newchan->pvt->pvt;
|
||||||
|
|
||||||
|
@@ -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);
|
ast_set_write_format(p->owner, p->owner->writeformat);
|
||||||
}
|
}
|
||||||
if (p->dtmfinband) {
|
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);
|
ast_queue_frame(p->owner, f);
|
||||||
|
Reference in New Issue
Block a user