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

[Sofaswitch-svn] [commit] r253 - sofaswitch/trunk/callflow/tests
by SofaSWITCH SVN 16 May '07

16 May '07

Author: derek Date: Tue May 15 20:12:50 2007 New Revision: 253 Added: sofaswitch/trunk/callflow/tests/amtest.src Log: Initial release of a file to test the audio machine. plays audio from the desginated file to the sound module. records audio from the sound card to the designated file Quits on reception of a dtmf character from the sound module Added: sofaswitch/trunk/callflow/tests/amtest.src ============================================================================== --- (empty file) +++ sofaswitch/trunk/callflow/tests/amtest.src Tue May 15 20:12:50 2007 @@ -0,0 +1,3 @@ +9248182248,183,308,182<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14298186 extra <special>Tool Tip<ms>Catch the timer, which when fired, +indicates no am node was found<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>requestam<ms><special>Python variable: source of the event<ms>self.eventSource<ms><special>Python variable: name of the event<ms>self.eventName<ms><special>Python variable: data associated<ms>self.nonodefound<ms><special> <Shape>20304383 extra <special>Tool Tip<ms>Death<ms><special> <Shape>11190110 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from (Python code)<ms>"am"<ms><special>Timer period (seconds)<ms>1<ms><special>Timer label<ms>requestam<ms><special>Additional information (Python code)<ms><ms><special> <Shape>119115 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>17190357 extra <special>Tool Tip<ms>Write To File<ms><special>Filename to contain new audio (Python code)<ms>"recorded_audio.wav"<ms><special>answering machine node<ms>self.amNode<ms><special> <Shape>2362231 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>9318262347,262,318,294<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>2190446 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>10198248 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "Have a new am node on ", self.amNode<ms><special> <Shape>9311236311,236,318,294<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>21301339 extra <special>Tool Tip<ms>terminate the am node<ms><special>Message to send (Python code)<ms>self.amNode + ":hangup"<ms><special> <Shape>15190310 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>self.amNode<ms><special>Second SofaSwitch worker (python)<ms>"sound"<ms><special> <Shape>2119967 extra <special>Tool Tip<ms>sound messages come here<ms><special>Message to send (Python code)<ms>"sound:reporttome"<ms><special> <Shape>16190401 extra <special>Tool Tip<ms>initial wav file<ms><special>Filename to read audio from (Python code)<ms>"../prompts/instructions.wav"<ms><special>answering machine node<ms>self.amNode<ms><special> <Shape>15292298 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>"sound"<ms><special>Second SofaSwitch worker (python)<ms>"sound"<ms><special> <Shape>14334212 extra <special>Tool Tip<ms>wait for incoming DTMF<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>DTMF<ms><special>Python variable: source of the event<ms>self.eventSource<ms><special>Python variable: name of the event<ms>self.eventName<ms><special>Python variable: generated data<ms>self.eventData<ms><special> <Shape>14201161 extra <special>Tool Tip<ms>Wait for an event to indicate +that the am node is created<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>amREQ<ms><special>Python variable: source of the event<ms>self.eventSource<ms><special>Python variable: name of the event<ms>self.eventName<ms><special>Python variable: data associated<ms>self.amNode<ms><special> <Shape>13190210 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>requestam<ms><special> <Shape>

1 0

[Sofaswitch-svn] [commit] r252 - sofaswitch/trunk/am
by SofaSWITCH SVN 15 May '07

15 May '07

