[svn-commits] file: branch file/bridging r66226 - in /team/file/bridging: include/asterisk/...

[svn-commits at lists.digium.com]

Author: file
Date: Sat May 26 14:41:36 2007
New Revision: 66226

URL: http://svn.digium.com/view/asterisk?view=rev&rev=66226
Log:
Add another API call for merging two bridges together. No code for it yet.

Modified:
    team/file/bridging/include/asterisk/bridging.h
    team/file/bridging/main/bridging.c

Modified: team/file/bridging/include/asterisk/bridging.h
URL: http://svn.digium.com/view/asterisk/team/file/bridging/include/asterisk/bridging.h?view=diff&rev=66226&r1=66225&r2=66226
==============================================================================
--- team/file/bridging/include/asterisk/bridging.h (original)
+++ team/file/bridging/include/asterisk/bridging.h Sat May 26 14:41:36 2007
@@ -143,6 +143,13 @@
  */
 int ast_bridge_change_phase(struct ast_bridge_channel *bridge_channel, enum ast_bridge_channel_phase new_phase);
 
+/*! \brief Merge two bridges together
+ * \param bridge0 First bridge
+ * \param bridge1 Second bridge
+ * \return Returns 0 on success, -1 on failure
+ */
+int ast_bridge_merge(struct ast_bridge *bridge0, struct ast_bridge *bridge1);
+
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

Modified: team/file/bridging/main/bridging.c
URL: http://svn.digium.com/view/asterisk/team/file/bridging/main/bridging.c?view=diff&rev=66226&r1=66225&r2=66226
==============================================================================
--- team/file/bridging/main/bridging.c (original)
+++ team/file/bridging/main/bridging.c Sat May 26 14:41:36 2007
@@ -619,3 +619,13 @@
 	bridge_channel->phase = new_phase;
 	return ast_cond_signal(&bridge_channel->cond);
 }
+
+/*! \brief Merge two bridges together
+ * \param bridge0 First bridge
+ * \param bridge1 Second bridge
+ * \return Returns 0 on success, -1 on failure
+ */
+int ast_bridge_merge(struct ast_bridge *bridge0, struct ast_bridge *bridge1)
+{
+	return -1;
+}