[svn-commits] murf: branch murf/bug7836 r48369 - /team/murf/bug7836/channels/chan_zap.c

[svn-commits at lists.digium.com]

Author: murf
Date: Sat Dec  9 15:53:19 2006
New Revision: 48369

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48369
Log:
stevens's patch has been applied

Modified:
    team/murf/bug7836/channels/chan_zap.c

Modified: team/murf/bug7836/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug7836/channels/chan_zap.c?view=diff&rev=48369&r1=48368&r2=48369
==============================================================================
--- team/murf/bug7836/channels/chan_zap.c (original)
+++ team/murf/bug7836/channels/chan_zap.c Sat Dec  9 15:53:19 2006
@@ -3749,8 +3749,11 @@
 		   stop if now if appropriate */
 		if (ast_bridged_channel(p->subs[SUB_THREEWAY].owner))
 			ast_queue_control(p->subs[SUB_THREEWAY].owner, AST_CONTROL_UNHOLD);
-		if (p->subs[SUB_THREEWAY].owner->_state == AST_STATE_RINGING) {
+		if (p->subs[SUB_REAL].owner->_state == AST_STATE_RINGING) {
 			ast_indicate(ast_bridged_channel(p->subs[SUB_REAL].owner), AST_CONTROL_RINGING);
+		}
+		if (p->subs[SUB_THREEWAY].owner->_state == AST_STATE_RING) {
+			tone_zone_play_tone(p->subs[SUB_THREEWAY].zfd, ZT_TONE_RINGTONE);
 		}
 		if (p->subs[SUB_REAL].owner->cdr) {
 			/* Move CDR from second channel to current one */
@@ -3774,8 +3777,12 @@
 		unalloc_sub(p, SUB_THREEWAY);
 	} else if (ast_bridged_channel(p->subs[SUB_THREEWAY].owner)) {
 		ast_queue_control(p->subs[SUB_REAL].owner, AST_CONTROL_UNHOLD);
-		if (p->subs[SUB_REAL].owner->_state == AST_STATE_RINGING)
+		if (p->subs[SUB_THREEWAY].owner->_state == AST_STATE_RINGING) {
 			ast_indicate(ast_bridged_channel(p->subs[SUB_THREEWAY].owner), AST_CONTROL_RINGING);
+		}
+		if (p->subs[SUB_REAL].owner->_state == AST_STATE_RING) {
+			tone_zone_play_tone(p->subs[SUB_REAL].zfd, ZT_TONE_RINGTONE);
+		}
 		if (p->subs[SUB_THREEWAY].owner->cdr) {
 			/* Move CDR from second channel to current one */
 			p->subs[SUB_REAL].owner->cdr =