diff options
| author | citats <citats@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-04-27 21:21:57 +0000 |
|---|---|---|
| committer | citats <citats@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-04-27 21:21:57 +0000 |
| commit | bd44ffbbd0b38ed1598481b0f9b7a24865b52d9f (patch) | |
| tree | 188dc2b8f18557b1f0c2095a8f122821394a09d5 /include/asterisk | |
| parent | a795f8eae3aabb3a99af818ec011c330f621d4a5 (diff) | |
Revert formatting changes
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2786 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk')
| -rwxr-xr-x | include/asterisk/channel.h | 13 | ||||
| -rwxr-xr-x | include/asterisk/parking.h | 4 |
2 files changed, 5 insertions, 12 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 diff --git a/include/asterisk/parking.h b/include/asterisk/parking.h index 836909d71..1e30f8ae0 100755 --- a/include/asterisk/parking.h +++ b/include/asterisk/parking.h @@ -44,14 +44,10 @@ extern int ast_masq_park_call(struct ast_channel *rchan, struct ast_channel *hos extern char *ast_parking_ext(void); extern char *ast_pickup_ext(void); - - //! Bridge a call, optionally allowing redirection extern int ast_bridge_call(struct ast_channel *chan, struct ast_channel *peer,struct ast_bridge_config *config); - - extern int ast_pickup_call(struct ast_channel *chan); |