[Asterisk-cvs] asterisk/include/asterisk app.h, 1.20, 1.21 channel.h, 1.66, 1.67

[markster at lists.digium.com]

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

Modified Files:
	app.h channel.h 
Log Message:
Merge Tony's attended # transfer with changes (bug #3241)


Index: app.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/app.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- app.h	31 Dec 2004 01:11:33 -0000	1.20
+++ app.h	5 Jan 2005 19:56:47 -0000	1.21
@@ -90,6 +90,9 @@
 //! Create an argc argv type structure for app args
 int ast_seperate_app_args(char *buf, char delim, char **array, int arraylen);
 
+//! Present a dialtone and collect a certain length extension.  Returns 1 on valid extension entered, -1 on hangup, or 0 on invalid extension.
+int ast_app_dtget(struct ast_channel *chan, const char *context, char *collect, size_t size, int maxlen, int timeout);
+
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

Index: channel.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/channel.h,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- channel.h	4 Jan 2005 04:01:40 -0000	1.66
+++ channel.h	5 Jan 2005 19:56:47 -0000	1.67
@@ -236,6 +236,8 @@
 #define AST_FEATURE_PLAY_WARNING	(1 << 0)
 #define AST_FEATURE_REDIRECT		(1 << 1)
 #define AST_FEATURE_DISCONNECT		(1 << 2)
+#define AST_FEATURE_ATXFER			(1 << 3)
+#define AST_FEATURE_AUTOMON			(1 << 4)
 
 #define AST_FEATURE_FLAG_NEEDSDTMF		(1 << 0)