- Sofaswitch-svn - FreeSWITCH Mailing Lists

[commit] r222 - sofaswitch/trunk/voip
by SofaSWITCH SVN 05 Jan '07

05 Jan '07

Author: derek Date: Thu Jan 4 23:24:35 2007 New Revision: 222 Modified: sofaswitch/trunk/voip/main.cxx sofaswitch/trunk/voip/mymanager.cxx sofaswitch/trunk/voip/udpep.cxx sofaswitch/trunk/voip/udpep.h Log: Bring it up to date, so that it compiles with the latest openh323 code. Modified: sofaswitch/trunk/voip/main.cxx ============================================================================== --- sofaswitch/trunk/voip/main.cxx (original) +++ sofaswitch/trunk/voip/main.cxx Thu Jan 4 23:24:35 2007 @@ -45,7 +45,7 @@ #endif #include <lids/lidep.h> -#include <lids/ixjlid.h> + #include <ptclib/pstun.h> #include "main.h" Modified: sofaswitch/trunk/voip/mymanager.cxx ============================================================================== --- sofaswitch/trunk/voip/mymanager.cxx (original) +++ sofaswitch/trunk/voip/mymanager.cxx Thu Jan 4 23:24:35 2007 @@ -54,7 +54,7 @@ #endif #include <lids/lidep.h> -#include <lids/ixjlid.h> + #include <ptclib/pstun.h> #ifdef OPAL_STATIC_LINK @@ -220,18 +220,11 @@ } cout << "TCP ports: " << GetTCPPortBase() << '-' << GetTCPPortMax() << "\n" - "UDP ports: " << GetUDPPortBase() << '-' << GetUDPPortMax() << "\n" - "RTP ports: " << GetRtpIpPortBase() << '-' << GetRtpIpPortMax() << "\n" - "RTP IP TOS: 0x" << hex << (unsigned)GetRtpIpTypeofService() << dec << "\n" - "STUN server: " << flush; - - if (args.HasOption("stun")) - SetSTUNServer(args.GetOptionString("stun")); - - if (stun != NULL) - cout << stun->GetServer() << " replies " << stun->GetNatTypeName(); - else - cout << "None"; + "UDP ports: " << GetUDPPortBase() << '-' << GetUDPPortMax() << "\n" + "RTP ports: " << GetRtpIpPortBase() << '-' << GetRtpIpPortMax() << "\n" + "RTP IP TOS: 0x" << hex << (unsigned)GetRtpIpTypeofService() << dec << "\n" << flush; + + cout << '\n'; Modified: sofaswitch/trunk/voip/udpep.cxx ============================================================================== --- sofaswitch/trunk/voip/udpep.cxx (original) +++ sofaswitch/trunk/voip/udpep.cxx Thu Jan 4 23:24:35 2007 @@ -64,7 +64,7 @@ { IncOpalUdpSsEndPoint(); PTRACE(3, "UdpSs\tCreated UDP sound system endpoint."); - connectionTokenIndex = 0; + connectionTokenIndex.SetValue(0); } @@ -79,7 +79,8 @@ BOOL OpalUdpSsEndPoint::MakeConnection(OpalCall & call, const PString & remoteParty, - void * userData) + void * userData, + unsigned int /*options*/) { // First strip of the prefix if present PINDEX prefixLength = 0; Modified: sofaswitch/trunk/voip/udpep.h ============================================================================== --- sofaswitch/trunk/voip/udpep.h (original) +++ sofaswitch/trunk/voip/udpep.h Thu Jan 4 23:24:35 2007 @@ -101,9 +101,10 @@ The default behaviour is pure. */ virtual BOOL MakeConnection( - OpalCall & call, /// Owner of connection - const PString & party, /// Remote party to call - void * userData = NULL /// Arbitrary data to pass to connection + OpalCall & call, ///< Owner of connection + const PString & party, ///< Remote party to call + void * userData = NULL, ///< Arbitrary data to pass to connection + unsigned int options = 0 ///< options to pass to conneciton ); /**Get the data formats this endpoint is capable of operating.

1 0

[commit] r221 - sofaswitch/trunk/sound
by SofaSWITCH SVN 04 Jan '07

04 Jan '07

