Properly implement using zaptel for timing of file playback

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

2 files changed, 5 insertions, 4 deletions

diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index c7867b144..107e70da4 100755
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -125,7 +125,8 @@ struct ast_channel {
 	
 	/*! Timing fd */
 	int timingfd;
-
+	int (*timingfunc)(void *data);
+	void *timingdata;
 
 	/*! State of line -- Don't write directly, use ast_setstate */
 	int _state;				
@@ -695,8 +696,8 @@ int ast_autoservice_start(struct ast_channel *chan);
 int ast_autoservice_stop(struct ast_channel *chan);
 
 /* If built with zaptel optimizations, force a scheduled expiration on the
-   timer fd */
-int ast_settimeout(struct ast_channel *c, int ms);
+   timer fd, at which point we call the callback function / data */
+int ast_settimeout(struct ast_channel *c, int samples, int (*func)(void *data), void *data);
 
 /* Transfer a channel (if supported).  Returns -1 on error, 0 if not supported
    and 1 if supported and requested */
diff --git a/include/asterisk/file.h b/include/asterisk/file.h
index 418564249..da3723dac 100755
--- a/include/asterisk/file.h
+++ b/include/asterisk/file.h
@@ -259,7 +259,7 @@ int ast_stream_rewind(struct ast_filestream *fs, long ms);
  */
 long ast_tellstream(struct ast_filestream *fs);
 
-#define AST_RESERVED_POINTERS 12
+#define AST_RESERVED_POINTERS 20
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }