April 2007 - sofaswitch-svn@lists.freeswitch.org

[Sofaswitch-svn] [commit] r247 - in sofaswitch/trunk: am mcu sofa/include/sofa sound voip
by SofaSWITCH SVN 20 Apr '07

20 Apr '07

Author: derek Date: Thu Apr 19 22:30:57 2007 New Revision: 247 Modified: sofaswitch/trunk/am/comms.h sofaswitch/trunk/am/counts.h sofaswitch/trunk/am/main.h sofaswitch/trunk/am/manager.h sofaswitch/trunk/am/supervisor.h sofaswitch/trunk/mcu/comms.h sofaswitch/trunk/mcu/conferenceroom.h sofaswitch/trunk/mcu/counts.h sofaswitch/trunk/mcu/main.h sofaswitch/trunk/mcu/manager.h sofaswitch/trunk/mcu/member.h sofaswitch/trunk/mcu/participant.h sofaswitch/trunk/mcu/supervisor.h sofaswitch/trunk/sofa/include/sofa/messages.h sofaswitch/trunk/sound/comms.h sofaswitch/trunk/sound/main.h sofaswitch/trunk/voip/comms.h sofaswitch/trunk/voip/counts.h sofaswitch/trunk/voip/jocall.h sofaswitch/trunk/voip/main.h sofaswitch/trunk/voip/mymanager.h sofaswitch/trunk/voip/supervisor.h sofaswitch/trunk/voip/udpsound.h Log: fixes, so it compiles with the absolute latest opal cvs. This includes precompiled headers of ptlib.h, which does supposedly reduce the compile time. Modified: sofaswitch/trunk/am/comms.h ============================================================================== --- sofaswitch/trunk/am/comms.h (original) +++ sofaswitch/trunk/am/comms.h Thu Apr 19 22:30:57 2007 @@ -28,18 +28,22 @@ #ifndef _COMMS_H #define _COMMS_H -#ifdef P_USE_PRAGMA -#pragma interface -#endif - +#ifndef _PTLIB_H #include <ptlib.h> +#endif + #include <ptlib/safecoll.h> #include "sofa/messages.h" #include "audio.h" +#ifdef P_USE_PRAGMA +#pragma interface +#endif + + class Comms; class CommsList; Modified: sofaswitch/trunk/am/counts.h ============================================================================== --- sofaswitch/trunk/am/counts.h (original) +++ sofaswitch/trunk/am/counts.h Thu Apr 19 22:30:57 2007 @@ -28,7 +28,9 @@ #ifndef _COUNTS_H #define _COUNTS_H +#ifndef _PTLIB_H #include <ptlib.h> +#endif #ifdef P_USE_PRAGMA #pragma interface Modified: sofaswitch/trunk/am/main.h ============================================================================== --- sofaswitch/trunk/am/main.h (original) +++ sofaswitch/trunk/am/main.h Thu Apr 19 22:30:57 2007 @@ -28,7 +28,10 @@ #define _Am_MAIN_H +#ifndef _PTLIB_H #include <ptlib.h> +#endif + #include <ptclib/ipacl.h> Modified: sofaswitch/trunk/am/manager.h ============================================================================== --- sofaswitch/trunk/am/manager.h (original) +++ sofaswitch/trunk/am/manager.h Thu Apr 19 22:30:57 2007 @@ -31,15 +31,19 @@ #define _SsAm_MANAGER_H -#ifdef P_USE_PRAGMA -#pragma interface -#endif +#ifndef _PTLIB_H #include <ptlib.h> +#endif + #include <ptclib/ipacl.h> #include <sofa/messages.h> +#ifdef P_USE_PRAGMA +#pragma interface +#endif + class Comms; class Supervisor; class LaunchNewId; Modified: sofaswitch/trunk/am/supervisor.h ============================================================================== --- sofaswitch/trunk/am/supervisor.h (original) +++ sofaswitch/trunk/am/supervisor.h Thu Apr 19 22:30:57 2007 @@ -32,15 +32,19 @@ #ifndef _SUPERVISOR_H #define _SUPERVISOR_H -#ifdef P_USE_PRAGMA -#pragma interface -#endif + +#ifndef _PTLIB_H #include <ptlib.h> +#endif #include <sofa/messages.h> +#ifdef P_USE_PRAGMA +#pragma interface +#endif + /**A class that has the overview of all calls to this process. This class is involved in allocating an id to a new call. Requests for allocation come either from: an incoming call, or from the Modified: sofaswitch/trunk/mcu/comms.h ============================================================================== --- sofaswitch/trunk/mcu/comms.h (original) +++ sofaswitch/trunk/mcu/comms.h Thu Apr 19 22:30:57 2007 @@ -29,17 +29,23 @@ #ifndef _Mcu_COMMS_H #define _Mcu_COMMS_H -#ifdef P_USE_PRAGMA -#pragma interface -#endif +#ifndef _PTLIB_H #include <ptlib.h> +#endif + + #include <ptlib/safecoll.h> #include "sofa/messages.h" #include "audio.h" +#ifdef P_USE_PRAGMA +#pragma interface +#endif + + class Comms; class CommsList; class ConferenceRoom; Modified: sofaswitch/trunk/mcu/conferenceroom.h ============================================================================== --- sofaswitch/trunk/mcu/conferenceroom.h (original) +++ sofaswitch/trunk/mcu/conferenceroom.h Thu Apr 19 22:30:57 2007 @@ -29,14 +29,19 @@ #ifndef _Mcu_CONFERENCE_ROOM_H #define _Mcu_CONFERENCE_ROOM_H +#ifndef _PTLIB_H #include <ptlib.h> +#endif + + +#include <ptlib/safecoll.h> +#include "manager.h" #ifdef P_USE_PRAGMA #pragma interface #endif -#include <ptlib/safecoll.h> -#include "manager.h" + class Manager; Modified: sofaswitch/trunk/mcu/counts.h ============================================================================== --- sofaswitch/trunk/mcu/counts.h (original) +++ sofaswitch/trunk/mcu/counts.h Thu Apr 19 22:30:57 2007 @@ -28,7 +28,9 @@ #ifndef _COUNTS_H #define _COUNTS_H +#ifndef _PTLIB_H #include <ptlib.h> +#endif #ifdef P_USE_PRAGMA #pragma interface Modified: sofaswitch/trunk/mcu/main.h ============================================================================== --- sofaswitch/trunk/mcu/main.h (original) +++ sofaswitch/trunk/mcu/main.h Thu Apr 19 22:30:57 2007 @@ -26,16 +26,18 @@ #ifndef _Mcu_MAIN_H #define _Mcu_MAIN_H -#ifdef P_USE_PRAGMA -#pragma interface -#endif - - - + +#ifndef _PTLIB_H #include <ptlib.h> +#endif + #include <ptclib/ipacl.h> +#ifdef P_USE_PRAGMA +#pragma interface +#endif + class Manager; /**The class that launches everything */ Modified: sofaswitch/trunk/mcu/manager.h ============================================================================== --- sofaswitch/trunk/mcu/manager.h (original) +++ sofaswitch/trunk/mcu/manager.h Thu Apr 19 22:30:57 2007 @@ -29,17 +29,22 @@ #define _Mcu_MANAGER_H -#ifdef P_USE_PRAGMA -#pragma interface -#endif + +#ifndef _PTLIB_H #include <ptlib.h> +#endif + #include <ptclib/ipacl.h> #include "conferenceroom.h" #include "member.h" #include "sofa/messages.h" +#ifdef P_USE_PRAGMA +#pragma interface +#endif + class Comms; class CommsProvider; class LaunchNewId; Modified: sofaswitch/trunk/mcu/member.h ============================================================================== --- sofaswitch/trunk/mcu/member.h (original) +++ sofaswitch/trunk/mcu/member.h Thu Apr 19 22:30:57 2007 @@ -27,7 +27,9 @@ #ifndef _Mcu_MEMBER_H #define _Mcu_MEMBER_H +#ifndef _PTLIB_H #include <ptlib.h> +#endif #ifdef P_USE_PRAGMA #pragma interface Modified: sofaswitch/trunk/mcu/participant.h ============================================================================== --- sofaswitch/trunk/mcu/participant.h (original) +++ sofaswitch/trunk/mcu/participant.h Thu Apr 19 22:30:57 2007 @@ -27,7 +27,9 @@ #ifndef _Mcu_Participant_H #define _Mcu_Participant_H +#ifndef _PTLIB_H #include <ptlib.h> +#endif #ifdef P_USE_PRAGMA #pragma interface Modified: sofaswitch/trunk/mcu/supervisor.h ============================================================================== --- sofaswitch/trunk/mcu/supervisor.h (original) +++ sofaswitch/trunk/mcu/supervisor.h Thu Apr 19 22:30:57 2007 @@ -30,14 +30,19 @@ #ifndef _Mcu_SUPERVISOR_H #define _Mcu_SUPERVISOR_H + +#ifndef _PTLIB_H +#include <ptlib.h> +#endif + + +#include "sofa/messages.h" + #ifdef P_USE_PRAGMA #pragma interface #endif -#include <ptlib.h> - -#include "sofa/messages.h" /**A class that has the overview of all calls to this process. This class is involved in allocating an id to a new call. Requests Modified: sofaswitch/trunk/sofa/include/sofa/messages.h ============================================================================== --- sofaswitch/trunk/sofa/include/sofa/messages.h (original) +++ sofaswitch/trunk/sofa/include/sofa/messages.h Thu Apr 19 22:30:57 2007 @@ -25,17 +25,21 @@ #ifndef _SOFA_MESSAGE_H #define _SOFA_MESSAGE_H -#ifdef P_USE_PRAGMA -#pragma interface -#endif +#ifndef _PTLIB_H #include <ptlib.h> +#endif #include <ptlib/notifier_ext.h> #include <ptlib/sockets.h> #include <sofa/messlist.h> +#ifdef P_USE_PRAGMA +#pragma interface +#endif + + class LaunchNewId; class MessageFrame; Modified: sofaswitch/trunk/sound/comms.h ============================================================================== --- sofaswitch/trunk/sound/comms.h (original) +++ sofaswitch/trunk/sound/comms.h Thu Apr 19 22:30:57 2007 @@ -27,14 +27,19 @@ #ifndef _COMMS_H #define _COMMS_H + +#ifndef _PTLIB_H +#include <ptlib.h> +#endif + +#include <ptlib/sound.h> +#include <sofa/messages.h> + #ifdef P_USE_PRAGMA #pragma interface #endif -#include <ptlib.h> -#include <ptlib/sound.h> -#include <sofa/messages.h> class JOCall; class TestAudioRead; Modified: sofaswitch/trunk/sound/main.h ============================================================================== --- sofaswitch/trunk/sound/main.h (original) +++ sofaswitch/trunk/sound/main.h Thu Apr 19 22:30:57 2007 @@ -19,7 +19,9 @@ #ifndef _MAIN_H #define _MAIN_H +#ifndef _PTLIB_H #include <ptlib.h> +#endif #include "comms.h" Modified: sofaswitch/trunk/voip/comms.h ============================================================================== --- sofaswitch/trunk/voip/comms.h (original) +++ sofaswitch/trunk/voip/comms.h Thu Apr 19 22:30:57 2007 @@ -31,16 +31,21 @@ #ifndef _COMMS_H #define _COMMS_H -#ifdef P_USE_PRAGMA -#pragma interface -#endif - +#ifndef _PTLIB_H #include <ptlib.h> +#endif + #include <ptlib/safecoll.h> #include <sofa/messages.h> +#ifdef P_USE_PRAGMA +#pragma interface +#endif + + + class Comms; class CommsList; class MyOpalCall; Modified: sofaswitch/trunk/voip/counts.h ============================================================================== --- sofaswitch/trunk/voip/counts.h (original) +++ sofaswitch/trunk/voip/counts.h Thu Apr 19 22:30:57 2007 @@ -27,14 +27,16 @@ #ifndef _COUNTS_H #define _COUNTS_H +#ifndef _PTLIB_H #include <ptlib.h> - -#ifdef P_USE_PRAGMA -#pragma interface #endif + #include "counts.h" +#ifdef P_USE_PRAGMA +#pragma interface +#endif Modified: sofaswitch/trunk/voip/jocall.h ============================================================================== --- sofaswitch/trunk/voip/jocall.h (original) +++ sofaswitch/trunk/voip/jocall.h Thu Apr 19 22:30:57 2007 @@ -30,15 +30,19 @@ #ifndef _JOCALL_H #define _JOCALL_H +#ifndef _PTLIB_H #include <ptlib.h> - -#ifdef P_USE_PRAGMA -#pragma interface #endif + #include <opal/call.h> #include "comms.h" +#ifdef P_USE_PRAGMA +#pragma interface +#endif + + class MyManager; /** A class the combines the OpalCall structure from OPAL with our protocol Modified: sofaswitch/trunk/voip/main.h ============================================================================== --- sofaswitch/trunk/voip/main.h (original) +++ sofaswitch/trunk/voip/main.h Thu Apr 19 22:30:57 2007 @@ -31,7 +31,10 @@ #define _Voip_MAIN_H +#ifndef _PTLIB_H #include <ptlib.h> +#endif + #include <ptclib/ipacl.h> #include <opal/manager.h> Modified: sofaswitch/trunk/voip/mymanager.h ============================================================================== --- sofaswitch/trunk/voip/mymanager.h (original) +++ sofaswitch/trunk/voip/mymanager.h Thu Apr 19 22:30:57 2007 @@ -31,18 +31,22 @@ #ifndef _Voip_MANAGER_H #define _Voip_MANAGER_H - -#ifdef P_USE_PRAGMA -#pragma interface -#endif +#ifndef _PTLIB_H #include <ptlib.h> +#endif + #include <ptclib/ipacl.h> #include <opal/manager.h> #include <opal/connection.h> #include "comms.h" +#ifdef P_USE_PRAGMA +#pragma interface +#endif + + class H323EndPoint; class IAX2EndPoint; class LaunchNewId; Modified: sofaswitch/trunk/voip/supervisor.h ============================================================================== --- sofaswitch/trunk/voip/supervisor.h (original) +++ sofaswitch/trunk/voip/supervisor.h Thu Apr 19 22:30:57 2007 @@ -31,15 +31,18 @@ #ifndef _SUPERVISOR_H #define _SUPERVISOR_H -#ifdef P_USE_PRAGMA -#pragma interface -#endif - +#ifndef _PTLIB_H #include <ptlib.h> +#endif #include <sofa/messages.h> +#ifdef P_USE_PRAGMA +#pragma interface +#endif + + /**A class that has the overview of all calls to this process. This class is involved in allocating an id to a new call. Requests for allocation come either from: an incoming call, or from the Modified: sofaswitch/trunk/voip/udpsound.h ============================================================================== --- sofaswitch/trunk/voip/udpsound.h (original) +++ sofaswitch/trunk/voip/udpsound.h Thu Apr 19 22:30:57 2007 @@ -35,16 +35,21 @@ #ifndef __OPAL_UDPSOUND_H #define __OPAL_UDPSOUND_H -#ifdef P_USE_PRAGMA -#pragma interface +#ifndef _PTLIB_H +#include <ptlib.h> #endif -#include <ptlib.h> #include <ptlib/ipsock.h> #include <ptlib/sockets.h> #include <ptclib/qchannel.h> #include <ptlib/sound.h> +#ifdef P_USE_PRAGMA +#pragma interface +#endif + + + class PUDPSocket; class MyOpalCall;

