Update of /usr/cvsroot/asterisk/include/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv10576/include/asterisk
Modified Files:
channel.h
Log Message:
bridging code cleanups:
code style, formatting
use enum/symbolic constants for return codes
efficiency improvements
(zaptel) only disable DTMF detection once per bridge, not every frame
(zaptel) ensure VPM DTMF detector is turned off during native bridge
Index: channel.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/channel.h,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- channel.h 3 Aug 2005 04:42:59 -0000 1.95
+++ channel.h 9 Aug 2005 01:59:59 -0000 1.96
@@ -53,6 +53,13 @@
#define AST_MAX_FDS 8
+enum ast_bridge_result {
+ AST_BRIDGE_COMPLETE = 0,
+ AST_BRIDGE_FAILED = -1,
+ AST_BRIDGE_FAILED_NOWARN = -2,
+ AST_BRIDGE_RETRY = -3,
+};
+
typedef unsigned long long ast_group_t;
struct ast_generator {
@@ -130,8 +137,8 @@
struct ast_frame * (* const exception)(struct ast_channel *chan);
/*! Bridge two channels of the same type together */
- int (* const bridge)(struct ast_channel *c0, struct ast_channel *c1,
int flags,
- struct ast_frame **fo, struct ast_channel **rc);
+ enum ast_bridge_result (* const bridge)(struct ast_channel *c0, struct
ast_channel *c1, int flags,
+ struct ast_frame **fo, struct
ast_channel **rc);
/*! Indicate a particular condition (e.g. AST_CONTROL_BUSY or
AST_CONTROL_RINGING or AST_CONTROL_CONGESTION */
int (* const indicate)(struct ast_channel *c, int condition);
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
