diff options
| author | Terry Wilson <twilson@digium.com> | 2012-02-24 00:32:20 +0000 |
|---|---|---|
| committer | Terry Wilson <twilson@digium.com> | 2012-02-24 00:32:20 +0000 |
| commit | ebaf59a656ef94e19332c08e0d0562b8cbe59f65 (patch) | |
| tree | 6e75fd13924808bddacc18e14d5e02975a322481 /include/asterisk/channel.h | |
| parent | 235f88d12270b328ad466889189400666b3e56c1 (diff) | |
Opaquification for ast_format structs in struct ast_channel
Review: https://reviewboard.asterisk.org/r/1770/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@356573 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/channel.h')
| -rw-r--r-- | include/asterisk/channel.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 165e6e589..7b4313b2b 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -869,7 +869,7 @@ struct ast_channel { int __do_not_use_fdno; /*!< Which fd had an event detected on */ int __do_not_use_streamid; /*!< For streaming playback, the schedule ID */ int __do_not_use_vstreamid; /*!< For streaming video playback, the schedule ID */ - struct ast_format oldwriteformat; /*!< Original writer format */ + struct ast_format __do_not_use_oldwriteformat; /*!< Original writer format */ int __do_not_use_timingfd; /*!< Timing fd */ enum ast_channel_state __do_not_use_state; /*!< State of line -- Don't write directly, use ast_setstate() */ int __do_not_use_rings; /*!< Number of rings so far */ @@ -885,10 +885,10 @@ struct ast_channel { unsigned int flags; /*!< channel flags of AST_FLAG_ type */ int alertpipe[2]; struct ast_format_cap *__do_not_use_nativeformats; /*!< Kinds of data this channel can natively handle */ - struct ast_format readformat; /*!< Requested read format (after translation) */ - struct ast_format writeformat; /*!< Requested write format (after translation) */ - struct ast_format rawreadformat; /*!< Raw read format (before translation) */ - struct ast_format rawwriteformat; /*!< Raw write format (before translation) */ + struct ast_format __do_not_use_readformat; /*!< Requested read format (after translation) */ + struct ast_format __do_not_use_writeformat; /*!< Requested write format (after translation) */ + struct ast_format __do_not_use_rawreadformat; /*!< Raw read format (before translation) */ + struct ast_format __do_not_use_rawwriteformat; /*!< Raw write format (before translation) */ unsigned int __do_not_use_emulate_dtmf_duration; /*!< Number of ms left to emulate DTMF for */ #ifdef HAVE_EPOLL int __do_not_use_epfd; @@ -3731,4 +3731,12 @@ void ast_channel_adsicpe_set(struct ast_channel *chan, enum ast_channel_adsicpe enum ast_channel_state ast_channel_state(const struct ast_channel *chan); /* XXX Internal use only, make sure to move later */ void ast_channel_state_set(struct ast_channel *chan, enum ast_channel_state); + +/* Format getters */ +struct ast_format *ast_channel_oldwriteformat(struct ast_channel *chan); +struct ast_format *ast_channel_rawreadformat(struct ast_channel *chan); +struct ast_format *ast_channel_rawwriteformat(struct ast_channel *chan); +struct ast_format *ast_channel_readformat(struct ast_channel *chan); +struct ast_format *ast_channel_writeformat(struct ast_channel *chan); + #endif /* _ASTERISK_CHANNEL_H */ |