June 2008 - sofaswitch-svn@lists.freeswitch.org

[Sofaswitch-svn] [commit] r423 - sofaswitch/trunk/callflow/src
by SofaSWITCH SVN 19 Jun '08

19 Jun '08

Author: derek Date: Wed Jun 18 23:46:07 2008 New Revision: 423 Modified: sofaswitch/trunk/callflow/src/callflow.cpp sofaswitch/trunk/callflow/src/callflow.h sofaswitch/trunk/callflow/src/canvas.cpp sofaswitch/trunk/callflow/src/canvas.h Log: Work hard to get keyboard events to be detected. They refuse to be detected.ARRRGGGH. Modified: sofaswitch/trunk/callflow/src/callflow.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/callflow.cpp (original) +++ sofaswitch/trunk/callflow/src/callflow.cpp Wed Jun 18 23:46:07 2008 @@ -116,7 +116,8 @@ EVT_MENU ( wxH_FILESAVE__AS, MyFrame::OnFileSave__As) EVT_MENU ( wxH_HELPABOUT, MyFrame::OnHelpAbout) EVT_MENU ( wxH_HELPMANUAL, MyFrame::OnHelpManual) - EVT_CHAR_HOOK(MyFrame::OnKeyDown) + EVT_CHAR_HOOK(MyFrame::OnAnyKeyDown) + EVT_KEY_DOWN(MyFrame::OnAnyKeyDown) EVT_CLOSE(MyFrame::OnClose) END_EVENT_TABLE() @@ -142,6 +143,12 @@ MyFrame *frame = new MyFrame (wxT("Callflow"), wxPoint(20,20), wxSize(600,450)); + frame->PushEventHandler(new FrameKeyEvtHandler(*frame)); + + frame->Connect(wxID_ANY, + wxEVT_KEY_DOWN, + wxKeyEventHandler(MyFrame::OnKeyDown), + NULL, this); frame->Show (TRUE); ::wxInitAllImageHandlers(); @@ -229,9 +236,9 @@ SetSize(1100, 700); } -void MyFrame::OnKeyDown(wxKeyEvent & event) +void MyFrame::OnAnyKeyDown(wxKeyEvent & event) { - canvas->HandleKeyDown(event); + canvas->OnKeyDown(event); } void MyFrame::OnClose (wxCloseEvent& event) @@ -701,6 +708,24 @@ } +///////////////////////////////////////////////////////////////////////////// + +FrameKeyEvtHandler::FrameKeyEvtHandler(MyFrame &_myFrame) +: myFrame(_myFrame) +{ +} + +void FrameKeyEvtHandler::OnKeyDown(wxKeyEvent & event) +{ + myFrame.OnKeyDown(event); +} + +BEGIN_EVENT_TABLE(FrameKeyEvtHandler, wxEvtHandler) +EVT_KEY_DOWN(FrameKeyEvtHandler::OnKeyDown) +END_EVENT_TABLE(); + + + /* The comment below is magic for those who use emacs to edit this file. With * the comment below, the tab key does auto indent to 4 spaces. * Modified: sofaswitch/trunk/callflow/src/callflow.h ============================================================================== --- sofaswitch/trunk/callflow/src/callflow.h (original) +++ sofaswitch/trunk/callflow/src/callflow.h Wed Jun 18 23:46:07 2008 @@ -83,11 +83,14 @@ /**Destructor */ ~MyFrame (); - protected: /**Process event - character read from the keyboard when the key is pressed */ - void OnKeyDown(wxKeyEvent & event); + void OnKeyDown(wxKeyEvent & event) { OnAnyKeyDown(event); } + protected: + /**Process event - character read from the keyboard when the key + is pressed */ + void OnAnyKeyDown(wxKeyEvent & event); public: /**Called in response to a shutdown command issued from somewhere */ @@ -315,6 +318,33 @@ }; + +///////////////////////////////////////////////////////////////////////////// + + +class FrameKeyEvtHandler : public wxEvtHandler +{ +public: + /**Constructor */ + FrameKeyEvtHandler(MyFrame & _myFrame); + + /**Destructor */ + ~FrameKeyEvtHandler() { } + + /**The key down event goes here */ + void OnKeyDown(wxKeyEvent & event); + +private: + /**Reference back to the class that has to collect the event */ + MyFrame & myFrame; + + /**Make WxWidgets happy, use this macro, which means we collect + key events in this class */ + DECLARE_EVENT_TABLE() +}; + + + #endif Modified: sofaswitch/trunk/callflow/src/canvas.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/canvas.cpp (original) +++ sofaswitch/trunk/callflow/src/canvas.cpp Wed Jun 18 23:46:07 2008 @@ -39,6 +39,7 @@ EVT_ENTER_WINDOW (MyCanvas::OnMouseEnter) EVT_LEAVE_WINDOW (MyCanvas::OnMouseLeave) EVT_CHAR_HOOK (MyCanvas::OnKeyDown) + EVT_KEY_DOWN (MyCanvas::OnKeyDown) EVT_TIMER (TimerId, MyCanvas::OnProgressTimer) END_EVENT_TABLE () @@ -52,6 +53,10 @@ timerActivity = new wxTimer (this, TimerId); timerActivity->Start (500); + Connect(wxID_ANY, + wxEVT_KEY_DOWN, + wxKeyEventHandler(MyCanvas::OnKeyDown), + NULL, this); } @@ -651,7 +656,7 @@ void KeyEvtHandler::OnKeyDown(wxKeyEvent & event) { - myCanvas.HandleKeyDown(event); + myCanvas.OnKeyDown(event); } BEGIN_EVENT_TABLE(KeyEvtHandler, wxEvtHandler) Modified: sofaswitch/trunk/callflow/src/canvas.h ============================================================================== --- sofaswitch/trunk/callflow/src/canvas.h (original) +++ sofaswitch/trunk/callflow/src/canvas.h Wed Jun 18 23:46:07 2008 @@ -25,10 +25,9 @@ /**Destroy this canvas, which is called by the system on close down */ ~MyCanvas (); - - /**Alllow the onKeyDown method to be called... */ - void HandleKeyDown(wxKeyEvent & event) - { OnKeyDown(event); } + /**Process event - character read from the keyboard when the key + is pressed */ + void OnKeyDown(wxKeyEvent & event); /**Process event - left mouse button has been pressed */ void OnLeftDown (wxMouseEvent & event); @@ -128,9 +127,6 @@ DECLARE_EVENT_TABLE(); protected: - /**Process event - character read from the keyboard when the key - is pressed */ - void OnKeyDown(wxKeyEvent & event); /**Given a mouse event at some location, what is the correct (in this canvas view point) location of this event? This method @@ -211,10 +207,6 @@ - - - - #endif

