this was added to tree

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15579 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/patches/MODOPAL-10-svn.diff b/patches/MODOPAL-10-svn.diff
deleted file mode 100644 (file)
index 4247e3f..0000000
--- a/patches/MODOPAL-10-svn.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-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
-===================================================================
---- src/mod/endpoints/mod_opal/mod_opal.cpp    (revision 14477)
-+++ src/mod/endpoints/mod_opal/mod_opal.cpp    (working copy)
-@@ -509,7 +509,7 @@
- }\r
- \r
- \r
--OpalLocalConnection *FSEndPoint::CreateConnection(OpalCall & call, void *userData)\r
-+OpalLocalConnection *FSEndPoint::CreateConnection(OpalCall & call, void * userData, unsigned options, OpalConnection::StringOptions * stringOptions)\r
- {\r
-     FSManager & mgr = (FSManager &) GetManager();\r
-     switch_core_session_t *fsSession = switch_core_session_request(mgr.GetSwitchInterface(), \r
-@@ -524,7 +524,7 @@
-         return NULL;\r
-     }\r
- \r
--    return new FSConnection(call, *this, (switch_caller_profile_t *)userData, fsSession, fsChannel);\r
-+    return new FSConnection(call, *this, (switch_caller_profile_t *)userData, fsSession, fsChannel, options, stringOptions);\r
- }\r
- \r
- \r
-@@ -557,8 +557,8 @@
- ///////////////////////////////////////////////////////////////////////\r
- \r
- \r
--FSConnection::FSConnection(OpalCall & call, FSEndPoint & endpoint, switch_caller_profile_t *outbound_profile, switch_core_session_t *fsSession, switch_channel_t *fsChannel)\r
--  : OpalLocalConnection(call, endpoint, NULL)\r
-+FSConnection::FSConnection(OpalCall & call, FSEndPoint & endpoint, switch_caller_profile_t *outbound_profile, switch_core_session_t *fsSession, switch_channel_t *fsChannel, unsigned options, OpalConnection::StringOptions * stringOptions)\r
-+  : OpalLocalConnection(call, endpoint, NULL, options, stringOptions)\r
-   , m_endpoint(endpoint)\r
-   , m_fsSession(fsSession)\r
-   , m_fsChannel(fsChannel)\r