diff options
| author | Kinsey Moore <kmoore@digium.com> | 2013-06-13 13:46:40 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2013-06-13 13:46:40 +0000 |
| commit | b51b437bf3d47111451117dc0a04faa6356ba30c (patch) | |
| tree | fe2e14e54829aaaa2ddc7b14dc0041badf36a5cb /include | |
| parent | 4f84e48028b8f21babd26b7f0b8c1d375f1c356c (diff) | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/_private.h | 6 | ||||
| -rw-r--r-- | include/asterisk/cel.h | 2 | ||||
| -rw-r--r-- | include/asterisk/parking.h | 12 |
3 files changed, 8 insertions, 12 deletions
diff --git a/include/asterisk/_private.h b/include/asterisk/_private.h index 1d0844924..c58c51e4f 100644 --- a/include/asterisk/_private.h +++ b/include/asterisk/_private.h @@ -134,4 +134,10 @@ int ast_format_list_init(void); /*! \brief initializes the rtp engine arrays */ int ast_rtp_engine_init(void); + +/*! + * \brief initializes the rtp engine arrays + * \since 12.0.0 + */ +int ast_parking_stasis_init(void); #endif /* _ASTERISK__PRIVATE_H */ diff --git a/include/asterisk/cel.h b/include/asterisk/cel.h index 25a3a4af1..034a96ab9 100644 --- a/include/asterisk/cel.h +++ b/include/asterisk/cel.h @@ -103,6 +103,8 @@ enum ast_cel_event_type { AST_CEL_PICKUP = 24, /*! \brief this call was forwarded somewhere else */ AST_CEL_FORWARD = 25, + /*! \brief a bridge turned into a conference and will be treated as such until it is torn down */ + AST_CEL_BRIDGE_TO_CONF = 26, }; /*! diff --git a/include/asterisk/parking.h b/include/asterisk/parking.h index 176eddb04..9418916a2 100644 --- a/include/asterisk/parking.h +++ b/include/asterisk/parking.h @@ -78,18 +78,6 @@ struct ast_parked_call_payload *ast_parked_call_payload_create(enum ast_parked_c unsigned int parkingspace, unsigned long int timeout, unsigned long int duration); /*! - * \brief initialize parking stasis types - * \since 12 - */ -void ast_parking_stasis_init(void); - -/*! - * \brief disable parking stasis types - * \since 12 - */ -void ast_parking_stasis_disable(void); - -/*! * \brief accessor for the parking stasis topic * \since 12 * |