[asterisk-commits] qwell: branch 1.6.0 r114613 - in /branches/1.6.0: ./ channels/chan_misdn.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Thu Apr 24 11:48:05 2008
New Revision: 114613

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114613
Log:
Merged revisions 114612 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r114612 | qwell | 2008-04-24 11:47:01 -0500 (Thu, 24 Apr 2008) | 17 lines

Merged revisions 51989 via svnmerge from 
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
........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_misdn.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_misdn.c?view=diff&rev=114613&r1=114612&r2=114613
==============================================================================
--- branches/1.6.0/channels/chan_misdn.c (original)
+++ branches/1.6.0/channels/chan_misdn.c Thu Apr 24 11:48:05 2008
@@ -2533,9 +2533,11 @@
 			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: