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 /channels/chan_jingle.c | |
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 'channels/chan_jingle.c')
-rw-r--r-- | channels/chan_jingle.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c index cefecc783..6ea1462ee 100644 --- a/channels/chan_jingle.c +++ b/channels/chan_jingle.c @@ -1116,9 +1116,21 @@ static int jingle_fixup(struct ast_channel *oldchan, struct ast_channel *newchan static int jingle_indicate(struct ast_channel *ast, int condition, const void *data, size_t datalen) { - ast_log(LOG_NOTICE, "XXX Implement jingle indicate XXX\n"); + int res = 0; - return -1; + switch (condition) { + case AST_CONTROL_HOLD: + ast_moh_start(ast, data, NULL); + break; + case AST_CONTROL_UNHOLD: + ast_moh_stop(ast); + break; + default: + ast_log(LOG_NOTICE, "Don't know how to indicate condition '%d'\n", condition); + res = -1; + } + + return res; } static int jingle_digit(struct ast_channel *ast, char digit) |