Revision

15545

Author

egable

Date

2009-11-19 09:32:27 -0600 (Thu, 19 Nov 2009)

Log Message

Fixed compile issues with latest Opal

Modified Paths

• freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp
• freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h

Diff

--- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp	2009-11-19 15:26:13 UTC (rev 15544)
+++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp	2009-11-19 15:32:27 UTC (rev 15545)
@@ -509,7 +509,7 @@
 }
 
 
-OpalLocalConnection *FSEndPoint::CreateConnection(OpalCall & call, void *userData)
+OpalLocalConnection *FSEndPoint::CreateConnection(OpalCall & call, void *userData, unsigned options, OpalConnection::StringOptions* stringOptions)
 {
     FSManager & mgr = (FSManager &) GetManager();
     switch_core_session_t *fsSession = switch_core_session_request(mgr.GetSwitchInterface(), 
@@ -524,7 +524,7 @@
         return NULL;
     }
 
-    return new FSConnection(call, *this, (switch_caller_profile_t *)userData, fsSession, fsChannel);
+    return new FSConnection(call, *this, userData, options, stringOptions, (switch_caller_profile_t *)userData, fsSession, fsChannel);
 }
 
 
@@ -557,8 +557,8 @@
 ///////////////////////////////////////////////////////////////////////
 
 
-FSConnection::FSConnection(OpalCall & call, FSEndPoint & endpoint, switch_caller_profile_t *outbound_profile, switch_core_session_t *fsSession, switch_channel_t *fsChannel)
-  : OpalLocalConnection(call, endpoint, NULL)
+FSConnection::FSConnection(OpalCall & call, FSEndPoint & endpoint, void* userData, unsigned options, OpalConnection::StringOptions* stringOptions, switch_caller_profile_t *outbound_profile, switch_core_session_t *fsSession, switch_channel_t *fsChannel)
+  : OpalLocalConnection(call, endpoint, userData, options, stringOptions)
   , m_endpoint(endpoint)
   , m_fsSession(fsSession)
   , m_fsChannel(fsChannel)
@@ -1293,7 +1293,7 @@
             switch_cond_next();
         }
         if (CheckPatchAndLock()) {
-            GetPatch()->OnPatchStart();
+            GetPatch()->OnStartMediaPatch();
             m_callOnStart = false;
             UnlockReadWrite();
         } else {
@@ -1415,7 +1415,7 @@
 
     if (m_callOnStart) {
         if (CheckPatchAndLock()) {
-            GetPatch()->OnPatchStart();
+            GetPatch()->OnStartMediaPatch();
             m_callOnStart = false;
             UnlockReadWrite();
         } else {

--- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h	2009-11-19 15:26:13 UTC (rev 15544)
+++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.h	2009-11-19 15:32:27 UTC (rev 15545)
@@ -148,7 +148,7 @@
     FSEndPoint(FSManager & manager);
 
     virtual bool OnIncomingCall(OpalLocalConnection &);
-    virtual OpalLocalConnection *CreateConnection(OpalCall &, void *);
+    virtual OpalLocalConnection *CreateConnection(OpalCall & call, void * userData, unsigned options, OpalConnection::StringOptions* stringOptions);
 };
 
 
@@ -179,6 +179,9 @@
   public:
     FSConnection(OpalCall & call,
                  FSEndPoint & endpoint,
+                 void* userData,
+                 unsigned options,
+                 OpalConnection::StringOptions* stringOptions,
                  switch_caller_profile_t *outbound_profile,
                  switch_core_session_t *fsSession,
                  switch_channel_t *fsChannel);