kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-10 14:51:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

A great big renaming patch

Browse Source 
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
This commit is contained in:
Matthew Jordan
2013-07-25 04:06:32 +00:00
parent 9d8a5ceb02
commit cafc115896
71 changed files with 379 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
channels/sig_analog.c
View File

@@ -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();