Author: derek Date: Mon May 14 23:11:08 2007 New Revision: 252 Modified: sofaswitch/trunk/am/audio.cxx sofaswitch/trunk/am/comms.cxx sofaswitch/trunk/am/main.cxx Log: Fixes tidyups etc. Modified: sofaswitch/trunk/am/audio.cxx ============================================================================== --- sofaswitch/trunk/am/audio.cxx (original) +++ sofaswitch/trunk/am/audio.cxx Mon May 14 23:11:08 2007 @@ -27,7 +27,10 @@ * */ +#ifndef _PTLIB_H #include <ptlib.h> +#endif + #include "version.h" #include "audio.h" #include "main.h" Modified: sofaswitch/trunk/am/comms.cxx ============================================================================== --- sofaswitch/trunk/am/comms.cxx (original) +++ sofaswitch/trunk/am/comms.cxx Mon May 14 23:11:08 2007 @@ -23,7 +23,9 @@ * */ +#ifndef _PTLIB_H #include <ptlib.h> +#endif #ifdef __GNUC__ #pragma implementation "comms.h" Modified: sofaswitch/trunk/am/main.cxx ============================================================================== --- sofaswitch/trunk/am/main.cxx (original) +++ sofaswitch/trunk/am/main.cxx Mon May 14 23:11:08 2007 @@ -98,9 +98,6 @@ PTrace::Blocks | PTrace::Timestamp | PTrace::Thread | PTrace::FileAndLine); - - - PString server; if (args.HasOption("server")) { server = args.GetOptionString("server"); @@ -110,7 +107,7 @@ PTRACE(3, "Select a default server of localhost"); } - PString ourId; + PStringStream ourId; if (args.HasOption("id")) { ourId = args.GetOptionString("id"); PTRACE(3, "our ID is " << ourId); @@ -119,6 +116,8 @@ PTRACE(3, "Select a default ID of "<< ourId); } + ourId = server + PString("/") + ourId; + PString ourPassword; if (args.HasOption("password")) { ourPassword = args.GetOptionString("password");

1 0

[Sofaswitch-svn] [commit] r251 - sofaswitch/trunk/sofa/src
by SofaSWITCH SVN 15 May '07

15 May '07

Author: derek Date: Mon May 14 23:03:54 2007 New Revision: 251 Modified: sofaswitch/trunk/sofa/src/messages.cxx Log: Tidy up reporting. Modified: sofaswitch/trunk/sofa/src/messages.cxx ============================================================================== --- sofaswitch/trunk/sofa/src/messages.cxx (original) +++ sofaswitch/trunk/sofa/src/messages.cxx Mon May 14 23:03:54 2007 @@ -23,7 +23,9 @@ * */ +#ifndef _PTLIB_H #include <ptlib.h> +#endif #include <ptclib/random.h> #ifdef __GNUC__ @@ -200,12 +202,13 @@ SetThreadName(PString("Messages.") + ourId); PTRACE(3, "Message frame Initialise begin"); messagesSocket.SetPort(5000); - PTRACE(3, "Message frame connect to port 5000 of server"); + PTRACE(3, "Message frame connect to port 5000 of server \"" + << remoteServer << "\""); for(PINDEX tryCount = 0; keepGoing && (tryCount < 5); tryCount++) { if (!messagesSocket.Connect(remoteServer)) { - PTRACE(3, "Failed to connect to " << remoteServer << " error was " - << messagesSocket.GetErrorText()); + PTRACE(3, "Failed to connect to \"" << remoteServer << "\" error was \"" + << messagesSocket.GetErrorText() << "\""); } PTRACE(3, "finish a try to connect");

1 0

[Sofaswitch-svn] [commit] r250 - sofaswitch/trunk/server
by SofaSWITCH SVN 15 May '07

15 May '07

Author: derek Date: Mon May 14 22:34:43 2007 New Revision: 250 Modified: sofaswitch/trunk/server/counts.h sofaswitch/trunk/server/main.h Log: Add ptlib checks around include of ptlib.h Modified: sofaswitch/trunk/server/counts.h ============================================================================== --- sofaswitch/trunk/server/counts.h (original) +++ sofaswitch/trunk/server/counts.h Mon May 14 22:34:43 2007 @@ -26,7 +26,9 @@ #ifndef _COUNTS_H #define _COUNTS_H +#ifndef _PTLIB_H #include <ptlib.h> +#endif #ifdef P_USE_PRAGMA #pragma interface Modified: sofaswitch/trunk/server/main.h ============================================================================== --- sofaswitch/trunk/server/main.h (original) +++ sofaswitch/trunk/server/main.h Mon May 14 22:34:43 2007 @@ -30,7 +30,10 @@ #pragma interface #endif +#ifndef _PTLIB_H #include <ptlib.h> +#endif + #include <ptlib/sockets.h> #include <ptlib/safecoll.h>

