update modopal-10 patch

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14489 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Brian West 2009-08-11 15:14:34 +00:00
parent 2dae4c4cef
commit 5e47bafdac

View File

@ -1,6 +1,33 @@
Index: src/mod/endpoints/mod_opal/mod_opal.h
===================================================================
--- src/mod/endpoints/mod_opal/mod_opal.h (revision 14477)
+++ src/mod/endpoints/mod_opal/mod_opal.h (working copy)
@@ -148,7 +148,10 @@
FSEndPoint(FSManager & manager);
virtual bool OnIncomingCall(OpalLocalConnection &);
- virtual OpalLocalConnection *CreateConnection(OpalCall &, void *);
+ virtual OpalLocalConnection *CreateConnection(OpalCall & call,
+ void * userData,
+ unsigned options,
+ OpalConnection::StringOptions * stringOptions);
};
@@ -181,7 +184,9 @@
FSEndPoint & endpoint,
switch_caller_profile_t *outbound_profile,
switch_core_session_t *fsSession,
- switch_channel_t *fsChannel);
+ switch_channel_t *fsChannel,
+ unsigned options,
+ OpalConnection::StringOptions * stringOptions);
virtual bool OnIncoming();
virtual void OnReleased();
Index: src/mod/endpoints/mod_opal/mod_opal.cpp Index: src/mod/endpoints/mod_opal/mod_opal.cpp
=================================================================== ===================================================================
--- src/mod/endpoints/mod_opal/mod_opal.cpp (revision 13502) --- src/mod/endpoints/mod_opal/mod_opal.cpp (revision 14477)
+++ src/mod/endpoints/mod_opal/mod_opal.cpp (working copy) +++ src/mod/endpoints/mod_opal/mod_opal.cpp (working copy)
@@ -509,7 +509,7 @@ @@ -509,7 +509,7 @@
} }
@ -31,30 +58,3 @@ Index: src/mod/endpoints/mod_opal/mod_opal.cpp
, m_endpoint(endpoint) , m_endpoint(endpoint)
, m_fsSession(fsSession) , m_fsSession(fsSession)
, m_fsChannel(fsChannel) , m_fsChannel(fsChannel)
Index: src/mod/endpoints/mod_opal/mod_opal.h
===================================================================
--- src/mod/endpoints/mod_opal/mod_opal.h (revision 13502)
+++ src/mod/endpoints/mod_opal/mod_opal.h (working copy)
@@ -148,7 +148,10 @@
FSEndPoint(FSManager & manager);
virtual bool OnIncomingCall(OpalLocalConnection &);
- virtual OpalLocalConnection *CreateConnection(OpalCall &, void *);
+ virtual OpalLocalConnection *CreateConnection(OpalCall & call,
+ void * userData,
+ unsigned options,
+ OpalConnection::StringOptions * stringOptions);
};
@@ -181,7 +184,9 @@
FSEndPoint & endpoint,
switch_caller_profile_t *outbound_profile,
switch_core_session_t *fsSession,
- switch_channel_t *fsChannel);
+ switch_channel_t *fsChannel,
+ unsigned options,
+ OpalConnection::StringOptions * stringOptions);
virtual bool OnIncoming();
virtual void OnReleased();