Author: derek Date: Thu Jan 4 17:33:15 2007 New Revision: 221 Modified: sofaswitch/trunk/sound/comms.cxx sofaswitch/trunk/sound/comms.h sofaswitch/trunk/sound/main.cxx Log: Remove the notion of tar and taw pointers. Remove the need for the read write mutex on the tar/taw objects. Check the sound device opens for reading, before we use it to capture audio. Modified: sofaswitch/trunk/sound/comms.cxx ============================================================================== --- sofaswitch/trunk/sound/comms.cxx (original) +++ sofaswitch/trunk/sound/comms.cxx Thu Jan 4 17:33:15 2007 @@ -38,14 +38,13 @@ //////////////////////////////////////////////////////////////////////////////// -Comms::Comms(LaunchNewId & lid) - : MessageFrame(lid, 63000) +Comms::Comms(LaunchNewId & lid, PSoundChannel & _soundPlayer, PSoundChannel & _soundRecorder) + : MessageFrame(lid, 63000), + tar(* new TestAudioRead(audioSocket, _soundRecorder)), + taw(* new TestAudioWrite(audioSocket, _soundPlayer)) { stopByExit = FALSE; stopByHangup = TRUE; - - tar = NULL; - taw = NULL; } Comms::~Comms() @@ -53,13 +52,6 @@ PTRACE(3, "Comms destructor "); Terminate(); WaitForTermination(); - PWaitAndSignal m(lockReaderWriter); - - if (tar != NULL) - delete tar; - - if (taw != NULL) - delete taw; } void Comms::OnTermination() @@ -73,21 +65,11 @@ void Comms::Terminate() { PTRACE(3, "Terminate comms instance "); - PWaitAndSignal m(lockReaderWriter); + PTRACE(3, "Set tar to terminate"); + tar.Terminate(); - if (tar != NULL) { - PTRACE(3, "Set tar to terminate"); - tar->Terminate(); - } else { - PTRACE(3, "NO tar to terminate"); - } - - if (taw != NULL) { - PTRACE(3, "Set taw to terminate"); - taw->Terminate(); - } else { - PTRACE(3, "NO taw to terminate"); - } + PTRACE(3, "Set taw to terminate"); + taw.Terminate(); } void Comms::WaitForTermination() @@ -96,15 +78,8 @@ while (keepGoing) { { PTRACE(6, "Comms\tWaitForTermination"); - PWaitAndSignal m(lockReaderWriter); - if (tar != NULL) { - keepGoing = !tar->IsTerminated(); - } - if (taw != NULL) { - keepGoing = keepGoing || (!taw->IsTerminated()); - } - if ((taw == NULL) && (tar == NULL)) - keepGoing = !MessageFrame::IsTerminated(); + keepGoing = !tar.IsTerminated(); + keepGoing = keepGoing || (!taw.IsTerminated()); } PThread::Sleep(100); } @@ -116,22 +91,19 @@ { PString newVolume; - PWaitAndSignal m(lockReaderWriter); - TestAudio *ta; + TestAudio * ta; if (dir == PSoundChannel::Player) - ta = taw; + ta = &taw; else - ta = tar; + ta = &tar; - if (ta != NULL) { - if (doRaise) - ta->RaiseVolume(); - else - ta->LowerVolume(); - return ta->GetDeviceDirName() + PString(" ") + ta->GetVolumeString(); - } - return PString("No current sound device"); + if (doRaise) + ta->RaiseVolume(); + else + ta->LowerVolume(); + + return ta->GetDeviceDirName() + PString(" ") + ta->GetVolumeString(); } void Comms::SilentlyEndAll() @@ -171,22 +143,14 @@ { PStringStream countMessage; countMessage << "sound card handler" << endl; - { - PWaitAndSignal m(lockReaderWriter); - if (tar != NULL) - countMessage << PString("Reader = ") << PString(tar->GetCountPackets()) + countMessage << PString("Reader = ") << PString(tar.GetCountPackets()) << PString(" packets"); - else - countMessage << PString(" no read count available"); - countMessage << endl << endl; + countMessage << endl << endl; - if (taw != NULL) - countMessage << PString("writer = ") << PString(taw->GetCountPackets()) - << PString(" packets"); - else - countMessage << PString(" no write count available"); - countMessage << endl << endl; - } + countMessage << PString("writer = ") << PString(taw.GetCountPackets()) + << PString(" packets"); + countMessage << endl << endl; + PString partner = GetMediaPartner(); countMessage << "other node is: " << (partner.IsEmpty() ? " not specified" : partner); countMessage << endl << endl << "............................ "; @@ -231,36 +195,5 @@ } -BOOL Comms::ConstructReader(PSoundChannel & sound) -{ - PWaitAndSignal m(lockReaderWriter); - - tar = new TestAudioRead(audioSocket, sound); - PThread::Sleep(100); - - if (tar->IsTerminated()) { - PTRACE(3, "OOPS TestAudioRead has finished real quick"); - return FALSE; - } - return TRUE; -} - -BOOL Comms::ConstructWriter(PSoundChannel & sound) -{ - PWaitAndSignal m(lockReaderWriter); - - taw = new TestAudioWrite(audioSocket, sound); - PThread::Sleep(100); - - if (taw->IsTerminated()) { - PTRACE(3, "OOPS TestAudioWrite has finished real quick"); - return FALSE; - } - - return TRUE; -} - - - // End of File /////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/sound/comms.h ============================================================================== --- sofaswitch/trunk/sound/comms.h (original) +++ sofaswitch/trunk/sound/comms.h Thu Jan 4 17:33:15 2007 @@ -49,20 +49,12 @@ public: /**Constuctor */ - Comms(LaunchNewId & lid); + Comms(LaunchNewId & lid, PSoundChannel & _soundPlayer, PSoundChannel & _soundRecorder); /**Terminate, wait for threads to exit, and destroy the tar & taw threads */ ~Comms(); - - /**Open the test audio read thread.. - Return TRUE if successfull, FALSE on failure */ - BOOL ConstructReader(PSoundChannel & sound); - - /**Open the test audio write thread. - Return TRUE if successfull, FALSE on failure */ - BOOL ConstructWriter(PSoundChannel & sound); - + /**Shut down the read and write methods */ virtual void Terminate(); @@ -146,17 +138,14 @@ /**We have a comms error, so just close everything right now. Send no message to the remote node - just end end end. */ virtual void SilentlyEndAll(); - + /**@name manage the audio streams of data to the sound device */ //@{ - /**class that writes audio data to sound device */ - TestAudioWrite *taw; - /**Class that reads audio from the sound device */ - TestAudioRead *tar; - - /**Mutex which protects access to the tar/taw variables */ - PMutex lockReaderWriter; + TestAudioRead & tar; + + /**class that writes audio data to sound device */ + TestAudioWrite & taw; //@} /**The terminating condition was */ Modified: sofaswitch/trunk/sound/main.cxx ============================================================================== --- sofaswitch/trunk/sound/main.cxx (original) +++ sofaswitch/trunk/sound/main.cxx Thu Jan 4 17:33:15 2007 @@ -269,10 +269,7 @@ PString ourPassword = "audio"; PTRACE(3, "Select a default password of audio"); - - LaunchNewId lid(ourId, ourPassword); - Comms c(lid); - + PTRACE(3, "Constructed the comms device "); if (!OpenSoundDevice(soundRecorder, PSoundChannel::Recorder)) { @@ -290,18 +287,15 @@ PTRACE(3, msg); return; } - - if (!c.ConstructReader(soundRecorder)) { - cerr << "Failed to consturct a reader for audio.... OOPs srry " << endl; - PTRACE(3, "Failed to construct a reader for the audio. Exit now "); - return; - } - - if (!c.ConstructWriter(soundPlayer)) { - cerr << "Failed to consturct a writer for audio.... OOPs srry " << endl; - PTRACE(3, "Failed to construct a writer for the audio. Exit now "); - return; - } + + PTRACE(3, "Have opended the sound device just fine, now do a test read"); + BYTE nullBuffer[480]; + soundRecorder.Read(nullBuffer, 480); + soundRecorder.Read(nullBuffer, 480); + PTRACE(3, "finished test read"); + + LaunchNewId lid(ourId, ourPassword); + Comms c(lid, soundPlayer, soundRecorder); c.Resume(); //Get the coms to start working PThread::Sleep(200); //Wait for the comms to work @@ -338,6 +332,7 @@ } if (!sound.IsOpen()) { PTRACE(3, "just opened the device, but it is not open "); + return FALSE; } PINDEX currentVolume = 90; @@ -345,11 +340,13 @@ sound.SetBuffers(480, 2); - if (!sound.IsOpen()) { + if (sound.IsOpen()) { + PTRACE(3, "End of OpenAudio, sound device is opened just fine"); + return TRUE; + } else { PTRACE(3, "End of OpenAudio, but the sound device is closed"); + return FALSE; } - - return TRUE; } ////////////////////////////////////////////////////////////////////////////////

1 0

[commit] r220 - sofaswitch/trunk/sound
by SofaSWITCH SVN 04 Jan '07

04 Jan '07