1 0

[Sofaswitch-svn] [commit] r249 - sofaswitch/trunk/am
by SofaSWITCH SVN 15 May '07

15 May '07

Author: derek Date: Mon May 14 22:21:31 2007 New Revision: 249 Modified: sofaswitch/trunk/am/audio.cxx sofaswitch/trunk/am/audio.h sofaswitch/trunk/am/comms.cxx sofaswitch/trunk/am/comms.h sofaswitch/trunk/am/main.cxx Log: Follow on changes, from using const PString & arguement, (which saves on cpu required to pass a parameter). Modified: sofaswitch/trunk/am/audio.cxx ============================================================================== --- sofaswitch/trunk/am/audio.cxx (original) +++ sofaswitch/trunk/am/audio.cxx Mon May 14 22:21:31 2007 @@ -273,7 +273,7 @@ return TRUE; } -void AudioBase::ProcessFile(PString & _audioFile) +void AudioBase::ProcessFile(const PString & _audioFile) { PTRACE(1, "AudioBase\tNow process file \"" << _audioFile << "\""); PWaitAndSignal m(audioFileLock); Modified: sofaswitch/trunk/am/audio.h ============================================================================== --- sofaswitch/trunk/am/audio.h (original) +++ sofaswitch/trunk/am/audio.h Mon May 14 22:21:31 2007 @@ -68,7 +68,7 @@ audio to/from the specified file. If the thread has already started, lock the mutex protecting access to the file and change the file to the new name */ - void ProcessFile(PString & _audioFile ///< the file we are about to start using + void ProcessFile(const PString & _audioFile ///< the file we are about to start using ); Modified: sofaswitch/trunk/am/comms.cxx ============================================================================== --- sofaswitch/trunk/am/comms.cxx (original) +++ sofaswitch/trunk/am/comms.cxx Mon May 14 22:21:31 2007 @@ -229,7 +229,7 @@ return FALSE; } -void Comms::SetReadFile(PString & newReadFile) +void Comms::SetReadFile(const PString & newReadFile) { PTRACE(3, "Set the read file to be " << newReadFile); audioReadFile = newReadFile; @@ -237,7 +237,7 @@ audioReadThread.ProcessFile(newReadFile); } -void Comms::SetWriteFile(PString & newWriteFile) +void Comms::SetWriteFile(const PString & newWriteFile) { PTRACE(1, "Set the write file to be " << newWriteFile); audioWriteFile = newWriteFile; Modified: sofaswitch/trunk/am/comms.h ============================================================================== --- sofaswitch/trunk/am/comms.h (original) +++ sofaswitch/trunk/am/comms.h Mon May 14 22:21:31 2007 @@ -146,14 +146,14 @@ audio from the specified file (which is the case for the answering machine. The answering machine will read aaudio from the specified file. */ - virtual void SetReadFile(PString & newReadFile); + virtual void SetReadFile(const PString & newReadFile); /**Actually set the file this application will write PCM audio data to. application will override this method, if it is allowed to put audio into this file (which is the case for the answering machine. The answering machine will write audio to the specified file. */ - virtual void SetWriteFile(PString & newWriteFile); + virtual void SetWriteFile(const PString & newWriteFile); /**Some MessageFrame instances do not obey the hangup command. This virtual method says we can hangup, cause we are one Modified: sofaswitch/trunk/am/main.cxx ============================================================================== --- sofaswitch/trunk/am/main.cxx (original) +++ sofaswitch/trunk/am/main.cxx Mon May 14 22:21:31 2007 @@ -119,8 +119,6 @@ PTRACE(3, "Select a default ID of "<< ourId); } - ourId = server + "/" + ourId; - PString ourPassword; if (args.HasOption("password")) { ourPassword = args.GetOptionString("password");

1 0

[Sofaswitch-svn] [commit] r248 - in sofaswitch/trunk/sofa: include/sofa src
by SofaSWITCH SVN 15 May '07

15 May '07

Author: derek Date: Mon May 14 22:16:25 2007 New Revision: 248 Modified: sofaswitch/trunk/sofa/include/sofa/messages.h sofaswitch/trunk/sofa/src/messages.cxx Log: Change some args to const PString &, which saves on CPU. Modified: sofaswitch/trunk/sofa/include/sofa/messages.h ============================================================================== --- sofaswitch/trunk/sofa/include/sofa/messages.h (original) +++ sofaswitch/trunk/sofa/include/sofa/messages.h Mon May 14 22:16:25 2007 @@ -220,7 +220,7 @@ application would not override this method, as this mthod does check that a file name is provided. This method will call SetReadFile, which the application will override */ - virtual void ProcessSetWriteFile(PStringArray &cmds, PString & sender); + virtual void ProcessSetWriteFile(PStringArray &cmds, const PString & sender); /**we have received a command asking us to set the file that we read from and then transmit over ethernet to the remote @@ -229,7 +229,7 @@ method, as this mthod does check that a file name is provided. This method will call SetWriteFile, which the application will override */ - virtual void ProcessSetReadFile(PStringArray &cmds, PString & sender); + virtual void ProcessSetReadFile(PStringArray &cmds, const PString & sender); #ifdef PMEMORY_CHECK /**we have received a command asking us to write all current allocations to the specified @@ -244,7 +244,7 @@ for the answering machine. The method name (SetWriteFile) describes what we do to the specified file - we are writing to this file*/ - virtual void SetWriteFile(PString & newWriteFile); + virtual void SetWriteFile(const PString & newWriteFile); /**Actually set the read file. We will extract PCM data from this file. An application will override this method, if it is @@ -252,7 +252,7 @@ answering machine. The method name (SetReadFile) describes what we do to the specified file - we are reading from this file*/ - virtual void SetReadFile(PString & newReadFile); + virtual void SetReadFile(const PString & newReadFile); /**Send this dtmf string to the remote node. Returns TRUE on success, FALSE on failure. Modified: sofaswitch/trunk/sofa/src/messages.cxx ============================================================================== --- sofaswitch/trunk/sofa/src/messages.cxx (original) +++ sofaswitch/trunk/sofa/src/messages.cxx Mon May 14 22:16:25 2007 @@ -803,7 +803,7 @@ } -void MessageFrame::ProcessSetReadFile(PStringArray &cmds, PString & sender) +void MessageFrame::ProcessSetReadFile(PStringArray &cmds, const PString & sender) { if (cmds.GetSize() != 2) { PTRACE(3, cmds[0] << " Failed - Read file not correctly specified" @@ -814,7 +814,7 @@ SetReadFile(cmds[1]); } -void MessageFrame::ProcessSetWriteFile(PStringArray &cmds, PString & sender) +void MessageFrame::ProcessSetWriteFile(PStringArray &cmds, const PString & sender) { if (cmds.GetSize() != 2) { PTRACE(3, cmds[0] << " Failed - Read file not correctly specified" @@ -890,12 +890,12 @@ return TRUE; } -void MessageFrame::SetWriteFile(PString & newWriteFile) +void MessageFrame::SetWriteFile(const PString & newWriteFile) { PTRACE(1, "SetWriteFile() is not implemented, and it should be"); } -void MessageFrame::SetReadFile(PString & newReadFile) +void MessageFrame::SetReadFile(const PString & newReadFile) { PTRACE(1, "SetReadFile() is not implemented, and it should be"); }

1 0