[asterisk-commits] oej: branch oej/rana-dtmf-rtp-duration-1.6.0 r332025 - in /team/oej/rana-dtmf...

[SVN commits to the Asterisk project]

Author: oej
Date: Tue Aug 16 10:04:50 2011
New Revision: 332025

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=332025
Log:
Formatting fixes 

Modified:
    team/oej/rana-dtmf-rtp-duration-1.6.0/channels/chan_local.c
    team/oej/rana-dtmf-rtp-duration-1.6.0/channels/chan_mgcp.c
    team/oej/rana-dtmf-rtp-duration-1.6.0/channels/chan_sip.c
    team/oej/rana-dtmf-rtp-duration-1.6.0/main/channel.c

Modified: team/oej/rana-dtmf-rtp-duration-1.6.0/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/rana-dtmf-rtp-duration-1.6.0/channels/chan_local.c?view=diff&rev=332025&r1=332024&r2=332025
==============================================================================
--- team/oej/rana-dtmf-rtp-duration-1.6.0/channels/chan_local.c (original)
+++ team/oej/rana-dtmf-rtp-duration-1.6.0/channels/chan_local.c Tue Aug 16 10:04:50 2011
@@ -413,15 +413,17 @@
 	struct ast_frame f = { AST_FRAME_DTMF_CONTINUE, };
 	int isoutbound;
 
-	if (!p)
-		return -1;
+	if (!p) {
+		return -1;
+	}
 
 	ast_mutex_lock(&p->lock);
 	isoutbound = IS_OUTBOUND(ast, p);
 	f.subclass = digit;
 	f.len = duration;
-	if (!(res = local_queue_frame(p, isoutbound, &f, ast, 0)))
-		ast_mutex_unlock(&p->lock);
+	if (!(res = local_queue_frame(p, isoutbound, &f, ast, 0))) {
+		ast_mutex_unlock(&p->lock);
+	}
 
 	return res;
 }

Modified: team/oej/rana-dtmf-rtp-duration-1.6.0/channels/chan_mgcp.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/rana-dtmf-rtp-duration-1.6.0/channels/chan_mgcp.c?view=diff&rev=332025&r1=332024&r2=332025
==============================================================================
--- team/oej/rana-dtmf-rtp-duration-1.6.0/channels/chan_mgcp.c (original)
+++ team/oej/rana-dtmf-rtp-duration-1.6.0/channels/chan_mgcp.c Tue Aug 16 10:04:50 2011
@@ -1340,8 +1340,8 @@
 	ast_mutex_lock(&sub->lock);
 
 	if (p->dtmfmode & MGCP_DTMF_RFC2833) {
-		ast_debug(1, "DTMF continue using RFC2833\n");
-                ast_rtp_senddigit_continue(sub->rtp, digit, duration);
+		ast_debug(4, "DTMF continue using RFC2833\n");
+		ast_rtp_senddigit_continue(sub->rtp, digit, duration);
 	}
 	ast_mutex_unlock(&sub->lock);
 

Modified: team/oej/rana-dtmf-rtp-duration-1.6.0/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/rana-dtmf-rtp-duration-1.6.0/channels/chan_sip.c?view=diff&rev=332025&r1=332024&r2=332025
==============================================================================
--- team/oej/rana-dtmf-rtp-duration-1.6.0/channels/chan_sip.c (original)
+++ team/oej/rana-dtmf-rtp-duration-1.6.0/channels/chan_sip.c Tue Aug 16 10:04:50 2011
@@ -5511,8 +5511,9 @@
 	sip_pvt_lock(p);
 	switch (ast_test_flag(&p->flags[0], SIP_DTMF)) {
 	case SIP_DTMF_RFC2833:
-		if (p->rtp)
+		if (p->rtp) {
 			ast_rtp_senddigit_continue(p->rtp, digit, duration);
+		}
 		break;
 	}
 	sip_pvt_unlock(p);

Modified: team/oej/rana-dtmf-rtp-duration-1.6.0/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/rana-dtmf-rtp-duration-1.6.0/main/channel.c?view=diff&rev=332025&r1=332024&r2=332025
==============================================================================
--- team/oej/rana-dtmf-rtp-duration-1.6.0/main/channel.c (original)
+++ team/oej/rana-dtmf-rtp-duration-1.6.0/main/channel.c Tue Aug 16 10:04:50 2011
@@ -3496,7 +3496,7 @@
 			if (old_frame != fr)
 				f = fr;
 		}
-		ast_log(LOG_DEBUG, "---Continue FRAME received, forwarding to channel %s", chan->name);
+		ast_log(LOG_DEBUG, "---Continue FRAME received, forwarding to channel %s\n", chan->name);
 		// Skip manager for continue events (at least for now)
 		//send_dtmf_event(chan, "Sent", fr->subclass, "Yes", "No");
 		ast_clear_flag(chan, AST_FLAG_BLOCKING);