kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 02:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert part of a change to the bridging API code

Browse Source 
The capabilities used in the bridging API are very different than the
ones used for formats. When the conversion was made expanding the bit
width of codecs, the bridging code was accidentally accosted in ways
that it didn't deserve.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@319920 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Terry Wilson
2011-05-19 23:28:13 +00:00
parent 3eaedb901c
commit 95bf6f2fc3
3 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/asterisk/bridging.h
View File

@@ -193,7 +193,7 @@ struct ast_bridge {
* This creates a simple two party bridge that will be destroyed once one of
* the channels hangs up.
*/
struct ast_bridge *ast_bridge_new(format_t capabilities, int flags);
struct ast_bridge *ast_bridge_new(enum ast_bridge_capability capabilities, int flags);
/*! \brief See if it is possible to create a bridge
*
@@ -211,7 +211,7 @@ struct ast_bridge *ast_bridge_new(format_t capabilities, int flags);
* This sees if it is possible to create a bridge capable of bridging two channels
* together.
*/
int ast_bridge_check(format_t capabilities);
int ast_bridge_check(enum ast_bridge_capability capabilities);
/*! \brief Destroy a bridge
*

2
include/asterisk/bridging_technology.h
View File

@@ -45,7 +45,7 @@ struct ast_bridge_technology {
/*! Unique name to this bridge technology */
const char *name;
/*! The capabilities that this bridge technology is capable of */
format_t capabilities;
int capabilities;
/*! Preference level that should be used when determining whether to use this bridge technology or not */
enum ast_bridge_preference preference;
/*! Callback for when a bridge is being created */