diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-07-23 16:26:36 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-07-23 16:26:36 +0000 |
| commit | b4dd4ffbc4669c1f20d1605ca670cfc65befc87d (patch) | |
| tree | c0a8de6248d35a2b191ce03f44e6877e8baf309b /channels/dahdi | |
| parent | 83a871ea35e48264f35d4170f08c96d9485097f0 (diff) | |
Some chan_dahdi protected function renaming.
analog_lib_handles --> dahdi_analog_lib_handles
enable_dtmf_detect --> dahdi_dtmf_detect_enable
disable_dtmf_detect --> dahdi_dtmf_detect_disable
dahdi_enable_ec --> dahdi_ec_enable
dahdi_disable_ec --> dahdi_ec_disable
update_conf --> dahdi_conf_update
dahdi_link --> dahdi_master_slave_link
dahdi_unlink --> dahdi_master_slave_unlink
(closes issue ASTERISK-22129)
Reported by: rmudgett
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395167 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/dahdi')
| -rw-r--r-- | channels/dahdi/bridge_native_dahdi.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/channels/dahdi/bridge_native_dahdi.c b/channels/dahdi/bridge_native_dahdi.c index 611994f5e..963b02155 100644 --- a/channels/dahdi/bridge_native_dahdi.c +++ b/channels/dahdi/bridge_native_dahdi.c @@ -156,16 +156,16 @@ static void native_stop(struct ast_bridge *bridge) ast_mutex_lock(&chan_tech_pvt->pvt->lock); if (chan_tech_pvt->pvt == ast_channel_tech_pvt(cur->chan)) { - dahdi_enable_ec(chan_tech_pvt->pvt); + dahdi_ec_enable(chan_tech_pvt->pvt); } if (chan_tech_pvt->index == SUB_REAL) { - enable_dtmf_detect(chan_tech_pvt->pvt); + dahdi_dtmf_detect_enable(chan_tech_pvt->pvt); } ast_mutex_unlock(&chan_tech_pvt->pvt->lock); } bridge_tech_pvt = bridge->tech_pvt; - dahdi_unlink(bridge_tech_pvt->slave, bridge_tech_pvt->master, 1); + dahdi_master_slave_unlink(bridge_tech_pvt->slave, bridge_tech_pvt->master, 1); ast_debug(2, "Stop native bridging %s and %s\n", ast_channel_name(AST_LIST_FIRST(&bridge->channels)->chan), @@ -404,19 +404,19 @@ static int native_start(struct ast_bridge *bridge) if (npc0->index == SUB_REAL && npc1->index == SUB_REAL) { if (!p0->echocanbridged || !p1->echocanbridged) { /* Disable echo cancellation if appropriate */ - dahdi_disable_ec(p0); - dahdi_disable_ec(p1); + dahdi_ec_disable(p0); + dahdi_ec_disable(p1); } } - dahdi_link(slave, master); + dahdi_master_slave_link(slave, master); master->inconference = inconf; } else if (!nothing_ok) { ast_log(LOG_WARNING, "Can't link %d/%s with %d/%s\n", p0->channel, subnames[npc0->index], p1->channel, subnames[npc1->index]); } - update_conf(p0); - update_conf(p1); + dahdi_conf_update(p0); + dahdi_conf_update(p1); ast_channel_unlock(c0); ast_channel_unlock(c1); @@ -429,10 +429,10 @@ static int native_start(struct ast_bridge *bridge) } if (npc0->index == SUB_REAL) { - disable_dtmf_detect(p0); + dahdi_dtmf_detect_disable(p0); } if (npc1->index == SUB_REAL) { - disable_dtmf_detect(p1); + dahdi_dtmf_detect_disable(p1); } ast_mutex_unlock(&p0->lock); |