Author: derek Date: Wed Jan 3 22:52:52 2007 New Revision: 220 Modified: sofaswitch/trunk/sound/audio.cxx sofaswitch/trunk/sound/audio.h sofaswitch/trunk/sound/comms.cxx sofaswitch/trunk/sound/comms.h sofaswitch/trunk/sound/main.cxx Log: Add ability to control volume while it runs. Remove surplus code, some minor tidyups. Modified: sofaswitch/trunk/sound/audio.cxx ============================================================================== --- sofaswitch/trunk/sound/audio.cxx (original) +++ sofaswitch/trunk/sound/audio.cxx Wed Jan 3 22:52:52 2007 @@ -191,8 +191,7 @@ if ((currentVolume + 5) < 101) currentVolume += 5; sound.SetVolume(currentVolume); - cout << name << " volume is " << currentVolume << endl; - PTRACE(3, "TestAudio\tRaise volume for " << name << " to " << currentVolume); + PTRACE(3, "TestAudio\tRaise volume for " << GetDeviceDirName() << " to " << currentVolume); } void TestAudio::LowerVolume() @@ -200,9 +199,16 @@ if ((currentVolume - 5) >= 0) currentVolume -= 5; sound.SetVolume(currentVolume); - cout << name << " volume is " << currentVolume << endl; - PTRACE(3, "TestAudio\tLower volume for " << name << " to " << currentVolume); + PTRACE(3, "TestAudio\tLower volume for " << GetDeviceDirName() << " to " << currentVolume); } + +PString TestAudio::GetVolumeString() +{ + PStringStream answer; + answer << name << " volume is " << currentVolume << endl; + return answer; +} + //////////////////////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/sound/audio.h ============================================================================== --- sofaswitch/trunk/sound/audio.h (original) +++ sofaswitch/trunk/sound/audio.h Wed Jan 3 22:52:52 2007 @@ -40,6 +40,12 @@ /**Reporting function */ PINDEX GetCountPackets() { return countPackets; } + /**Report the current volume */ + PString GetVolumeString(); + + /**Report the direction of this device as a string */ + virtual PString GetDeviceDirName() { return " Undefined direction "; } + protected: /**the socket that we do comms over */ PUDPSocket &socket; @@ -83,6 +89,9 @@ /**the main entry point, where this thread starts */ void Main(); + + /**Report the direction of this device as a string */ + virtual PString GetDeviceDirName() { return PString("Recorder"); } }; ///////////////////////////////////////////////////////////////////////////// @@ -100,6 +109,8 @@ /**the main entry point, where this thread starts */ void Main(); + /**Report the direction of this device as a string */ + virtual PString GetDeviceDirName() { return PString("Player"); } protected: Modified: sofaswitch/trunk/sound/comms.cxx ============================================================================== --- sofaswitch/trunk/sound/comms.cxx (original) +++ sofaswitch/trunk/sound/comms.cxx Wed Jan 3 22:52:52 2007 @@ -112,6 +112,28 @@ MessageFrame::WaitForTermination(); } +PString Comms::AlterVolume(PSoundChannel::Directions dir, BOOL doRaise) +{ + PString newVolume; + + PWaitAndSignal m(lockReaderWriter); + TestAudio *ta; + + if (dir == PSoundChannel::Player) + ta = taw; + else + ta = tar; + + if (ta != NULL) { + if (doRaise) + ta->RaiseVolume(); + else + ta->LowerVolume(); + return ta->GetDeviceDirName() + PString(" ") + ta->GetVolumeString(); + } + return PString("No current sound device"); +} + void Comms::SilentlyEndAll() { Modified: sofaswitch/trunk/sound/comms.h ============================================================================== --- sofaswitch/trunk/sound/comms.h (original) +++ sofaswitch/trunk/sound/comms.h Wed Jan 3 22:52:52 2007 @@ -80,9 +80,21 @@ are two sources of a status query - the remote controller or the keybaord */ void GetStatusInformation(PString & statusInfo); - + + /**Raise the volume for the specified sound device. Return a + string describing the new volume */ + PString RaiseVolume(PSoundChannel::Directions dir) + { return AlterVolume(dir, TRUE); } + + /**Lower the volume for the specified sound device. Return a + string describing the new volume */ + PString LowerVolume(PSoundChannel::Directions dir) + { return AlterVolume(dir, FALSE); } + protected: - + /**Increase or decrease the volume on the specified device */ + PString AlterVolume(PSoundChannel::Directions dir, BOOL doRaise); + /**We have a DTMF string from our current master. Display this DTMF on the console. We always return TRUE, cause we can always do this right. */ virtual BOOL SendDtmf(const PString & dtmfVals); Modified: sofaswitch/trunk/sound/main.cxx ============================================================================== --- sofaswitch/trunk/sound/main.cxx (original) +++ sofaswitch/trunk/sound/main.cxx Wed Jan 3 22:52:52 2007 @@ -50,6 +50,8 @@ PStringStream help; help << "Press : " << endl + << " [ ] to raise or lower the play volume" << endl + << " { } to raise or lower the record volume" << endl << " H or ? help on this interface" << endl << " D dtmf Send dtmf message text to the controller" << endl << " S Report the status of this device" << endl @@ -65,31 +67,54 @@ break; switch (tolower(ch)) { - case 'd' : { - PString message; - console >> message; - comms.DtmfReceivedFromTheWorld(message); - cout << "Command ? " << flush; - } - break; - case 'x' : - case 'q' : { - endNow = TRUE; - PTRACE(3, "End this program now "); - } - break; - case 's' : { - PString status; - comms.GetStatusInformation(status); - cout << status << endl; - } - break; - case '?' : - case 'h' : - cout << help << endl; - cout << "Command ? " << flush; - default: - break; + case '[' : { + cout << comms.LowerVolume(PSoundChannel::Player) << endl; + cout << "Command ? " << flush; + } + break; + case '{' : { + cout << comms.LowerVolume(PSoundChannel::Recorder) << endl; + cout << "Command ? " << flush; + } + break; + + + case ']' : { + cout << comms.RaiseVolume(PSoundChannel::Player) << endl; + cout << "Command ? " << flush; + } + break; + case '}' : { + cout << comms.RaiseVolume(PSoundChannel::Recorder) << endl; + cout << "Command ? " << flush; + } + break; + + case 'd' : { + PString message; + console >> message; + comms.DtmfReceivedFromTheWorld(message); + cout << "Command ? " << flush; + } + break; + case 'x' : + case 'q' : { + endNow = TRUE; + PTRACE(3, "End this program now "); + } + break; + case 's' : { + PString status; + comms.GetStatusInformation(status); + cout << status << endl; + } + break; + case '?' : + case 'h' : + cout << help << endl; + cout << "Command ? " << flush; + default: + break; } // end switch } // end for @@ -110,9 +135,9 @@ } -PCREATE_PROCESS(Audio) +PCREATE_PROCESS(Audio); - void Audio::Main() +void Audio::Main() { PArgList & args = GetArguments(); args.Parse( @@ -247,7 +272,6 @@ LaunchNewId lid(ourId, ourPassword); Comms c(lid); - c.Resume(); PTRACE(3, "Constructed the comms device "); @@ -278,7 +302,9 @@ PTRACE(3, "Failed to construct a writer for the audio. Exit now "); return; } - + + c.Resume(); //Get the coms to start working + PThread::Sleep(200); //Wait for the comms to work UserInterface ui(c, soundPlayer, soundRecorder); c.WaitForTermination();

