diff options
author | Joshua Colp <jcolp@digium.com> | 2007-08-08 19:30:52 +0000 |
---|---|---|
committer | Joshua Colp <jcolp@digium.com> | 2007-08-08 19:30:52 +0000 |
commit | 602198c402ebf5d6b2fd82149b1377146c6b8814 (patch) | |
tree | d8f49fe3111f2586e86ed3583f8a44a1b2444e3f /include/asterisk/channel.h | |
parent | 082322685fc16b429595e66cb18d303301944fe0 (diff) |
Merge audiohooks branch into trunk. This is a new API for developers to listen and manipulate the audio going through a channel.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@78649 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/channel.h')
-rw-r--r-- | include/asterisk/channel.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 3e63259aa..39f2c636d 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -316,9 +316,6 @@ struct ast_channel_tech { int (* func_channel_write)(struct ast_channel *chan, const char *function, char *data, const char *value); }; -struct ast_channel_spy_list; /*!< \todo Add explanation here */ -struct ast_channel_whisper_buffer; /*!< \todo Add explanation here */ - /*! * The high bit of the frame count is used as a debug marker, so * increments of the counters must be done with care. @@ -481,8 +478,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 */ |