[Asterisk-cvs] asterisk/include/asterisk channel.h,1.44,1.45 parking.h,1.7,1.8
citats at lists.digium.com
citats at lists.digium.com
Tue Apr 27 17:15:42 CDT 2004
Update of /usr/cvsroot/asterisk/include/asterisk
In directory mongoose.digium.com:/home/citats/cvs/asterisk/include/asterisk
Modified Files:
channel.h parking.h
Log Message:
Revert formatting changes
Index: channel.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/channel.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- channel.h 26 Apr 2004 23:22:33 -0000 1.44
+++ channel.h 27 Apr 2004 21:21:57 -0000 1.45
@@ -267,22 +267,20 @@
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) { \
@@ -684,7 +682,6 @@
*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,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.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- parking.h 26 Apr 2004 23:22:33 -0000 1.7
+++ parking.h 27 Apr 2004 21:21:57 -0000 1.8
@@ -44,13 +44,9 @@
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);
More information about the svn-commits
mailing list