1 0

[commit] r219 - sofaswitch/trunk/sound
by SofaSWITCH SVN 03 Jan '07

03 Jan '07

Author: derek Date: Tue Jan 2 22:35:49 2007 New Revision: 219 Modified: sofaswitch/trunk/sound/audio.cxx sofaswitch/trunk/sound/audio.h sofaswitch/trunk/sound/main.cxx Log: Big tidy up. Remove surplus code, and make it more "manageable". Make the flow of execution in the code much much tidier. Modified: sofaswitch/trunk/sound/audio.cxx ============================================================================== --- sofaswitch/trunk/sound/audio.cxx (original) +++ sofaswitch/trunk/sound/audio.cxx Tue Jan 2 22:35:49 2007 @@ -32,39 +32,32 @@ void TestAudioRead::Main() { - if (!OpenAudio(PSoundChannel::Recorder)) { - PTRACE(1, "TestAudioRead\tFAILED to open read device"); - return; - } - PTRACE(3, "TestAudioRead\tSound device is now open, start running"); + PBYTEArray data; + data.SetSize(oneChunk); + while (keepGoing) { - PBYTEArray data; - data.SetSize(480); - sound.Read(data.GetPointer(), data.GetSize()); - - if (!socket.IsOpen()) { - PTRACE(3, "Detected the closure of our udp socket, so end"); - keepGoing = FALSE; - break;; - } + PTRACE(6, "TestAudioRead\tREAD. Pre. Get " << oneChunk << " bytes"); - PINDEX lastReadCount = sound.GetLastReadCount(); - data.SetSize(lastReadCount); - PTRACE(6, "TestAudioRead\tREAD. send one frame to the remote node " - << data.GetSize() << " bytes"); - socket.Write(data.GetPointer(), data.GetSize()); - countPackets++; - } + sound.Read(data.GetPointer(), oneChunk); + PTRACE(6, "TestAudioRead\tREAD. Post. Send " << oneChunk << " bytes"); - if (!keepGoing) { - PTRACE(3, "keepgoing is false"); - } - - PTRACE(3, "End audio read thread"); + if (socket.IsOpen()) { + socket.Write(data.GetPointer(), oneChunk); + countPackets++; + } else { + PTRACE(3, "Detected the closure of our udp socket, so end"); + keepGoing = FALSE; + } + + if (!keepGoing) { + PTRACE(3, "keepgoing is false"); + } + } + PTRACE(3, "End audio READ thread"); } - + ////////////////////////////////////////////////////////////////////// TestAudioWrite::TestAudioWrite(PUDPSocket &_socket, PSoundChannel &_sound) @@ -85,13 +78,9 @@ void TestAudioWrite::Main() { - if (!OpenAudio(PSoundChannel::Player)) { - PTRACE(1, "TestAudioWrite\tFAILED to open play device"); - return; - } PTRACE(3, "TestAudioWrite\tSound device is now open, start running"); - PString threadName = PString("QueueToSpeaker"); + PString threadName = PString("QuToSpeaker"); PThread *q2s = PThread::Create(PCREATE_NOTIFIER(QueueToSpeakerMain), 30000, PThread::NoAutoDeleteThread, PThread::NormalPriority, @@ -99,18 +88,20 @@ PBYTEArray data; - data.SetSize(4800); + data.SetSize(oneChunk * 10); //Make it huge, to have enough space to read it all in. while (keepGoing) { socket.Read(data.GetPointer(), data.GetSize()); + PINDEX readSize = socket.GetLastReadCount(); + PTRACE(6, "Post Read of data from the socket. have " - << socket.GetLastReadCount() << " bytes"); + << readSize << " bytes"); if (!socket.IsOpen()) { PTRACE(3, "Detected the closure of our udp socket, so end"); keepGoing = FALSE; continue; } - PINDEX readSize = socket.GetLastReadCount(); + PWaitAndSignal m(accessMutex); if ((writeIndex + readSize) < buildSize) { memcpy (buffer + writeIndex, data.GetPointer(), readSize); @@ -122,7 +113,7 @@ memcpy(buffer, data.GetPointer() + firstHalf, secondHalf); writeIndex = secondHalf; } - PTRACE(6, "postWRITE of " << data.GetSize() << " bytes to sound device"); + PTRACE(6, "postWRITE of " << readSize << " bytes to sound device"); countPackets++; } @@ -139,7 +130,8 @@ void TestAudioWrite::QueueToSpeakerMain(PThread &, INT) { - while(keepGoing) { + while(keepGoing) + { { PWaitAndSignal m(accessMutex); PINDEX available; @@ -164,7 +156,7 @@ sound.Write(soundBuffer, oneChunk); PTRACE(6, "Play " << oneChunk << " bytes to the speaker "); } - + PTRACE(4, "End of queue to speaker main thread "); } @@ -194,12 +186,6 @@ socket.Close(); } -BOOL TestAudio::OpenAudio(enum PSoundChannel::Directions dir) -{ - return TRUE; -} - - void TestAudio::RaiseVolume() { if ((currentVolume + 5) < 101) Modified: sofaswitch/trunk/sound/audio.h ============================================================================== --- sofaswitch/trunk/sound/audio.h (original) +++ sofaswitch/trunk/sound/audio.h Tue Jan 2 22:35:49 2007 @@ -51,9 +51,6 @@ /**Name of our direction - read or write */ PString name; - /**Call that causes the audio device to open */ - BOOL OpenAudio(enum PSoundChannel::Directions dir); - /**The current volume, which is 0..100(max) */ PINDEX currentVolume; @@ -63,6 +60,15 @@ /** A count of the number of packets that have passed by */ PINDEX countPackets; + + /**The number of bytes we write/read from the sound system each time. We + only work in 480 byte blcoks, or 30ms sampels */ + enum { + /**30 ms of audio */ + oneChunk = 480 + }; + + }; ///////////////////////////////////////////////////////////////////////////// @@ -110,9 +116,7 @@ enum { /** 5000 is 0.3125 of a second of audio data, which is heaps. Such a large number saves us from wrapping round the end too often.*/ - buildSize= 5000, - /**30 ms of audio */ - oneChunk = 480 + buildSize= 5000 }; /**The mutex which protects access to the buffer and buffer variables */ Modified: sofaswitch/trunk/sound/main.cxx ============================================================================== --- sofaswitch/trunk/sound/main.cxx (original) +++ sofaswitch/trunk/sound/main.cxx Tue Jan 2 22:35:49 2007 @@ -305,7 +305,7 @@ if (!sound.Open(devName, dir, 1, 8000, 16)) { - cerr << "TestAudioRead:: Failed to open sound Playing/Recording device. Exit" << endl; + cerr << "TestAudio:: Failed to open sound Playing/Recording device. Exit" << endl; PTRACE(3, "TestAudio\tFailed to open device for " << name << " and device name of " << devName); return FALSE;

