Fixed compile issues with latest Opal

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

diff --git a/src/mod/endpoints/mod_opal/mod_opal.cpp b/src/mod/endpoints/mod_opal/mod_opal.cpp
index 96d2fb3f7c120ca398d6438a1058d33e213f7de5..ce82a56cdad7d4935c65fdd1557f9c0294e3763c 100644 (file)
--- a/src/mod/endpoints/mod_opal/mod_opal.cpp
+++ b/src/mod/endpoints/mod_opal/mod_opal.cpp
@@ -509,7 +509,7 @@ bool FSEndPoint::OnIncomingCall(OpalLocalConnection & connection)
 }\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 @@ OpalLocalConnection *FSEndPoint::CreateConnection(OpalCall & call, void *userDat
         return NULL;\r
     }\r
 \r
-    return new FSConnection(call, *this, (switch_caller_profile_t *)userData, fsSession, fsChannel);\r
+    return new FSConnection(call, *this, userData, options, stringOptions, (switch_caller_profile_t *)userData, fsSession, fsChannel);\r
 }\r
 \r
 \r
@@ -557,8 +557,8 @@ PBoolean FSCall::OnSetUp(OpalConnection & connection)
 ///////////////////////////////////////////////////////////////////////\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, void* userData, unsigned options, OpalConnection::StringOptions* stringOptions, switch_caller_profile_t *outbound_profile, switch_core_session_t *fsSession, switch_channel_t *fsChannel)\r
+  : OpalLocalConnection(call, endpoint, userData, options, stringOptions)\r
   , m_endpoint(endpoint)\r
   , m_fsSession(fsSession)\r
   , m_fsChannel(fsChannel)\r
@@ -1293,7 +1293,7 @@ switch_status_t FSMediaStream::read_frame(switch_frame_t **frame, switch_io_flag
             switch_cond_next();\r
         }\r
         if (CheckPatchAndLock()) {\r
-            GetPatch()->OnPatchStart();\r
+            GetPatch()->OnStartMediaPatch();\r
             m_callOnStart = false;\r
             UnlockReadWrite();\r
         } else {\r
@@ -1415,7 +1415,7 @@ switch_status_t FSMediaStream::write_frame(const switch_frame_t *frame, switch_i
 \r
     if (m_callOnStart) {\r
         if (CheckPatchAndLock()) {\r
-            GetPatch()->OnPatchStart();\r
+            GetPatch()->OnStartMediaPatch();\r
             m_callOnStart = false;\r
             UnlockReadWrite();\r
         } else {\r

diff --git a/src/mod/endpoints/mod_opal/mod_opal.h b/src/mod/endpoints/mod_opal/mod_opal.h
index da0d2509c31a2333d25406bdae2a12bc8939ee86..6364dc2d686349fb679ac448363b00f4a2763c65 100644 (file)
--- a/src/mod/endpoints/mod_opal/mod_opal.h
+++ b/src/mod/endpoints/mod_opal/mod_opal.h
@@ -148,7 +148,7 @@ class FSEndPoint:public OpalLocalEndPoint {
     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 @@ class FSConnection:public OpalLocalConnection {
   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);