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

2 files changed, 24 insertions, 2 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
 /*! 
diff --git a/include/asterisk/parking.h b/include/asterisk/parking.h
index 4b9859592..836909d71 100755
--- a/include/asterisk/parking.h
+++ b/include/asterisk/parking.h
@@ -44,9 +44,13 @@ 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, int allowredirect_in, int allowredirect_out, int allowdisconnect);
+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);