diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-08-09 01:59:59 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-08-09 01:59:59 +0000 |
| commit | e915d19e2feb107878a566f88f99f023b82b90f6 (patch) | |
| tree | fe65734fb55f7f0e65a4e554aa801939b67b4b80 /include/asterisk | |
| parent | 53fb7866aba8a5605080dc284ac036f245352fb6 (diff) | |
bridging code cleanups:
code style, formatting
use enum/symbolic constants for return codes
efficiency improvements
(zaptel) only disable DTMF detection once per bridge, not every frame
(zaptel) ensure VPM DTMF detector is turned off during native bridge
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6312 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk')
| -rwxr-xr-x | include/asterisk/channel.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index de2099288..cd45cb1a3 100755 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -53,6 +53,13 @@ extern "C" { #define AST_MAX_FDS 8 +enum ast_bridge_result { + AST_BRIDGE_COMPLETE = 0, + AST_BRIDGE_FAILED = -1, + AST_BRIDGE_FAILED_NOWARN = -2, + AST_BRIDGE_RETRY = -3, +}; + typedef unsigned long long ast_group_t; struct ast_generator { @@ -130,8 +137,8 @@ struct ast_channel_tech { struct ast_frame * (* const exception)(struct ast_channel *chan); /*! Bridge two channels of the same type together */ - int (* const bridge)(struct ast_channel *c0, struct ast_channel *c1, int flags, - struct ast_frame **fo, struct ast_channel **rc); + enum ast_bridge_result (* const bridge)(struct ast_channel *c0, struct ast_channel *c1, int flags, + struct ast_frame **fo, struct ast_channel **rc); /*! Indicate a particular condition (e.g. AST_CONTROL_BUSY or AST_CONTROL_RINGING or AST_CONTROL_CONGESTION */ int (* const indicate)(struct ast_channel *c, int condition); |