Merge Mahmut's recording patches

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@686 65c4cc65-6c06-0410-ace0-fbb531ad65f3

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;