kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed compile issues with latest Opal 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15545 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Eliot Gable 2009-11-19 15:32:27 +00:00
parent da0d7771c3
commit 5e08ced278
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mod/endpoints/mod_opal/mod_opal.cpp
View File

@ -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(); FSManager & mgr = (FSManager &) GetManager();
switch_core_session_t *fsSession = switch_core_session_request(mgr.GetSwitchInterface(), 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 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) 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, NULL) : OpalLocalConnection(call, endpoint, userData, options, stringOptions)
, m_endpoint(endpoint) , m_endpoint(endpoint)
, m_fsSession(fsSession) , m_fsSession(fsSession)
, m_fsChannel(fsChannel) , m_fsChannel(fsChannel)
@ -1293,7 +1293,7 @@ switch_status_t FSMediaStream::read_frame(switch_frame_t **frame, switch_io_flag
switch_cond_next(); switch_cond_next();
} }
if (CheckPatchAndLock()) { if (CheckPatchAndLock()) {
GetPatch()->OnPatchStart(); GetPatch()->OnStartMediaPatch();
m_callOnStart = false; m_callOnStart = false;
UnlockReadWrite(); UnlockReadWrite();
} else { } else {
@ -1415,7 +1415,7 @@ switch_status_t FSMediaStream::write_frame(const switch_frame_t *frame, switch_i
if (m_callOnStart) { if (m_callOnStart) {
if (CheckPatchAndLock()) { if (CheckPatchAndLock()) {
GetPatch()->OnPatchStart(); GetPatch()->OnStartMediaPatch();
m_callOnStart = false; m_callOnStart = false;
UnlockReadWrite(); UnlockReadWrite();
} else { } else {

5
src/mod/endpoints/mod_opal/mod_opal.h
View File

@ -148,7 +148,7 @@ class FSEndPoint:public OpalLocalEndPoint {
FSEndPoint(FSManager & manager); FSEndPoint(FSManager & manager);
virtual bool OnIncomingCall(OpalLocalConnection &); 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: public:
FSConnection(OpalCall & call, FSConnection(OpalCall & call,
FSEndPoint & endpoint, FSEndPoint & endpoint,
void* userData,
unsigned options,
OpalConnection::StringOptions* stringOptions,
switch_caller_profile_t *outbound_profile, switch_caller_profile_t *outbound_profile,
switch_core_session_t *fsSession, switch_core_session_t *fsSession,
switch_channel_t *fsChannel); switch_channel_t *fsChannel);