Modified: freeswitch/trunk/patches/MODOPAL-10-svn.diff (14488 => 14489)

--- freeswitch/trunk/patches/MODOPAL-10-svn.diff	2009-08-11 15:13:51 UTC (rev 14488)
+++ freeswitch/trunk/patches/MODOPAL-10-svn.diff	2009-08-11 15:14:34 UTC (rev 14489)
@@ -1,8 +1,35 @@
-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	(working copy)
-@@ -509,7 +509,7 @@
+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 @@
  }
  
  
@@ -11,7 +38,7 @@
  {
      FSManager & mgr = (FSManager &) GetManager();
      switch_core_session_t *fsSession = switch_core_session_request(mgr.GetSwitchInterface(), 
-@@ -524,7 +524,7 @@
+@@ -524,7 +524,7 @@
          return NULL;
      }
  
@@ -20,7 +47,7 @@
  }
  
  
-@@ -557,8 +557,8 @@
+@@ -557,8 +557,8 @@
  ///////////////////////////////////////////////////////////////////////
  
  
@@ -31,30 +58,3 @@
    , m_endpoint(endpoint)
    , m_fsSession(fsSession)
    , 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();