1 0

[commit] r218 - sofaswitch/trunk/callflow/src
by SofaSWITCH SVN 05 Dec '06

05 Dec '06

Author: derek Date: Tue Dec 5 16:28:59 2006 New Revision: 218 Modified: sofaswitch/trunk/callflow/src/transfermedia.cpp Log: Fix up a booboo in the text. Modified: sofaswitch/trunk/callflow/src/transfermedia.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/transfermedia.cpp (original) +++ sofaswitch/trunk/callflow/src/transfermedia.cpp Tue Dec 5 16:28:59 2006 @@ -1,13 +1,13 @@ -#include "wx/wxprec.h" +#include "wx/wxprec.h" -#ifdef __BORLANDC__ -#pragma hdrstop -#endif +#ifdef __BORLANDC__ +#pragma hdrstop +#endif -#ifndef WX_PRECOMP -#include "wx/wx.h" -#endif +#ifndef WX_PRECOMP +#include "wx/wx.h" +#endif #include <wx/textfile.h> #include <wx/tokenzr.h> #include "shapelist.h" @@ -22,14 +22,14 @@ { wxSize newSize(50, 50); SetSize(newSize); - + relInputPoints.Add(25, 0); relOutputPoints.Add(25, 50); - displayData[displayData.size()] = + displayData[displayData.size()] = InformationSection(wxT("First SofaSwitch worker (python)"), wxT("voip1")); - displayData[displayData.size()] = + displayData[displayData.size()] = InformationSection(wxT("Second SofaSwitch worker (python)"), wxT("am1")); AdjustIoPoints(); @@ -63,7 +63,7 @@ DrawArrow(dc, pA, ArrowDown, InputPointConnected(0) ? Connected : Loose); DrawArrow(dc, pB, ArrowDown, OutputPointConnected(0) ? Connected : Loose); - + DndShape::Draw(dc); } @@ -88,7 +88,7 @@ file.AddLine(" self.transport.write(self.rhost) "); file.AddLine(" return self.data[a][\"Output\"] "); file.AddLine(""); - + return true; } @@ -117,20 +117,20 @@ bool DndShapeTransferMedia::TestInternalVariables() { DndShape::TestInternalVariables(); - + bool firstEmpty = displayData[1].data.IsEmpty(); bool secondEmpty = displayData[2].data.IsEmpty(); - if (firstEmpty) + if (firstEmpty) SetCompileError(wxT("You must supply a valid python expression as the name of the first SofaSwitch worker")); - if (secondEmpty) + if (secondEmpty) SetCompileError(wxT("You must supply a valid python expression as the name of the second SofaSwitch worker")); if (firstEmpty && secondEmpty) SetCompileError(wxT("You must supply a valid python expression for the names of the two SofaSwitch workers")); - if (firstEmpty || secondEmpty) + if (firstEmpty || secondEmpty) return false; return true;

1 0

[commit] r217 - in sofaswitch/trunk: am callflow/docs callflow/docs/current mcu voip
by SofaSWITCH SVN 21 Nov '06

21 Nov '06

