diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2006-07-19 20:44:39 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-07-19 20:44:39 +0000 |
commit | 6d0742fc1657017a3e69558b6192399b2f8469e6 (patch) | |
tree | 3c36781db3a5a7a08967cbe8d83acb5d82e581cb /include | |
parent | 54e1f06c463bf72fa730f9be042d62f4ee2c4593 (diff) |
merge Russell's 'hold_handling' branch, finally implementing music-on-hold handling the way it was decided at AstriDevCon Europe 2006 (and the way people really want it to be)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37988 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
-rw-r--r-- | include/asterisk/musiconhold.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/include/asterisk/musiconhold.h b/include/asterisk/musiconhold.h index 55a761c2f..8a8018d19 100644 --- a/include/asterisk/musiconhold.h +++ b/include/asterisk/musiconhold.h @@ -27,13 +27,24 @@ extern "C" { #endif -/*! Turn on music on hold on a given channel */ -int ast_moh_start(struct ast_channel *chan, const char *mclass); +/*! + * \brief Turn on music on hold on a given channel + * + * \param chan The channel structure that will get music on hold + * \param mclass The class to use if the musicclass is not currently set on + * the channel structure. + * \param interpclass The class to use if the musicclass is not currently set on + * the channel structure or in the mclass argument. + * + * \retval 0 success + * \retval non-zero failure + */ +int ast_moh_start(struct ast_channel *chan, const char *mclass, const char *interpclass); /*! Turn off music on hold on a given channel */ void ast_moh_stop(struct ast_channel *chan); -void ast_install_music_functions(int (*start_ptr)(struct ast_channel *, const char *), +void ast_install_music_functions(int (*start_ptr)(struct ast_channel *, const char *, const char *), void (*stop_ptr)(struct ast_channel *), void (*cleanup_ptr)(struct ast_channel *)); |