aboutsummaryrefslogtreecommitdiffstats
path: root/include/asterisk/channel.h
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2008-01-16 20:33:47 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2008-01-16 20:33:47 +0000
commite13f2a7488382aabc3ac369c5495f013e2a0adc0 (patch)
treef2bf111805d3da287f8981b96532cdd0a84aecbe /include/asterisk/channel.h
parentf4896114d2d146ab65a296e4090d564af0676459 (diff)
Replace current spy architecture with backport of audiohooks. This should take care of current known spy issues.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@98972 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk/channel.h')
-rw-r--r--include/asterisk/channel.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index d6c9063f9..de81ca909 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -276,9 +276,6 @@ struct ast_channel_tech {
int (* set_base_channel)(struct ast_channel *chan, struct ast_channel *base);
};
-struct ast_channel_spy_list;
-struct ast_channel_whisper_buffer;
-
#define DEBUGCHAN_FLAG 0x80000000
#define FRAMECOUNT_INC(x) ( ((x) & DEBUGCHAN_FLAG) | (((x)+1) & ~DEBUGCHAN_FLAG) )
@@ -430,8 +427,8 @@ struct ast_channel {
int rawreadformat; /*!< Raw read format */
int rawwriteformat; /*!< Raw write format */
- struct ast_channel_spy_list *spies; /*!< Chan Spy stuff */
- struct ast_channel_whisper_buffer *whisper; /*!< Whisper Paging buffer */
+ struct ast_audiohook_list *audiohooks;
+
AST_LIST_ENTRY(ast_channel) chan_list; /*!< For easy linking */
struct ast_jb jb; /*!< The jitterbuffer state */