diff options
author | anthm <anthm@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-04-26 23:22:34 +0000 |
---|---|---|
committer | anthm <anthm@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-04-26 23:22:34 +0000 |
commit | aa820ac9405d4a3f4fb6532730d830312304fa77 (patch) | |
tree | 795ee349d435830084b8f5f9c00c84301b059439 /include/asterisk/channel.h | |
parent | b1ebc7d3c1eb97b62eab34fdc3e3e2d67b1f791b (diff) |
applied final release of bug 1353 per Mark's permission
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2782 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk/channel.h')
-rwxr-xr-x | include/asterisk/channel.h | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index ef1d84756..2a2a96a7a 100755 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -267,6 +267,22 @@ static inline void ast_dup_flag(struct ast_channel *dstchan, struct ast_channel ast_clear_flag(dstchan, mode); } + +struct ast_bridge_config { + int play_to_caller; + int play_to_callee; + int allowredirect_in; + int allowredirect_out; + int allowdisconnect; + long timelimit; + long play_warning; + long warning_freq; + char *warning_sound; + char *end_sound; + char *start_sound; +}; + + struct chanmon; #define LOAD_OH(oh) { \ @@ -666,7 +682,9 @@ int ast_channel_make_compatible(struct ast_channel *c0, struct ast_channel *c1); * \param rc destination channel(?) * Bridge two channels (c0 and c1) together. If an important frame occurs, we return that frame in *rf (remember, it could be NULL) and which channel (0 or 1) in rc */ -int ast_channel_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags, struct ast_frame **fo, struct ast_channel **rc); +//int ast_channel_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags, struct ast_frame **fo, struct ast_channel **rc); +int ast_channel_bridge(struct ast_channel *c0,struct ast_channel *c1,struct ast_bridge_config *config, struct ast_frame **fo, struct ast_channel **rc); + //! Weird function made for call transfers /*! |