[Asterisk-cvs] asterisk/include/asterisk channel.h,1.43,1.44 parking.h,1.6,1.7

[anthm at lists.digium.com]

Update of /usr/cvsroot/asterisk/include/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv31609/include/asterisk

Modified Files:
	channel.h parking.h 
Log Message:
applied final release of bug 1353 per Mark's permission


Index: channel.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/channel.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- channel.h	25 Apr 2004 20:42:45 -0000	1.43
+++ channel.h	26 Apr 2004 23:22:33 -0000	1.44
@@ -267,6 +267,22 @@
 		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 @@
  * \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
 /*! 

Index: parking.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/parking.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- parking.h	27 Feb 2004 06:15:49 -0000	1.6
+++ parking.h	26 Apr 2004 23:22:33 -0000	1.7
@@ -44,9 +44,13 @@
 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);