1 0

[Sofaswitch-svn] [commit] r246 - sofaswitch/trunk/server
by SofaSWITCH SVN 20 Apr '07

20 Apr '07

Author: derek Date: Thu Apr 19 21:45:40 2007 New Revision: 246 Modified: sofaswitch/trunk/server/main.cxx Log: Fix formatting of messages that are handled. Modified: sofaswitch/trunk/server/main.cxx ============================================================================== --- sofaswitch/trunk/server/main.cxx (original) +++ sofaswitch/trunk/server/main.cxx Thu Apr 19 21:45:40 2007 @@ -692,9 +692,9 @@ if (reportReadMessages) { PStringStream msg; - msg << GetNow() - << " Recv " <<sourceId << ::setw(25) << " " - << ::setw(0) << txt << endl; + msg << GetNow() << " Recv from " << ::setw(23) + << ::left << sourceId << ::setw(0) << " " + << txt << endl; PWaitAndSignal m(outputMutex); cerr << msg; } @@ -832,8 +832,8 @@ IncCountSent(); if (reportSentMessages) { PStringStream msg; - msg << GetNow() << " Send " - << ::setw(18) << sourceId << ::setw(0) << " --> " + msg << GetNow() << " Send to " << ::setw(23) + << ::left << sourceId << ::setw(0) << " " << PString((const char *)message.GetPointer(), message.GetSize() - 1) << endl; PWaitAndSignal m(outputMutex);

1 0

[Sofaswitch-svn] [commit] r245 - sofaswitch/trunk/voip
by SofaSWITCH SVN 17 Apr '07

17 Apr '07

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()

1 0

[Sofaswitch-svn] [commit] r244 - sofaswitch/trunk
by SofaSWITCH SVN 10 Apr '07

10 Apr '07

Author: derek Date: Mon Apr 9 22:32:16 2007 New Revision: 244 Modified: sofaswitch/trunk/allprograms.cxx Log: Tidy up list Modified: sofaswitch/trunk/allprograms.cxx ============================================================================== --- sofaswitch/trunk/allprograms.cxx (original) +++ sofaswitch/trunk/allprograms.cxx Mon Apr 9 22:32:16 2007 @@ -31,7 +31,7 @@ \page pageSofaSwitchPrograms Current Programs in Sofa Switch \li <a class="el" href="am/index.html"> answering machine</a> -\li <a class="el" href="callflow/index.html"> call control</a> +\li <a class="el" href="callflow/index.html"> gui to design call handling</a> \li <a class="el" href="mcu/index.html"> conference utility</a> \li <a class="el" href="server/index.html"> message server</a> \li <a class="el" href="sofa/index.html"> sofa library</a>

1 0