diff options
author | zuul <zuul@gerrit.asterisk.org> | 2016-11-16 16:48:09 -0600 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-11-16 16:48:09 -0600 |
commit | d0474f632208e7bc160c0d04fc65d8d5e6b6c7e3 (patch) | |
tree | 2a3ccd5c41a665ab737b0983ee30878928802b79 /include/asterisk | |
parent | 732ab6a045e1d4de5bf7a8256376dbe24406eed6 (diff) | |
parent | a72ef381135639c62d97b9f6b1964403c9c92b78 (diff) |
Merge "res/ari/resource_bridges: Add the ability to manipulate the video source"
Diffstat (limited to 'include/asterisk')
-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 acea2f01f..61cecbdd6 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); }; /*! |