Author: derek Date: Tue Nov 21 18:41:02 2006 New Revision: 217 Modified: sofaswitch/trunk/am/audio.cxx sofaswitch/trunk/callflow/docs/current/eachicon.dxy sofaswitch/trunk/callflow/docs/description.dxy sofaswitch/trunk/mcu/audio.cxx sofaswitch/trunk/voip/mymanager.cxx Log: Update documentation on loadnewgraph extend mcu & am to cope with supersized packets. These supersize packets (eg 1280 byte) can be generated by the voip system. Modified: sofaswitch/trunk/am/audio.cxx ============================================================================== --- sofaswitch/trunk/am/audio.cxx (original) +++ sofaswitch/trunk/am/audio.cxx Tue Nov 21 18:41:02 2006 @@ -145,7 +145,7 @@ void AudioWrite::Main() { PBYTEArray data; - data.SetSize(480); + data.SetSize(4800); while (socket->IsOpen()) { socket->Read(data.GetPointer(), data.GetSize()); Modified: sofaswitch/trunk/callflow/docs/current/eachicon.dxy ============================================================================== --- sofaswitch/trunk/callflow/docs/current/eachicon.dxy (original) +++ sofaswitch/trunk/callflow/docs/current/eachicon.dxy Tue Nov 21 18:41:02 2006 @@ -419,15 +419,26 @@ populated by the \ref seubsecEventer item \li \code self.generatedEvents\endcode A list of events we have to examine at the next opportunity -\li \code self.keepGoing \endcode A flag to inidicate that we should keep +\li \code self.keepGoing \endcode A flag to indicate that we should keep working along this graph. If set to \c False , it is equivalent to processing a \ref subsecEndProcessing To send a message to a particular node, you would do \code self.transport.write("remId:the_message \0")\endcode -This may need to be modified to protect the quotes and backslash. + +In the test subdirectory, there is a \c parent.src and \c child.src file, +which are used to illustrate the operation of the "load new graph" item. The +parent runs a for loop, which creates 20 child processes. Each of the 20 child +proceses is the same, and executes a print statement. If you compile +\c parent.src to \c parent.py, and compile \c child.src to \c child.py, and +then do: +\code python parent.py \endcode +what happens? The server will report the creation and termination of 21 new +nodes. Further, analysis of the messages to and from the server shows the +blockiness of the processing. All new nodes are created at the same time, and +setup at the same time. Then, all created child nodes die at the same time. \subsection subsecMakeCall Make a call Make a call to some external entity is indicated by the toolbar icon and drawing area Modified: sofaswitch/trunk/callflow/docs/description.dxy ============================================================================== --- sofaswitch/trunk/callflow/docs/description.dxy (original) +++ sofaswitch/trunk/callflow/docs/description.dxy Tue Nov 21 18:41:02 2006 @@ -11,6 +11,8 @@ \li \ref secEvent \li \ref secUsage + +\section secIntro Introduction The language chosen to control the SofaSwitch utilties is Python. It is reasonably tidy language, cross platform, straightforward syntax and does not have the dependency hell of perl. Sadly nothing is easy, and it takes Modified: sofaswitch/trunk/mcu/audio.cxx ============================================================================== --- sofaswitch/trunk/mcu/audio.cxx (original) +++ sofaswitch/trunk/mcu/audio.cxx Tue Nov 21 18:41:02 2006 @@ -113,7 +113,7 @@ PSafePtr <Member> member = manager->activeMembers.FindWithLock(memberId, PSafeReadOnly); - PINDEX maxSize = 480; + PINDEX maxSize = 4800; PBYTEArray data; data.SetSize(maxSize); PINDEX readSize; Modified: sofaswitch/trunk/voip/mymanager.cxx ============================================================================== --- sofaswitch/trunk/voip/mymanager.cxx (original) +++ sofaswitch/trunk/voip/mymanager.cxx Tue Nov 21 18:41:02 2006 @@ -168,8 +168,8 @@ toDelete += "H.261(QCIF)"; toDelete += "RGB32"; toDelete += "RGB24"; - toDelete += "G.711-uLaw-64k"; - toDelete += "G.711-ALaw-64k"; +// toDelete += "G.711-uLaw-64k"; +// toDelete += "G.711-ALaw-64k"; PStringArray toRemove = args.GetOptionString('D').Lines(); PStringArray toReorder = args.GetOptionString('P').Lines(); toDelete += toRemove;

1 0

[commit] r216 - sofaswitch/trunk/sound
by SofaSWITCH SVN 21 Nov '06

21 Nov '06

Author: derek Date: Tue Nov 21 18:32:45 2006 New Revision: 216 Modified: sofaswitch/trunk/sound/audio.cxx Log: Read supersized packets from the network correctly. Modified: sofaswitch/trunk/sound/audio.cxx ============================================================================== --- sofaswitch/trunk/sound/audio.cxx (original) +++ sofaswitch/trunk/sound/audio.cxx Tue Nov 21 18:32:45 2006 @@ -99,7 +99,7 @@ PBYTEArray data; - data.SetSize(480); + data.SetSize(4800); while (keepGoing) { socket.Read(data.GetPointer(), data.GetSize());

1 0

[commit] r215 - in sofaswitch/trunk: callflow/src callflow/tests voip
by SofaSWITCH SVN 21 Nov '06

21 Nov '06

Author: derek Date: Tue Nov 21 16:03:10 2006 New Revision: 215 Modified: sofaswitch/trunk/callflow/src/startfor.cpp sofaswitch/trunk/callflow/tests/parent.src sofaswitch/trunk/voip/mymanager.cxx Log: Fix default operation in for loop. Modify parent example to launch 20 children, not one. Work on voip manager.cxx, to exclude g.711 codec. Not right - some issues here. Modified: sofaswitch/trunk/callflow/src/startfor.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/startfor.cpp (original) +++ sofaswitch/trunk/callflow/src/startfor.cpp Tue Nov 21 16:03:10 2006 @@ -36,7 +36,7 @@ InformationSection(wxT("Test for Termination (Python code)"), wxT("self.i < loops")); displayData[displayData.size()] = - InformationSection(wxT("Increment (Python code)"), wxT("self.i++")); + InformationSection(wxT("Increment (Python code)"), wxT("self.i+=1")); } void DndShapeStartFor::Draw(wxDC& dc) Modified: sofaswitch/trunk/callflow/tests/parent.src ============================================================================== --- sofaswitch/trunk/callflow/tests/parent.src (original) +++ sofaswitch/trunk/callflow/tests/parent.src Tue Nov 21 16:03:10 2006 @@ -1 +1 @@ -14574226 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>Terminating<ms><special>Python variable to hold event data<ms>self.termTime<ms><special> <Shape>14533200 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>timer<ms><special>Python variable to hold event data<ms>self.eventData<ms><special> <Shape>1851899 extra <special>Tool Tip<ms>Load New Graph<ms><special>new graph file (Python code)<ms>"child.graph"<ms><special>Python variable to pass to child<ms>self.data[a]<ms><special> <Shape>2564314 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>151850 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>2599249 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>20534247 extra <special>Tool Tip<ms>Death<ms><special> <Shape>10572265 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "child has terminated", self.termTime<ms><special> <Shape>12519146 extra <special>Tool Tip<ms>Timer<ms><special>Timer period (seconds, Python code)<ms>10<ms><special>Timer label (Python code)<ms>self.myId + "thistimer"<ms><special> <Shape> +918742187,236,283,240,285,42,334,44<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>1230742 extra <special>Tool Tip<ms>Timer<ms><special>Timer period (seconds, Python code)<ms>10<ms><special>Timer label (Python code)<ms>self.myId + "thistimer"<ms><special> <Shape>20322143 extra <special>Tool Tip<ms>Death<ms><special> <Shape>18160141 extra <special>Tool Tip<ms>Load New Graph<ms><special>new graph file (Python code)<ms>"child.graph"<ms><special>Python variable to pass to child<ms>self.data[a]<ms><special> <Shape>4154189 extra <special>Tool Tip<ms>End For Loop<ms><special> <Shape>2352210 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>9152120152,120,153,214<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>315393 extra <special>Tool Tip<ms>Start For<ms><special>Initialise (Python code)<ms>self.i = 0<ms><special>Test for Termination (Python code)<ms>self.i < 20<ms><special>Increment (Python code)<ms>self.i++<ms><special> <Shape>116046 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>14362122 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>Terminating<ms><special>Python variable to hold event data<ms>self.termTime<ms><special> <Shape>10360161 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "child has terminated", self.termTime<ms><special> <Shape>2387145 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>1432196 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>timer<ms><special>Python variable to hold event data<ms>self.eventData<ms><special> <Shape> Modified: sofaswitch/trunk/voip/mymanager.cxx ============================================================================== --- sofaswitch/trunk/voip/mymanager.cxx (original) +++ sofaswitch/trunk/voip/mymanager.cxx Tue Nov 21 16:03:10 2006 @@ -168,13 +168,15 @@ toDelete += "H.261(QCIF)"; toDelete += "RGB32"; toDelete += "RGB24"; - - if (args.HasOption('D')) - toDelete += args.GetOptionString('D').Lines(); + toDelete += "G.711-uLaw-64k"; + toDelete += "G.711-ALaw-64k"; + PStringArray toRemove = args.GetOptionString('D').Lines(); + PStringArray toReorder = args.GetOptionString('P').Lines(); + toDelete += toRemove; - SetMediaFormatMask(toDelete); + SetMediaFormatMask(toRemove); if (args.HasOption('P')) - SetMediaFormatOrder(args.GetOptionString('P').Lines()); + SetMediaFormatOrder(toReorder); cout << "Jitter buffer: " << GetMinAudioJitterDelay() << '-' << GetMaxAudioJitterDelay() << " ms\n" "Codecs removed: " << setfill(',') << GetMediaFormatMask() << "\n"

1 0

[commit] r214 - in sofaswitch/trunk/callflow: docs docs/current src
by SofaSWITCH SVN 20 Nov '06

20 Nov '06

Author: derek Date: Mon Nov 20 16:02:30 2006 New Revision: 214 Modified: sofaswitch/trunk/callflow/docs/current/eachicon.dxy sofaswitch/trunk/callflow/docs/description.dxy sofaswitch/trunk/callflow/src/shapelist.cpp Log: Append additional information to the files. Modified: sofaswitch/trunk/callflow/docs/current/eachicon.dxy ============================================================================== --- sofaswitch/trunk/callflow/docs/current/eachicon.dxy (original) +++ sofaswitch/trunk/callflow/docs/current/eachicon.dxy Mon Nov 20 16:02:30 2006 @@ -393,8 +393,40 @@ died before the child. In this case, the "advice on termination" mesasge is never sent - the server has nowhere to send it. +The compilation processes makes a python executable and a graph file. The +python executable is, in fact, able to process any graph file. This happens as +the python executable contains all the methods for all known types of +items. Indeed, if you compile two different graphs on the screen, the only +difference in the generated python code is the specified graph file. +When the python executable processes a graph file, the following variables are +available for the user to access. Sometimes, it is helpful to include a print +statement in development graphs to report on these variables. The user may +modify these variables (at their own peril) to give interesting results. For +example, one could modify self.data[a] to control which node in the graph is +executed next. + +\li \code self.data[a] \endcode The data structure describing this node on the graph +\li \code self.pendingEvents \endcode Holds the name of timers waiting to expire. +\li \code self.isMaster \endcode Boolean flag, if this graph is + generated directly from the command line. +\li \code self.parentId \endcode The id assigned to the parent graph by + the server, or \c None (if this graph + is generated directly from the command line) +\li \code self.myId \endcode The id assigned to this graph by the server +\li \code self.currentHandlers\endcode List of registered handlers, which is + populated by the \ref seubsecEventer item +\li \code self.generatedEvents\endcode A list of events we have to examine at + the next opportunity +\li \code self.keepGoing \endcode A flag to inidicate that we should keep + working along this graph. If set to \c + False , it is equivalent to processing + a \ref subsecEndProcessing + +To send a message to a particular node, you would do +\code self.transport.write("remId:the_message \0")\endcode +This may need to be modified to protect the quotes and backslash. \subsection subsecMakeCall Make a call Modified: sofaswitch/trunk/callflow/docs/description.dxy ============================================================================== --- sofaswitch/trunk/callflow/docs/description.dxy (original) +++ sofaswitch/trunk/callflow/docs/description.dxy Mon Nov 20 16:02:30 2006 @@ -1,7 +1,16 @@ /*! \page pageCallFlow Detailed description of CallFlow -\section secIntro Introduction +This page is provided as an introduction to the CallFlow utility. The +following sections are provided to help explain this utility and operation. +\li \ref secIntro +\li \ref secOverview +\li \ref secPython +\li \ref secHelloWorld +\li \ref secForLoop +\li \ref secEvent +\li \ref secUsage + The language chosen to control the SofaSwitch utilties is Python. It is reasonably tidy language, cross platform, straightforward syntax and does not have the dependency hell of perl. Sadly nothing is easy, and it takes @@ -67,7 +76,11 @@ To evaluate a conditional, the string is passed to the python command "eval", which returns a True or False value. +When the Python code executes, it has access to a number of variables relevant +to the processing of the graph. However, the user may access them if desired. +The user may change them, but this is not recommended. + \section secHelloWorld Hello World example Perhaps the simplest example of a graph you can create is the standard "Hello World" example, shown here. @@ -156,9 +169,6 @@ right mouse clicking on an item and adjusting the displayed setting. Some find it helpful to display in the tooltip of the forloop information about the number of loops that should be executed. - - - Modified: sofaswitch/trunk/callflow/src/shapelist.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/shapelist.cpp (original) +++ sofaswitch/trunk/callflow/src/shapelist.cpp Mon Nov 20 16:02:30 2006 @@ -431,7 +431,7 @@ file.AddLine(" along "); file.AddLine(" "); file.AddLine(" Note that when the timer object was initiated, an entry was put in "); - file.AddLine(" self.pendingEvent list statiing this event name. If the timer sas "); + file.AddLine(" self.pendingEvent list stating this event name. If the timer says "); file.AddLine(" deleted (after starting it) the corresponding event in the pending "); file.AddLine(" list will be absent "); file.AddLine(" \"\"\" ");

1 0

[commit] r213 - sofaswitch/trunk/callflow/tests
by SofaSWITCH SVN 20 Nov '06

20 Nov '06

Author: derek Date: Sun Nov 19 23:02:03 2006 New Revision: 213 Modified: sofaswitch/trunk/callflow/tests/makevoipcall.src Log: Fix connectivity issues, arising from software updates and size changes. Modified: sofaswitch/trunk/callflow/tests/makevoipcall.src ============================================================================== --- sofaswitch/trunk/callflow/tests/makevoipcall.src (original) +++ sofaswitch/trunk/callflow/tests/makevoipcall.src Sun Nov 19 23:02:03 2006 @@ -1,5 +1,4 @@ -14409257 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>requestsound<ms><special>Python variable to hold event data<ms>self.requestSound<ms><special> <Shape>119019 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>2425333 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>742303 extra <special>Tool Tip<ms>End Call<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special> <Shape>9506388506,388<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9214353214,353,216,402<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9418359421,359,418,448<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>1119171 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from (Python code)<ms>"voip"<ms><special>Timer period (seconds)<ms>1<ms><special>Timer label<ms>requestvoip<ms><special>Additional information (Python code)<ms><ms><special> <Shape>10198252 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "Have a new voip node on ", self.voipNode<ms><special> <Shape>10293279 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print " have a sound node of ", self.soundNode<ms><special> <Shape>15190450 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>self.voipNode<ms><special>Second SofaSwitch worker (python)<ms>self.soundNode<ms><special> <Shape>5189304 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>(self.voipNode != None) and (self.soundNode != None)<ms><special> <Shape>19216606 extra <special>Tool Tip<ms>Send Dtmf<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special>DTMF to send to worker node (python code)<ms>self.dtmfData<ms><special> <Shape>244394 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>5193579 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>self.dtmfData=="9"<ms><special> <Shape>2218330 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>20336255 extra <special>Tool Tip<ms>Death<ms><special> <Shape>2227517 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>2435276 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>2215653 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>9248182248,183,308,182<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>11191109 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from (Python code)<ms>"sound"<ms><special>Timer period (seconds)<ms>1<ms><special>Timer label<ms>requestsound<ms><special>Additional information (Python code)<ms><ms><special> <Shape>1050213 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "hangup, as dtmf 9 has been received"<ms><special> <Shape>14373236 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>requestvoip<ms><special>Python variable to hold event data<ms>self.requestVoip<ms><special> <Shape>1542257 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>13284231 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>requestsound<ms><special> <Shape>9386284386,284,386,313,424,314<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14202162 extra <special>Tool Tip<ms>Catch the creation of -the voip node<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>voipREQ<ms><special>Python variable to hold event data<ms>self.voipNode<ms><special> <Shape>14204496 extra <special>Tool Tip<ms>Catch DTMF events<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>DTMF<ms><special>Python variable to hold event data<ms>self.dtmfData<ms><special> <Shape>10200531 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "dtmf received of ", self.dtmfData<ms><special> <Shape>965199218,629,124,630,119,203,65,199,69,215<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14295185 extra <special>Tool Tip<ms>Catch the creation -of the sound node<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>soundREQU<ms><special>Python variable to hold event data<ms>self.soundNode<ms><special> <Shape>13189210 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>requestvoip<ms><special> <Shape>9216573216,573<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>97260418,498,391,731,7,726,18,260,66,260<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14333211 extra <special>Tool Tip<ms>Catch the timer which, when fired, -indicates the end of this call<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>hanguptime<ms><special>Python variable to hold event data<ms>self.hanguptime<ms><special> <Shape>9214307214,307,308,331<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>5397310 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>(self.requestVoip==None) or(self.requestSound==None)<ms><special> <Shape>6189402 extra <special>Tool Tip<ms>Make Call<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special>Call destination (python code)<ms>"h323:h323.voxgratia.org"<ms><special> <Shape>10403444 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "End this as the voip or sound did not respond in time"<ms><special> <Shape>1243349 extra <special>Tool Tip<ms>Initiate a timer, which causes this to -end.<ms><special>Timer period (seconds)<ms>0.1<ms><special>Timer label (string literal)<ms>hanguptime<ms><special> <Shape> +9216573216,573<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>6189402 extra <special>Tool Tip<ms>Make Call<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special>Call destination (python code)<ms>"h323:h323.voxgratia.org"<ms><special> <Shape>119019 extra <special>Tool Tip<ms>Start Processing<ms><special> <Shape>742303 extra <special>Tool Tip<ms>End Call<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special> <Shape>14373236 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>requestvoip<ms><special>Python variable to hold event data<ms>self.requestVoip<ms><special> <Shape>14409257 extra <special>Tool Tip<ms>Eventer<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>requestsound<ms><special>Python variable to hold event data<ms>self.requestSound<ms><special> <Shape>5397310 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>(self.requestVoip==None) or(self.requestSound==None)<ms><special> <Shape>244394 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>9214307214,307,308,331<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>13284231 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>requestsound<ms><special> <Shape>2227517 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>9506388506,388<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>2218330 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>2215653 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>19216606 extra <special>Tool Tip<ms>Send Dtmf<ms><special>Worker node to activate (python code)<ms>self.voipNode<ms><special>DTMF to send to worker node (python code)<ms>self.dtmfData<ms><special> <Shape>1119171 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from (Python code)<ms>"voip"<ms><special>Timer period (seconds)<ms>1<ms><special>Timer label<ms>requestvoip<ms><special>Additional information (Python code)<ms><ms><special> <Shape>10293279 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print " have a sound node of ", self.soundNode<ms><special> <Shape>13189210 extra <special>Tool Tip<ms>Stop Timer<ms><special>Timer to stop<ms>requestvoip<ms><special> <Shape>965199218,629,124,630,119,203,65,199,69,215<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9418359421,359,418,448<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>1542257 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>1244346 extra <special>Tool Tip<ms>Timer<ms><special>Timer period (seconds, Python code)<ms>1<ms><special>Timer label (Python code)<ms>"hanguptime"<ms><special> <Shape>15190450 extra <special>Tool Tip<ms>Transfer Media<ms><special>First SofaSwitch worker (python)<ms>self.voipNode<ms><special>Second SofaSwitch worker (python)<ms>self.soundNode<ms><special> <Shape>10403444 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "End this as the voip or sound did not respond in time"<ms><special> <Shape>20336255 extra <special>Tool Tip<ms>Death<ms><special> <Shape>14202162 extra <special>Tool Tip<ms>Catch the creation of +the voip node<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>voipREQ<ms><special>Python variable to hold event data<ms>self.voipNode<ms><special> <Shape>9386284386,284,386,313,424,314<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>9248182248,183,308,182<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>2435276 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>10198252 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "Have a new voip node on ", self.voipNode<ms><special> <Shape>1050213 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "hangup, as dtmf 9 has been received"<ms><special> <Shape>14204496 extra <special>Tool Tip<ms>Catch DTMF events<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>DTMF<ms><special>Python variable to hold event data<ms>self.dtmfData<ms><special> <Shape>11191109 extra <special>Tool Tip<ms>Request Node<ms><special>Request node from (Python code)<ms>"sound"<ms><special>Timer period (seconds)<ms>1<ms><special>Timer label<ms>requestsound<ms><special>Additional information (Python code)<ms><ms><special> <Shape>5189304 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>(self.voipNode != None) and (self.soundNode != None)<ms><special> <Shape>9214353214,353,216,402<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>97260418,498,391,731,7,726,18,260,66,260<special>Tool Tip<ms>Join blocks shape<ms><special> <Shape>14333211 extra <special>Tool Tip<ms>Catch the timer which, when fired, +indicates the end of this call<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>hanguptime<ms><special>Python variable to hold event data<ms>self.hanguptime<ms><special> <Shape>5193579 extra <special>Tool Tip<ms>Conditional<ms><special>Test (Python code)<ms>self.dtmfData=="9"<ms><special> <Shape>10200531 extra <special>Tool Tip<ms>Python<ms><special>Python Code<ms>print "dtmf received of ", self.dtmfData<ms><special> <Shape>2425333 extra <special>Tool Tip<ms>End Processing<ms><special> <Shape>14295185 extra <special>Tool Tip<ms>Catch the creation +of the sound node<ms><special>Event sought (Python code)<ms><ms><special>Event sought (Regular Exp)<ms>soundREQU<ms><special>Python variable to hold event data<ms>self.soundNode<ms><special> <Shape>

1 0