diff options
| author | Matthew Jordan <mjordan@digium.com> | 2013-07-25 04:06:32 +0000 |
|---|---|---|
| committer | Matthew Jordan <mjordan@digium.com> | 2013-07-25 04:06:32 +0000 |
| commit | cafc1158961f28ad54ebcdc5e042bf8094cbc620 (patch) | |
| tree | 2e54d30ea5d8db7e007ff5c653c5acd4ed3fb649 /channels/sig_analog.c | |
| parent | 9d8a5ceb02f6559940bd94aaf163a544ce6e6f4c (diff) | |
A great big renaming patch
This patch renames the bridging* files to bridge*. This may seem pedantic
and silly, but it fits better in line with current Asterisk naming conventions:
* channel is not "channeling"
* monitor is not "monitoring"
etc.
A bridge is an object. It is a first class citizen in Asterisk. "Bridging" is
the act of using a bridge on a set of channels - and the API that fulfills that
role is more than just the action.
(closes issue ASTERISK-22130)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/sig_analog.c')
| -rw-r--r-- | channels/sig_analog.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/channels/sig_analog.c b/channels/sig_analog.c index d80f68535..9effae1f1 100644 --- a/channels/sig_analog.c +++ b/channels/sig_analog.c @@ -43,7 +43,7 @@ #include "asterisk/features.h" #include "asterisk/causes.h" #include "asterisk/features_config.h" -#include "asterisk/bridging.h" +#include "asterisk/bridge.h" #include "sig_analog.h" @@ -1830,7 +1830,7 @@ static void *__analog_ss_thread(void *data) case ANALOG_SIG_SF_FEATDMF: res = analog_my_getsigstr(chan, dtmfbuf + 1, "#", 3000); /* if international caca, do it again to get real ANO */ - if ((p->sig == ANALOG_SIG_FEATDMF) && (dtmfbuf[1] != '0') + if ((p->sig == ANALOG_SIG_FEATDMF) && (dtmfbuf[1] != '0') && (strlen(dtmfbuf) != 14)) { if (analog_wink(p, idx)) { goto quit; @@ -2351,7 +2351,7 @@ static void *__analog_ss_thread(void *data) /* If set to use DTMF CID signalling, listen for DTMF */ if (p->cid_signalling == CID_SIG_DTMF) { int k = 0; - int oldlinearity; + int oldlinearity; int timeout_ms; int ms; struct timeval start = ast_tvnow(); |