]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
update modopal-10 patch
authorBrian West <brian@freeswitch.org>
Tue, 11 Aug 2009 15:14:34 +0000 (15:14 +0000)
committerBrian West <brian@freeswitch.org>
Tue, 11 Aug 2009 15:14:34 +0000 (15:14 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14489 d0543943-73ff-0310-b7d9-9358b9ac24b2

patches/MODOPAL-10-svn.diff

index 6849877ec8c427b4e82d46411117b37c62c800c2..4247e3f67dcfadefc10a132a0f9b401613ef67fc 100644 (file)
@@ -1,8 +1,35 @@
-Index: src/mod/endpoints/mod_opal/mod_opal.cpp\r
-===================================================================\r
---- src/mod/endpoints/mod_opal/mod_opal.cpp    (revision 13502)\r
-+++ src/mod/endpoints/mod_opal/mod_opal.cpp    (working copy)\r
-@@ -509,7 +509,7 @@\r
+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
@@ -11,7 +38,7 @@ Index: src/mod/endpoints/mod_opal/mod_opal.cpp
  {\r
      FSManager & mgr = (FSManager &) GetManager();\r
      switch_core_session_t *fsSession = switch_core_session_request(mgr.GetSwitchInterface(), \r
-@@ -524,7 +524,7 @@\r
+@@ -524,7 +524,7 @@
          return NULL;\r
      }\r
  \r
@@ -20,7 +47,7 @@ Index: src/mod/endpoints/mod_opal/mod_opal.cpp
  }\r
  \r
  \r
-@@ -557,8 +557,8 @@\r
+@@ -557,8 +557,8 @@
  ///////////////////////////////////////////////////////////////////////\r
  \r
  \r
@@ -31,30 +58,3 @@ Index: src/mod/endpoints/mod_opal/mod_opal.cpp
    , m_endpoint(endpoint)\r
    , m_fsSession(fsSession)\r
    , m_fsChannel(fsChannel)\r
-Index: src/mod/endpoints/mod_opal/mod_opal.h\r
-===================================================================\r
---- src/mod/endpoints/mod_opal/mod_opal.h      (revision 13502)\r
-+++ src/mod/endpoints/mod_opal/mod_opal.h      (working copy)\r
-@@ -148,7 +148,10 @@\r
-     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 @@\r
-                  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();