[asterisk-commits] jrose: branch jrose/bridge_projects r383913 - /team/jrose/bridge_projects/res...

[SVN commits to the Asterisk project]

Author: jrose
Date: Tue Mar 26 11:46:57 2013
New Revision: 383913

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=383913
Log:
Adjust for changes to bridging

Modified:
    team/jrose/bridge_projects/res/parking/parking_controller.c

Modified: team/jrose/bridge_projects/res/parking/parking_controller.c
URL: http://svnview.digium.com/svn/asterisk/team/jrose/bridge_projects/res/parking/parking_controller.c?view=diff&rev=383913&r1=383912&r2=383913
==============================================================================
--- team/jrose/bridge_projects/res/parking/parking_controller.c (original)
+++ team/jrose/bridge_projects/res/parking/parking_controller.c Tue Mar 26 11:46:57 2013
@@ -40,8 +40,8 @@
 		return state->parking_bridge;
 	}
 
-	/* XXX Richard is going to change some things here. Name will be an argument */
-	lot_bridge = ast_bridge_new(AST_BRIDGE_CAPABILITY_HOLDING, AST_BRIDGE_FLAG_MERGE_INHIBIT_TO | AST_BRIDGE_FLAG_MERGE_INHIBIT_FROM);
+	/* XXX Richard has changed some things here. Need to implement subclass of bridge as part of the next phase */
+	lot_bridge = ast_bridge_base_new(AST_BRIDGE_CAPABILITY_HOLDING, AST_BRIDGE_FLAG_MERGE_INHIBIT_TO | AST_BRIDGE_FLAG_MERGE_INHIBIT_FROM);
 	if (!lot_bridge) {
 		return NULL;
 	}
@@ -91,7 +91,7 @@
 	if (user->resolution != PARK_UNSET) {
 		/* Abandon timeout since something else has resolved the parked user before we got to it. */
 		ao2_unlock(user);
-		return 0;
+		return -1;
 	}
 
 	user->resolution = PARK_TIMEOUT;
@@ -164,7 +164,7 @@
 	ao2_ref(user, +1);
 
 	if (ast_bridge_interval_hook(features, time_limit,
-		parking_duration_callback, user, parking_duration_cb_destroyer)) {
+		parking_duration_callback, user, parking_duration_cb_destroyer, 1)) {
 		ast_log(LOG_ERROR, "Failed to apply duration limits to the parking call.\n");
 	}
 }