From: Eliot Gable <egable@gmail.com>
Date: Thu, 19 Nov 2009 15:32:27 +0000 (+0000)
Subject: Fixed compile issues with latest Opal
X-Git-Tag: v1.0.6~1353
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e08ced278777d68a52e434d41936ed439fb3705;p=thirdparty%2Ffreeswitch.git

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 96d2fb3f7c..ce82a56cda 100644
--- 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)
 }
 
 
-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 @@ OpalLocalConnection *FSEndPoint::CreateConnection(OpalCall & call, void *userDat
         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 @@ PBoolean FSCall::OnSetUp(OpalConnection & connection)
 ///////////////////////////////////////////////////////////////////////
 
 
-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_status_t FSMediaStream::read_frame(switch_frame_t **frame, switch_io_flag
             switch_cond_next();
         }
         if (CheckPatchAndLock()) {
-            GetPatch()->OnPatchStart();
+            GetPatch()->OnStartMediaPatch();
             m_callOnStart = false;
             UnlockReadWrite();
         } else {
@@ -1415,7 +1415,7 @@ switch_status_t FSMediaStream::write_frame(const switch_frame_t *frame, switch_i
 
     if (m_callOnStart) {
         if (CheckPatchAndLock()) {
-            GetPatch()->OnPatchStart();
+            GetPatch()->OnStartMediaPatch();
             m_callOnStart = false;
             UnlockReadWrite();
         } else {
diff --git a/src/mod/endpoints/mod_opal/mod_opal.h b/src/mod/endpoints/mod_opal/mod_opal.h
index da0d2509c3..6364dc2d68 100644
--- 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);