diff options
Diffstat (limited to 'include/asterisk/channel.h')
| -rwxr-xr-x | include/asterisk/channel.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 2a2a96a7a..c6c3e2461 100755 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -267,22 +267,20 @@ 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 timelimit; + long play_warning; long warning_freq; - char *warning_sound; - char *end_sound; - char *start_sound; + char *warning_sound; + char *end_sound; + char *start_sound; }; - struct chanmon; #define LOAD_OH(oh) { \ @@ -685,7 +683,6 @@ int ast_channel_make_compatible(struct ast_channel *c0, struct ast_channel *c1); //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 /*! * \param original channel to make a copy of |