[svn-commits] file: branch file/rtp_engine r129701 - in /team/file/rtp_engine: include/aste...

[SVN commits to the Digium repositories]

Author: file
Date: Thu Jul 10 14:22:48 2008
New Revision: 129701

URL: http://svn.digium.com/view/asterisk?view=rev&rev=129701
Log:
Add a dummy bridge function for now.

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

Modified: team/file/rtp_engine/include/asterisk/rtp_engine.h
URL: http://svn.digium.com/view/asterisk/team/file/rtp_engine/include/asterisk/rtp_engine.h?view=diff&rev=129701&r1=129700&r2=129701
==============================================================================
--- team/file/rtp_engine/include/asterisk/rtp_engine.h (original)
+++ team/file/rtp_engine/include/asterisk/rtp_engine.h Thu Jul 10 14:22:48 2008
@@ -91,7 +91,6 @@
 	int (*qos)(struct ast_rtp_instance *instance, int tos, int cos, const char *desc);              /*!< Callback for setting QoS parameters on the RTP session */
 	int (*fd)(struct ast_rtp_instance *instance, int rtcp);                                         /*!< Callback for retrieving a file descriptor for RTP or RTCP */
 	struct ast_frame *(*read)(struct ast_rtp_instance *instance, int rtcp);                         /*!< Callback for reading a frame in */
-	enum ast_bridge_result (*bridge)(struct ast_rtp_instance *instance0, struct ast_rtp_instance *instance1); /*!< Callback for bridging two RTP instances together */
 	AST_RWLIST_ENTRY(ast_rtp_engine) entry;                                                         /*!< Linked list information */
 };
 
@@ -264,6 +263,9 @@
 /*! \brief Get the file descriptor for an RTP session (or RTCP) */
 int ast_rtp_instance_fd(struct ast_rtp_instance *instance, int rtcp);
 
+/*! \brief Bridge two channels that use RTP instances */
+enum ast_bridge_result ast_rtp_instance_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags, struct ast_frame **fo, struct ast_channel **rc, int timeoutms);
+
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

Modified: team/file/rtp_engine/main/rtp_engine.c
URL: http://svn.digium.com/view/asterisk/team/file/rtp_engine/main/rtp_engine.c?view=diff&rev=129701&r1=129700&r2=129701
==============================================================================
--- team/file/rtp_engine/main/rtp_engine.c (original)
+++ team/file/rtp_engine/main/rtp_engine.c Thu Jul 10 14:22:48 2008
@@ -559,3 +559,8 @@
 {
 	return instance->engine->fd ? instance->engine->fd(instance, rtcp) : -1;
 }
+
+enum ast_bridge_result ast_rtp_instance_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags, struct ast_frame **fo, struct ast_channel **rc, int timeoutms)
+{
+	return AST_BRIDGE_FAILED;
+}