diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-23 16:49:12 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-23 16:49:12 +0000 |
| commit | 604972725d6443e145cc1344d5b91a94f3a6874d (patch) | |
| tree | 9df57ec67d82e432a214c23cd83cc42f9889c78f /include/asterisk | |
| parent | 782273ca463cc47bf63cb11429ce97e49fcac58f (diff) | |
revert my changes that converted the jb on the channel to be dynamically
allocated. These changes caused crashes when using a channel type that did
not support the jitterbuffer. Instead of fixing why it's crashing, I'm going
to implement this in a better way next week. The way I did it caused a
jitterbuffer to be allocated on every channel where the channel type supported
jitterbuffers, even if they were disabled.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@35746 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk')
| -rw-r--r-- | include/asterisk/abstract_jb.h | 10 | ||||
| -rw-r--r-- | include/asterisk/channel.h | 2 |
2 files changed, 3 insertions, 9 deletions
diff --git a/include/asterisk/abstract_jb.h b/include/asterisk/abstract_jb.h index 8f365a860..014902be8 100644 --- a/include/asterisk/abstract_jb.h +++ b/include/asterisk/abstract_jb.h @@ -202,22 +202,16 @@ int ast_jb_read_conf(struct ast_jb_conf *conf, char *varname, char *value); * * Called from a channel driver when a channel is created and its jitterbuffer needs * to be configured. - * - * \retval 0 success - * \retval -1 failure */ -int ast_jb_configure(struct ast_channel *chan, const struct ast_jb_conf *conf); +void ast_jb_configure(struct ast_channel *chan, const struct ast_jb_conf *conf); /*! * \brief Copies a channel's jitterbuffer configuration. * \param chan channel. * \param conf destination. - * - * \retval 0 success - * \retval -1 failure */ -int ast_jb_get_config(const struct ast_channel *chan, struct ast_jb_conf *conf); +void ast_jb_get_config(const struct ast_channel *chan, struct ast_jb_conf *conf); #if defined(__cplusplus) || defined(c_plusplus) diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 0168b90fa..3d842bbe3 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -383,7 +383,7 @@ struct ast_channel { struct ast_channel_spy_list *spies; /*!< Chan Spy stuff */ AST_LIST_ENTRY(ast_channel) chan_list; /*!< For easy linking */ - struct ast_jb *jb; /*!< The jitterbuffer state */ + struct ast_jb jb; /*!< The jitterbuffer state */ /*! \brief Data stores on the channel */ AST_LIST_HEAD_NOLOCK(datastores, ast_datastore) datastores; |