Author: derek Date: Tue May 26 23:08:58 2009 New Revision: 444 Log: Fixes to bring it up to date with the current svn of opal&ptlib. Modified: sofaswitch/trunk/voip/mymanager.cxx sofaswitch/trunk/voip/mymanager.h sofaswitch/trunk/voip/udpconnection.cxx sofaswitch/trunk/voip/udpep.cxx Modified: sofaswitch/trunk/voip/mymanager.cxx ============================================================================== --- sofaswitch/trunk/voip/mymanager.cxx (original) +++ sofaswitch/trunk/voip/mymanager.cxx Tue May 26 23:08:58 2009 @@ -876,11 +876,11 @@ OpalManager::OnUserInputString(connection, value); } -OpalCall * MyManager::CreateCall() +#if 0 +OpalCall * MyManager::IncomingCreateCall() { PTRACE(3, "Manager\tCreate a call with any CallID"); - Comms *c; - c = voipCommsProvider.GetNextComms(); + Comms *c = voipCommsProvider.GetNextComms(); if (c == NULL) { PTRACE(3, "Failed to make a new node"); @@ -897,6 +897,8 @@ return frame; } +#endif + OpalCall * MyManager::CreateCall(void * userData) { PString remoteCont; Modified: sofaswitch/trunk/voip/mymanager.h ============================================================================== --- sofaswitch/trunk/voip/mymanager.h (original) +++ sofaswitch/trunk/voip/mymanager.h Tue May 26 23:08:58 2009 @@ -150,17 +150,19 @@ PString GetControllerId(); /**Create a call object. - This method allows an application to have the system create - desccendants of the OpalCall class. - - This method is used to handle incoming voip calls. */ - virtual OpalCall * CreateCall(); + OpalCall * IncomingCreateCall(); - /**Same as CreateCall(), but assign a particular Comms structure, + /**Assign a particular Comms structure, with a particular remoteController to this call. This routine is used when creating outgoing calls. + For incoming calls, we have to make a comms structure (well, + get it off the available list) and let it run from there. + + This method allows an application to have the system create + desccendants of the OpalCall class. + The default behavious returns an instance of MyOpalCall. */ virtual OpalCall * CreateCall(void * userData ///< user data passed to SetUpCall Modified: sofaswitch/trunk/voip/udpconnection.cxx ============================================================================== --- sofaswitch/trunk/voip/udpconnection.cxx (original) +++ sofaswitch/trunk/voip/udpconnection.cxx Tue May 26 23:08:58 2009 @@ -219,7 +219,7 @@ if (soundChannel == NULL) return NULL; - return new OpalAudioMediaStream(*this, mediaFormat, sessionID, isSource, 2, soundChannel); + return new OpalAudioMediaStream(*this, mediaFormat, sessionID, isSource, 2, 300, soundChannel); } Modified: sofaswitch/trunk/voip/udpep.cxx ============================================================================== --- sofaswitch/trunk/voip/udpep.cxx (original) +++ sofaswitch/trunk/voip/udpep.cxx Tue May 26 23:08:58 2009 @@ -127,10 +127,6 @@ formats += OpalPCM16; // Sound card can only do 16 bit PCM -#if OPAL_VIDEO - AddVideoMediaFormats(formats); -#endif - return formats; }