diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2016-11-16 16:48:14 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-11-16 16:48:14 -0600 |
| commit | b745c326c2d59a4ac29d62f081e248320a276f82 (patch) | |
| tree | 158f967954ecddae3f7582fa7359d84af72f59cc /include | |
| parent | 4c1b9fbefec311f8d01d34d6c46f9d25b0e09f44 (diff) | |
| parent | d23b4af4779675589c8a3ce39c0f4b80d0432d5c (diff) | |
Merge "res/ari/resource_bridges: Add the ability to manipulate the video source" into 13
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/bridge.h | 9 | ||||
| -rw-r--r-- | include/asterisk/stasis_bridges.h | 4 |
2 files changed, 13 insertions, 0 deletions
diff --git a/include/asterisk/bridge.h b/include/asterisk/bridge.h index 30ac0953c..0d4376735 100644 --- a/include/asterisk/bridge.h +++ b/include/asterisk/bridge.h @@ -903,6 +903,15 @@ int ast_bridge_is_video_src(struct ast_bridge *bridge, struct ast_channel *chan) */ void ast_bridge_remove_video_src(struct ast_bridge *bridge, struct ast_channel *chan); +/*! + * \brief Converts an enum representation of a bridge video mode to string + * + * \param video_mode The video mode + * + * \retval A string representation of \c video_mode + */ +const char *ast_bridge_video_mode_to_string(enum ast_bridge_video_mode_type video_mode); + enum ast_transfer_result { /*! The transfer completed successfully */ AST_BRIDGE_TRANSFER_SUCCESS, diff --git a/include/asterisk/stasis_bridges.h b/include/asterisk/stasis_bridges.h index d549e4620..05d356cc2 100644 --- a/include/asterisk/stasis_bridges.h +++ b/include/asterisk/stasis_bridges.h @@ -58,6 +58,10 @@ struct ast_bridge_snapshot { unsigned int num_channels; /*! Number of active channels in the bridge. */ unsigned int num_active; + /*! The video mode of the bridge */ + enum ast_bridge_video_mode_type video_mode; + /*! Unique ID of the channel providing video, if one exists */ + AST_STRING_FIELD_EXTENDED(video_source_id); }; /*! |