Merge Mahmut's recording patches

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@686 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 4 insertions, 0 deletions

diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index b14d3c928..6979515da 100755
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -30,6 +30,7 @@ extern "C" {
 #define AST_MAX_EXTENSION 80
 
 #include <asterisk/cdr.h>
+#include <asterisk/monitor.h>
 
 
 #define AST_CHANNEL_NAME 80
@@ -175,6 +176,9 @@ struct ast_channel {
 	/*! Tone zone */
 	struct tone_zone *zone;
 
+	/* Channel monitoring */
+	struct ast_channel_monitor *monitor;
+
 	/* Frames in/out counters */
 	unsigned int fin;
 	unsigned int fout;