Merged revisions 51989 via svnmerge from
authorJason Parker <jparker@digium.com>
Thu, 24 Apr 2008 16:47:01 +0000 (16:47 +0000)
committerJason Parker <jparker@digium.com>
Thu, 24 Apr 2008 16:47:01 +0000 (16:47 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #12496)
Reported by: daniele
Patches:
      misdn-moh-1.6.0-beta7.1.patch uploaded by daniele (license 471)
Tested by: daniele

Technically, I didn't use the patch above except to find out what revision to merge - but it's the same thing as this revision.

........
r51989 | crichter | 2007-01-24 06:57:22 -0600 (Wed, 24 Jan 2007) | 1 line

added fix from #8899
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114612 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_misdn.c

index 35b5064..ea005d5 100644 (file)
@@ -2533,9 +2533,11 @@ static int misdn_indication(struct ast_channel *ast, int cond, const void *data,
                        start_bc_tones(p);
                break;
        case AST_CONTROL_HOLD:
+               ast_moh_start(ast,data,ast->musicclass); 
                chan_misdn_log(1, p->bc->port, " --> *\tHOLD pid:%d\n", p->bc ? p->bc->pid : -1);
                break;
        case AST_CONTROL_UNHOLD:
+               ast_moh_stop(ast);
                chan_misdn_log(1, p->bc->port, " --> *\tUNHOLD pid:%d\n", p->bc ? p->bc->pid : -1);
                break;
        default: