Author: derek Date: Tue Apr 17 19:08:18 2007 New Revision: 245 Modified: sofaswitch/trunk/voip/mymanager.cxx sofaswitch/trunk/voip/mymanager.h sofaswitch/trunk/voip/udpconnection.cxx Log: patches to bring sofa voip into line with the current opal CVS. Modified: sofaswitch/trunk/voip/mymanager.cxx ============================================================================== --- sofaswitch/trunk/voip/mymanager.cxx (original) +++ sofaswitch/trunk/voip/mymanager.cxx Tue Apr 17 19:08:18 2007 @@ -894,25 +894,7 @@ delete jCall; } -BOOL MyManager::OnIncomingConnection(OpalConnection & connection) -{ - return OnIncomingConnection(connection, 0); -} - -BOOL MyManager::OnIncomingConnection(OpalConnection & connection, - unsigned options) -{ - return OnIncomingConnection(connection, options, NULL); -} - -BOOL MyManager::OnIncomingConnection(OpalConnection & connection, - unsigned options, - OpalConnection::StringOptions *stringOptions) -{ - PTRACE(3, "Incoming connection from " << connection.GetRemotePartyName()); - return OpalManager::OnIncomingConnection(connection, options, stringOptions); -} OpalConnection::AnswerCallResponse MyManager::OnAnswerCall(OpalConnection & connection, Modified: sofaswitch/trunk/voip/mymanager.h ============================================================================== --- sofaswitch/trunk/voip/mymanager.h (original) +++ sofaswitch/trunk/voip/mymanager.h Tue Apr 17 19:08:18 2007 @@ -76,54 +76,6 @@ /**Where we sit, while waiting for commands & events */ void Main(PArgList & args); - /**Call back for answering an incoming call. - This function is used for an application to control the answering of - incoming calls. - - If TRUE is returned then the connection continues. If FALSE then the - connection is aborted. - - Note this function should not block for any length of time. If the - decision to answer the call may take some time eg waiting for a user to - pick up the phone, then AnswerCallPending or AnswerCallDeferred should - be returned. - - If an application overrides this function, it should generally call the - ancestor version to complete calls. Unless the application completely - takes over that responsibility. Generally, an application would only - intercept this function if it wishes to do some form of logging. For - this you can obtain the name of the caller by using the function - OpalConnection::GetRemotePartyName(). - - The default behaviour is to call OnRouteConnection to determine a - B party for the connection. - - If the call associated with the incoming call already had two parties - and this connection is a third party for a conference call then - AnswerCallNow is returned as a B party is not required. - */ - virtual BOOL OnIncomingConnection( - OpalConnection & connection, ///< Connection that is calling - unsigned options, ///< options for new connection (can't use default as overrides will fail) - OpalConnection::StringOptions * stringOptions///< Used for specifiy local party name etc. NULL is a valid value. - ); - - /**Call back for answering an incoming call, identical to above - This function is used for an application to control the answering of - incoming calls. - */ - virtual BOOL OnIncomingConnection( - OpalConnection & connection, ///< Connection that is calling - unsigned options ///< options for new connection (can't use default as overrides will fail) - ); - - /**Call back for answering an incoming call, identical to above - This function is used for an application to control the answering of - incoming calls. - */ - virtual BOOL OnIncomingConnection( - OpalConnection & connection ///< Connection that is calling - ); /**A call has been established, and now is running with media in both directions */ virtual void OnEstablishedCall( Modified: sofaswitch/trunk/voip/udpconnection.cxx ============================================================================== --- sofaswitch/trunk/voip/udpconnection.cxx (original) +++ sofaswitch/trunk/voip/udpconnection.cxx Tue Apr 17 19:08:18 2007 @@ -203,7 +203,7 @@ return NULL; PTRACE(3, "ZZZ\tCreate opal audio media stream for " << mediaFormat << " and source of " << isSource); - return new OpalAudioMediaStream(mediaFormat, sessionID, isSource, 2, soundChannel); + return new OpalAudioMediaStream(*this, mediaFormat, sessionID, isSource, 2, soundChannel); } void OpalUdpSsConnection::CloseMediaStreams()