From b51b437bf3d47111451117dc0a04faa6356ba30c Mon Sep 17 00:00:00 2001 From: Kinsey Moore Date: Thu, 13 Jun 2013 13:46:40 +0000 Subject: Refactor CEL bridge events on top of Stasis-Core This pulls bridge-related CEL event triggers out of the code in which they were residing and pulls them into cel.c where they are now triggered by changes in bridge snapshots. To get access to the Stasis-Core parking topic in cel.c, the Stasis-Core portions of parking init have been pulled into core Asterisk init. This also adds a new CEL event (AST_CEL_BRIDGE_TO_CONF) that indicates a two-party bridge has transitioned to a multi-party conference. The reverse cannot occur in CEL terms even though it may occur in actuality and two party bridges which receive a AST_CEL_BRIDGE_TO_CONF will be treated as multi-party conferences for the duration of the bridge. Review: https://reviewboard.asterisk.org/r/2563/ (closes issue ASTERISK-21564) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@391643 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- res/parking/parking_manager.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'res/parking') diff --git a/res/parking/parking_manager.c b/res/parking/parking_manager.c index 26a8b3171..444c5a54f 100644 --- a/res/parking/parking_manager.c +++ b/res/parking/parking_manager.c @@ -579,7 +579,6 @@ static void parking_event_cb(void *data, struct stasis_subscription *sub, struct static void parking_manager_enable_stasis(void) { - ast_parking_stasis_init(); if (!parking_sub) { parking_sub = stasis_subscribe(ast_parking_topic(), parking_event_cb, NULL); } @@ -599,7 +598,6 @@ int load_parking_manager(void) static void parking_manager_disable_stasis(void) { parking_sub = stasis_unsubscribe(parking_sub); - ast_parking_stasis_disable(); } void unload_parking_manager(void) -- cgit v1.2.3