1 0

[Sofaswitch-svn] [commit] r422 - sofaswitch/trunk/callflow/src
by SofaSWITCH SVN 16 Jun '08

16 Jun '08

Author: derek Date: Mon Jun 16 01:10:08 2008 New Revision: 422 Modified: sofaswitch/trunk/callflow/src/callflow.cpp sofaswitch/trunk/callflow/src/callflow.h sofaswitch/trunk/callflow/src/canvas.cpp sofaswitch/trunk/callflow/src/canvas.h Log: Another attempt to make event handling of key clicks work. Modified: sofaswitch/trunk/callflow/src/callflow.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/callflow.cpp (original) +++ sofaswitch/trunk/callflow/src/callflow.cpp Mon Jun 16 01:10:08 2008 @@ -167,7 +167,8 @@ { // create a child control here canvas = new MyCanvas(this); - + canvas->PushEventHandler(new KeyEvtHandler(*canvas)); + // menu setup goes here tbarVertical = NULL; wxMenu * Edit_menu = new wxMenu ; @@ -230,7 +231,7 @@ void MyFrame::OnKeyDown(wxKeyEvent & event) { - canvas->OnKeyDown(event); + canvas->HandleKeyDown(event); } void MyFrame::OnClose (wxCloseEvent& event) Modified: sofaswitch/trunk/callflow/src/callflow.h ============================================================================== --- sofaswitch/trunk/callflow/src/callflow.h (original) +++ sofaswitch/trunk/callflow/src/callflow.h Mon Jun 16 01:10:08 2008 @@ -83,10 +83,13 @@ /**Destructor */ ~MyFrame (); + protected: /**Process event - character read from the keyboard when the key is pressed */ void OnKeyDown(wxKeyEvent & event); - + + public: + /**Called in response to a shutdown command issued from somewhere */ void OnClose (wxCloseEvent& event); Modified: sofaswitch/trunk/callflow/src/canvas.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/canvas.cpp (original) +++ sofaswitch/trunk/callflow/src/canvas.cpp Mon Jun 16 01:10:08 2008 @@ -642,6 +642,23 @@ } +///////////////////////////////////////////////////////////////////////////// + +KeyEvtHandler::KeyEvtHandler(MyCanvas &_myCanvas) +: myCanvas(_myCanvas) +{ +} + +void KeyEvtHandler::OnKeyDown(wxKeyEvent & event) +{ + myCanvas.HandleKeyDown(event); +} + +BEGIN_EVENT_TABLE(KeyEvtHandler, wxEvtHandler) +EVT_KEY_DOWN(KeyEvtHandler::OnKeyDown) +END_EVENT_TABLE(); + + /* The comment below is magic for those who use emacs to edit this file. With * the comment below, the tab key does auto indent to 4 spaces. Modified: sofaswitch/trunk/callflow/src/canvas.h ============================================================================== --- sofaswitch/trunk/callflow/src/canvas.h (original) +++ sofaswitch/trunk/callflow/src/canvas.h Mon Jun 16 01:10:08 2008 @@ -25,9 +25,10 @@ /**Destroy this canvas, which is called by the system on close down */ ~MyCanvas (); - /**Process event - character read from the keyboard when the key - is pressed */ - void OnKeyDown(wxKeyEvent & event); + + /**Alllow the onKeyDown method to be called... */ + void HandleKeyDown(wxKeyEvent & event) + { OnKeyDown(event); } /**Process event - left mouse button has been pressed */ void OnLeftDown (wxMouseEvent & event); @@ -124,9 +125,13 @@ bool Compile(wxTextFile & file) { return activeShapes.Compile(file); } - DECLARE_EVENT_TABLE() + DECLARE_EVENT_TABLE(); protected: + /**Process event - character read from the keyboard when the key + is pressed */ + void OnKeyDown(wxKeyEvent & event); + /**Given a mouse event at some location, what is the correct (in this canvas view point) location of this event? This method returns the value sought. */ @@ -182,6 +187,34 @@ /**The mouse position at which we were told the mouse last moved */ wxPoint lastMouseMovePoint; }; + +///////////////////////////////////////////////////////////////////////////// + + +class KeyEvtHandler : public wxEvtHandler +{ +public: + /**Constructor */ + KeyEvtHandler(MyCanvas & _myCanvas); + + /**The key down event goes here */ + void OnKeyDown(wxKeyEvent & event); + +private: + /**Reference back to the class that has to collect the event */ + MyCanvas & myCanvas; + + /**Make WxWidgets happy, use this macro, which means we collect + key events in this class */ + DECLARE_EVENT_TABLE() +}; + + + + + + + #endif

1 0

[Sofaswitch-svn] [commit] r421 - sofaswitch/trunk/callflow/src
by SofaSWITCH SVN 15 Jun '08

15 Jun '08

Author: derek Date: Sun Jun 15 19:28:22 2008 New Revision: 421 Modified: sofaswitch/trunk/callflow/src/callflow.cpp sofaswitch/trunk/callflow/src/callflow.h sofaswitch/trunk/callflow/src/canvas.cpp sofaswitch/trunk/callflow/src/canvas.h Log: Try (unsuccessfully) to get the editor to respond to keypresses. This USED to work. Now, the thing is a bit broken. Sigh Modified: sofaswitch/trunk/callflow/src/callflow.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/callflow.cpp (original) +++ sofaswitch/trunk/callflow/src/callflow.cpp Sun Jun 15 19:28:22 2008 @@ -116,6 +116,7 @@ EVT_MENU ( wxH_FILESAVE__AS, MyFrame::OnFileSave__As) EVT_MENU ( wxH_HELPABOUT, MyFrame::OnHelpAbout) EVT_MENU ( wxH_HELPMANUAL, MyFrame::OnHelpManual) + EVT_CHAR_HOOK(MyFrame::OnKeyDown) EVT_CLOSE(MyFrame::OnClose) END_EVENT_TABLE() @@ -227,7 +228,10 @@ SetSize(1100, 700); } - +void MyFrame::OnKeyDown(wxKeyEvent & event) +{ + canvas->OnKeyDown(event); +} void MyFrame::OnClose (wxCloseEvent& event) { Modified: sofaswitch/trunk/callflow/src/callflow.h ============================================================================== --- sofaswitch/trunk/callflow/src/callflow.h (original) +++ sofaswitch/trunk/callflow/src/callflow.h Sun Jun 15 19:28:22 2008 @@ -82,6 +82,10 @@ /**Destructor */ ~MyFrame (); + + /**Process event - character read from the keyboard when the key + is pressed */ + void OnKeyDown(wxKeyEvent & event); /**Called in response to a shutdown command issued from somewhere */ void OnClose (wxCloseEvent& event); Modified: sofaswitch/trunk/callflow/src/canvas.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/canvas.cpp (original) +++ sofaswitch/trunk/callflow/src/canvas.cpp Sun Jun 15 19:28:22 2008 @@ -38,7 +38,7 @@ EVT_PAINT (MyCanvas::OnPaint) EVT_ENTER_WINDOW (MyCanvas::OnMouseEnter) EVT_LEAVE_WINDOW (MyCanvas::OnMouseLeave) - EVT_CHAR (MyCanvas::OnChar) + EVT_CHAR_HOOK (MyCanvas::OnKeyDown) EVT_TIMER (TimerId, MyCanvas::OnProgressTimer) END_EVENT_TABLE () @@ -429,12 +429,13 @@ } void -MyCanvas::OnChar (wxKeyEvent & event) +MyCanvas::OnKeyDown (wxKeyEvent & event) { wxString key; bool changedScreen = false; - long keycode = event.GetKeyCode (); + long keycode = event.GetKeyCode(); + std::cerr << " have a key, " << keycode << std::endl; if (keycode == WXK_DELETE) { RemoveSelectedShapes (); Modified: sofaswitch/trunk/callflow/src/canvas.h ============================================================================== --- sofaswitch/trunk/callflow/src/canvas.h (original) +++ sofaswitch/trunk/callflow/src/canvas.h Sun Jun 15 19:28:22 2008 @@ -25,8 +25,9 @@ /**Destroy this canvas, which is called by the system on close down */ ~MyCanvas (); - /**Process event - character read from the keyboard */ - void OnChar(wxKeyEvent& event); + /**Process event - character read from the keyboard when the key + is pressed */ + void OnKeyDown(wxKeyEvent & event); /**Process event - left mouse button has been pressed */ void OnLeftDown (wxMouseEvent & event);

1 0

[Sofaswitch-svn] [commit] r420 - sofaswitch/trunk/server
by SofaSWITCH SVN 13 Jun '08

13 Jun '08

Author: derek Date: Thu Jun 12 23:12:30 2008 New Revision: 420 Modified: sofaswitch/trunk/server/client.py Log: tidy up the command line handler to do things like up-arrow correctly, and to have a prompt symbol. Modified: sofaswitch/trunk/server/client.py ============================================================================== --- sofaswitch/trunk/server/client.py (original) +++ sofaswitch/trunk/server/client.py Thu Jun 12 23:12:30 2008 @@ -6,7 +6,7 @@ # See the description in server.py on how you use this program. # -import socket, os, sys, thread +import readline, socket, os, sys, thread if len(sys.argv) < 3: print "Syntax: client.py myId destination_host" @@ -35,7 +35,7 @@ thread.start_new(report_incoming,()) while True: - value = sys.stdin.readline() + value = raw_input("> ") value = value.strip() if value == 'end': sys.exit()

1 0

[Sofaswitch-svn] [commit] r419 - in sofaswitch/trunk/sofa: include/sofa src
by SofaSWITCH SVN 13 Jun '08

13 Jun '08

Author: derek Date: Thu Jun 12 23:11:52 2008 New Revision: 419 Modified: sofaswitch/trunk/sofa/include/sofa/messages.h sofaswitch/trunk/sofa/src/messages.cxx Log: Add handling of the messageframe so that descendants can work out when they have started running. Tidy up the dumpmem command, to have less allocs in it. Modified: sofaswitch/trunk/sofa/include/sofa/messages.h ============================================================================== --- sofaswitch/trunk/sofa/include/sofa/messages.h (original) +++ sofaswitch/trunk/sofa/include/sofa/messages.h Thu Jun 12 23:11:52 2008 @@ -128,6 +128,10 @@ process of closing down */ bool IsTerminating() { return !keepGoing; } + /**report to the descendant class that all initialisation has + finished, and that this class is operational and running */ + virtual void OnRunning() { }; + protected: /**Called when this thread finishes. An application would call @@ -236,9 +240,10 @@ 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 - file. This command checks the the file is specified in the command line. - If specified, all objects are dumped to that file.*/ + /**we have received a command asking us to write all current + allocations to the specified file. This command checks the the + file is specified in the command line. If specified, all + objects are dumped to that file.*/ virtual void ProcessMemoryDump(PStringArray &cmds, PString & sender); #endif @@ -338,6 +343,12 @@ to. */ PString mediaPartner; +#ifdef PMEMORY_CHECK + /**The state of the memory at which we last did a dump. This + variable is updated each time we do a memory dump */ + static PMemoryHeap::State memoryState; +#endif + private: /**Close the messages socket, and send a terminating message to the remote controller. Only this class can close this @@ -373,12 +384,6 @@ /**Flag to indicate it is time to end this thread. It is only set by the MessageFrame::Terminate() method */ bool keepGoing; - -#ifdef PMEMORY_CHECK - /**The state of the memory at which we last did a dump. This variable is updated - each time we do a memory dump */ - static PMemoryHeap::State memoryState; -#endif }; //////////////////////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/sofa/src/messages.cxx ============================================================================== --- sofaswitch/trunk/sofa/src/messages.cxx (original) +++ sofaswitch/trunk/sofa/src/messages.cxx Thu Jun 12 23:11:52 2008 @@ -312,6 +312,8 @@ Initialise(); PTRACE(3, "Initialise all done "); + OnRunning(); //Callback to the descendant class that we are running fine. + if (!keepGoing) { PTRACE(3, "END fail warning of message frame thread for " << ourId); } @@ -329,8 +331,6 @@ << messagesSocket.GetErrorText()); PTRACE(3, "End Process Incoming Messages as we had a read error."); keepGoing = false; - SilentlyEndAll(); - CloseMessagesSocket(); } } @@ -800,37 +800,8 @@ #ifdef PMEMORY_CHECK void MessageFrame::ProcessMemoryDump(PStringArray &cmds, PString & sender) { - if (cmds.GetSize() != 2) { - PStringStream error; - error << cmds[0] << " Failed - Output file not specified"; - PTRACE(3, error << sender); - SendThisMessageTo(error, sender); - return; - } - - PTRACE(3, "Dump current memory usage to \"" << cmds[1] << "\""); + PMemoryHeap::DumpObjectsSince(memoryState); - PTextFile outputFile; - if (!outputFile.Open(cmds[1], PFile::WriteOnly, - PFile::Create + PFile::Truncate)) { - PStringStream error; - error << "Failed to open the specified file " - << cmds[1] - << " to dump memory to"; - SendThisMessageTo(error, sender); - PTRACE(3, error); - return; - } - PStringStream status; - status << "Dump memory usage info to the file " << cmds[1]; - cerr << status << endl; - SendThisMessageTo(status, sender); - PMemoryHeap::DumpStatistics(); - - PStringStream result; - PMemoryHeap::DumpObjectsSince(memoryState, result); - outputFile.WriteLine(result); - outputFile.Close(); PMemoryHeap::GetState(memoryState); return; }

1 0

[Sofaswitch-svn] [commit] r418 - sofaswitch/trunk/voip
by SofaSWITCH SVN 13 Jun '08

13 Jun '08

Author: derek Date: Thu Jun 12 23:10:18 2008 New Revision: 418 Modified: sofaswitch/trunk/voip/Makefile sofaswitch/trunk/voip/comms.cxx sofaswitch/trunk/voip/jocall.cxx sofaswitch/trunk/voip/main.cxx sofaswitch/trunk/voip/mymanager.cxx sofaswitch/trunk/voip/supervisor.cxx sofaswitch/trunk/voip/supervisor.h sofaswitch/trunk/voip/udpconnection.cxx sofaswitch/trunk/voip/udpep.cxx sofaswitch/trunk/voip/udpsound.cxx Log: Tidy up the handling of memory leak checking, add some callbacks to find when the supervisor has started. Modified: sofaswitch/trunk/voip/Makefile ============================================================================== --- sofaswitch/trunk/voip/Makefile (original) +++ sofaswitch/trunk/voip/Makefile Thu Jun 12 23:10:18 2008 @@ -51,7 +51,6 @@ ################################################## - ifndef OPALDIR ifneq (,$(wildcard $(HOME)/opal)) OPALDIR=$(HOME)/opal Modified: sofaswitch/trunk/voip/comms.cxx ============================================================================== --- sofaswitch/trunk/voip/comms.cxx (original) +++ sofaswitch/trunk/voip/comms.cxx Thu Jun 12 23:10:18 2008 @@ -39,7 +39,6 @@ #define new PNEW - //////////////////////////////////////////////////////////////////////////////// Comms::Comms(LaunchNewId & _lid, MyManager & _manager) Modified: sofaswitch/trunk/voip/jocall.cxx ============================================================================== --- sofaswitch/trunk/voip/jocall.cxx (original) +++ sofaswitch/trunk/voip/jocall.cxx Thu Jun 12 23:10:18 2008 @@ -49,7 +49,6 @@ #define new PNEW - ///////////////////////////////////////////////////////////////////////////// #ifdef _MSC_VER Modified: sofaswitch/trunk/voip/main.cxx ============================================================================== --- sofaswitch/trunk/voip/main.cxx (original) +++ sofaswitch/trunk/voip/main.cxx Thu Jun 12 23:10:18 2008 @@ -65,7 +65,6 @@ #define new PNEW - PCREATE_PROCESS(VoipProcess); @@ -80,7 +79,6 @@ void VoipProcess::Main() { - void mtrace(void); cout << GetName() << " Version " << GetVersion(true) << " by " << GetManufacturer() Modified: sofaswitch/trunk/voip/mymanager.cxx ============================================================================== --- sofaswitch/trunk/voip/mymanager.cxx (original) +++ sofaswitch/trunk/voip/mymanager.cxx Thu Jun 12 23:10:18 2008 @@ -78,6 +78,7 @@ #include "udpconnection.h" #define new PNEW + /////////////////////////////////////////////////////////////// MyManager::MyManager(LaunchNewId & _lid, @@ -536,8 +537,13 @@ } PSortedStringList currentNames; - for (PSafePtr<OpalCall>call = activeCalls; call != NULL; ++call) - currentNames.AppendString((PSafePtrCast<OpalCall, MyOpalCall>(call))->GetOurId()); + for (PSafePtr<OpalCall>call = activeCalls; call != NULL; ++call) { + MyOpalCall *c = PSafePtrCast<OpalCall, MyOpalCall>(call); + if (c != NULL) + currentNames.AppendString(c->GetOurId()); + else + currentNames.AppendString("No name - weird"); + } if (currentNames.GetSize() > 0) { status << "Current active calls " << endl; Modified: sofaswitch/trunk/voip/supervisor.cxx ============================================================================== --- sofaswitch/trunk/voip/supervisor.cxx (original) +++ sofaswitch/trunk/voip/supervisor.cxx Thu Jun 12 23:10:18 2008 @@ -43,7 +43,6 @@ #define new PNEW - //////////////////////////////////////////////////////////////////////////////// @@ -66,6 +65,19 @@ { PTRACE(3, "Supervisor thread has ended"); } + +void Supervisor::OnRunning() +{ + PTRACE(3, "Create a supervisor all done"); + PTRACE(3, "Supervisor initialisation done"); + PTRACE(3, "Supervisor wait for commands now"); + +#ifdef PMEMORY_CHECK + PMemoryHeap::GetState(memoryState); + cerr << "currently on allocation number " + << memoryState.allocationNumber << endl; +#endif +} void Supervisor::ProcessAnswer(PStringArray &cmds, PString & sender) { Modified: sofaswitch/trunk/voip/supervisor.h ============================================================================== --- sofaswitch/trunk/voip/supervisor.h (original) +++ sofaswitch/trunk/voip/supervisor.h Thu Jun 12 23:10:18 2008 @@ -58,6 +58,10 @@ /**Destructor */ ~Supervisor(); + /**This class wants to know that things are happening, so it can do + things like memory leak checkpoints */ + virtual void OnRunning(); + protected: /**The supervisor has completed. This method is called when this supervisor instance terminates. Since there is only one @@ -104,7 +108,8 @@ /**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(); - + + ////////////////////////////////////////////// private: /**The interface to the external script which runs python, to provide XMPP comms for us */ Modified: sofaswitch/trunk/voip/udpconnection.cxx ============================================================================== --- sofaswitch/trunk/voip/udpconnection.cxx (original) +++ sofaswitch/trunk/voip/udpconnection.cxx Thu Jun 12 23:10:18 2008 @@ -61,7 +61,6 @@ #include "udpsound.h" #include "counts.h" - #define new PNEW ///////////////////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/voip/udpep.cxx ============================================================================== --- sofaswitch/trunk/voip/udpep.cxx (original) +++ sofaswitch/trunk/voip/udpep.cxx Thu Jun 12 23:10:18 2008 @@ -52,6 +52,7 @@ #include "udpep.h" #include "udpsound.h" + #define new PNEW ///////////////////////////////////////////////////////////////////////////// Modified: sofaswitch/trunk/voip/udpsound.cxx ============================================================================== --- sofaswitch/trunk/voip/udpsound.cxx (original) +++ sofaswitch/trunk/voip/udpsound.cxx Thu Jun 12 23:10:18 2008 @@ -44,7 +44,6 @@ #define new PNEW - PString GetSSLabel(bool isSource) { if (isSource)

1 0