[asterisk-commits] jrose: branch jrose/bridge_projects r381504 - in /team/jrose/bridge_projects:...

[SVN commits to the Asterisk project]

Author: jrose
Date: Thu Feb 14 14:46:41 2013
New Revision: 381504

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=381504
Log:
bridging: interval hooks: respond to review from 2:33 Feb 14

Modified:
    team/jrose/bridge_projects/apps/app_dial.c
    team/jrose/bridge_projects/bridges/bridge_builtin_interval_features.c
    team/jrose/bridge_projects/main/bridging.c

Modified: team/jrose/bridge_projects/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/team/jrose/bridge_projects/apps/app_dial.c?view=diff&rev=381504&r1=381503&r2=381504
==============================================================================
--- team/jrose/bridge_projects/apps/app_dial.c (original)
+++ team/jrose/bridge_projects/apps/app_dial.c Thu Feb 14 14:46:41 2013
@@ -267,7 +267,7 @@
 						<variable name="LIMIT_CONNECT_FILE">
 							<value name="filename"/>
 							<para>If specified, <replaceable>filename</replaceable> specifies the sound prompt to play when the call begins.
-							If set to 'timeleft', the time remaining will be announced.</para>
+							If not set, the time remaining will be announced.</para>
 						</variable>
 						<variable name="LIMIT_WARNING_FILE">
 							<value name="filename"/>

Modified: team/jrose/bridge_projects/bridges/bridge_builtin_interval_features.c
URL: http://svnview.digium.com/svn/asterisk/team/jrose/bridge_projects/bridges/bridge_builtin_interval_features.c?view=diff&rev=381504&r1=381503&r2=381504
==============================================================================
--- team/jrose/bridge_projects/bridges/bridge_builtin_interval_features.c (original)
+++ team/jrose/bridge_projects/bridges/bridge_builtin_interval_features.c Thu Feb 14 14:46:41 2013
@@ -66,11 +66,9 @@
 	default:
 		break;
 	}
+	ao2_unlock(bridge_channel);
 
 	ast_test_suite_event_notify("BRIDGE_TIMELIMIT", "Channel1: %s", ast_channel_name(bridge_channel->chan));
-
-	ao2_unlock(bridge_channel);
-
 	return -1;
 }
 
@@ -99,24 +97,18 @@
 				ast_channel_language(bridge_channel->chan), NULL);
 			ast_stream_and_wait(bridge_channel->chan, "queue-minutes", AST_DIGIT_NONE);
 		}
-
 		if (sec) {
 			ast_say_number(bridge_channel->chan, sec, AST_DIGIT_NONE,
 				ast_channel_language(bridge_channel->chan), NULL);
 			ast_stream_and_wait(bridge_channel->chan, "queue-seconds", AST_DIGIT_NONE);
 		}
-
-		/* It may be necessary to resume music on hold after we finish playing the announcment. */
-		if (ast_test_flag(ast_channel_flags(bridge_channel->chan), AST_FLAG_MOH)) {
-			ast_moh_start(bridge_channel->chan, NULL, NULL);
-		}
 	} else {
 		ast_stream_and_wait(bridge_channel->chan, file, AST_DIGIT_NONE);
-
-		/* It may be necessary to resume music on hold after we play the sound file. */
-		if (ast_test_flag(ast_channel_flags(bridge_channel->chan), AST_FLAG_MOH)) {
-			ast_moh_start(bridge_channel->chan, NULL, NULL);
-		}
+	}
+
+	/* It may be necessary to resume music on hold after we finish playing the announcment. */
+	if (ast_test_flag(ast_channel_flags(bridge_channel->chan), AST_FLAG_MOH)) {
+		ast_moh_start(bridge_channel->chan, NULL, NULL);
 	}
 }
 

Modified: team/jrose/bridge_projects/main/bridging.c
URL: http://svnview.digium.com/svn/asterisk/team/jrose/bridge_projects/main/bridging.c?view=diff&rev=381504&r1=381503&r2=381504
==============================================================================
--- team/jrose/bridge_projects/main/bridging.c (original)
+++ team/jrose/bridge_projects/main/bridging.c Thu Feb 14 14:46:41 2013
@@ -2042,7 +2042,7 @@
 
 int ast_bridge_features_limits_construct(struct ast_bridge_features_limits *limits)
 {
-	memset(limits, 0, sizeof(limits));
+	memset(limits, 0, sizeof(*limits));
 
 	if (ast_string_field_init(limits, 256)) {
 		ast_free(limits);