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

[Sofaswitch-svn] [commit] r405 - sofaswitch/trunk/sofa/src
by SofaSWITCH SVN 23 Apr '08

23 Apr '08

Author: derek Date: Wed Apr 23 00:38:52 2008 New Revision: 405 Modified: sofaswitch/trunk/sofa/src/messages.cxx Log: Make current with ptlib. Modified: sofaswitch/trunk/sofa/src/messages.cxx ============================================================================== --- sofaswitch/trunk/sofa/src/messages.cxx (original) +++ sofaswitch/trunk/sofa/src/messages.cxx Wed Apr 23 00:38:52 2008 @@ -840,7 +840,8 @@ PMemoryHeap::DumpStatistics(); PStringStream result; - PMemoryHeap::DumpObjectsSince(0, result); + PMemoryHeap::State state; + PMemoryHeap::DumpObjectsSince(state, result); outputFile.WriteLine(result); outputFile.Close(); return;

1 0

[Sofaswitch-svn] [commit] r404 - sofaswitch/trunk/callflow/src
by SofaSWITCH SVN 04 Apr '08

04 Apr '08

Author: derek Date: Fri Apr 4 00:19:38 2008 New Revision: 404 Modified: sofaswitch/trunk/callflow/src/callflow.cpp Log: Allways compile to a .py file Modified: sofaswitch/trunk/callflow/src/callflow.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/callflow.cpp (original) +++ sofaswitch/trunk/callflow/src/callflow.cpp Fri Apr 4 00:19:38 2008 @@ -662,20 +662,24 @@ if (filedlg.ShowModal() != wxID_OK) return; - wxTextFile file(filedlg.GetPath()); + wxString name = filedlg.GetPath(); + if (name.Right(3) != wxString(".py")) + name = name + wxString(".py"); + + wxTextFile file(name); if (!file.Exists()) file.Create(); file.Open(); if (!file.IsOpened()) { - wxMessageBox(wxString::Format("Unable to open the file %s to write data to", filedlg.GetFilename().c_str())); + wxMessageBox(wxString::Format("Unable to open the file %s to write data to", name.c_str())); return; } if (canvas->Compile(file)) - SetStatusText(wxString::Format("wrote compiled code to %s", filedlg.GetFilename().c_str())); + SetStatusText(wxString::Format("wrote compiled code to %s", name.c_str())); else - wxMessageBox(wxString::Format("failed - could not compile code to %s", filedlg.GetFilename().c_str())); + wxMessageBox(wxString::Format("failed - could not compile code to %s", name.c_str())); file.Close(); }

1 0

[Sofaswitch-svn] [commit] r403 - sofaswitch/trunk/callflow/src
by SofaSWITCH SVN 04 Apr '08

04 Apr '08

Author: derek Date: Fri Apr 4 00:15:40 2008 New Revision: 403 Modified: sofaswitch/trunk/callflow/src/callflow.cpp Log: Tidy up handling of the file name, to always default to extension of .src Modified: sofaswitch/trunk/callflow/src/callflow.cpp ============================================================================== --- sofaswitch/trunk/callflow/src/callflow.cpp (original) +++ sofaswitch/trunk/callflow/src/callflow.cpp Fri Apr 4 00:15:40 2008 @@ -257,9 +257,13 @@ wxFileDialog filedlg(this, _T("Select a file to read data from"), _T(""), _T(""), _T("*.src")); if ( filedlg.ShowModal() != wxID_OK ) return; + + wxString name = filedlg.GetPath(); + if (name.Right(4) != wxString(".src")) + name = name + wxString(".src"); - wxTextFile file(filedlg.GetPath()); - + wxTextFile file(name); + if (!file.Exists()) { wxMessageBox(wxString::Format("The file %s must exist to read from", filedlg.GetFilename().c_str())); return; @@ -268,7 +272,7 @@ file.Open(); if (file.IsOpened()) { file.Close(); - currentFileName = filedlg.GetPath(); + currentFileName = name; canvas->ReadShapeInformationFromFile(currentFileName); SetStatusText(wxString::Format("Read source code from %s", currentFileName.c_str())); SetNewWindowName(currentFileName); @@ -313,10 +317,17 @@ if (filedlg.ShowModal() != wxID_OK) return; - wxTextFile file(filedlg.GetPath()); + + wxString name = filedlg.GetPath(); + + if (name.Right(4) != wxString(".src")) + name = name + wxString(".src"); + currentFileName = name; + + wxTextFile file(name); if (file.Exists()) { - wxString msg = wxString::Format("The file \n%s\n exists. Overwrite ? ", (const char *)filedlg.GetPath()); + wxString msg = wxString::Format("The file \n%s\n exists. Overwrite ? ", (const char *)name); wxMessageDialog *dlg= new wxMessageDialog(this, msg, "Overwrite existing file", wxYES_DEFAULT | wxYES_NO); if (wxID_NO == dlg->ShowModal()) return; @@ -327,15 +338,14 @@ file.Open(); if (!file.IsOpened()) { - wxMessageBox(wxString::Format("Unable to open the file %s to write data to", filedlg.GetFilename().c_str())); + wxMessageBox(wxString::Format("Unable to open the file %s to write data to", name.c_str())); return; } - currentFileName = filedlg.GetPath(); file.Close(); - canvas->ShapeInformationToFile(currentFileName); - SetStatusText(wxString::Format("Saved source code to %s", currentFileName.c_str())); - SetNewWindowName(currentFileName); + canvas->ShapeInformationToFile(name); + SetStatusText(wxString::Format("Saved source code to %s", name.c_str())); + SetNewWindowName(name); }

1 0

[Sofaswitch-svn] [commit] r402 - sofaswitch/trunk/voip
by SofaSWITCH SVN 03 Apr '08

03 Apr '08

Author: derek Date: Thu Apr 3 19:49:43 2008 New Revision: 402 Modified: sofaswitch/trunk/voip/udpconnection.cxx sofaswitch/trunk/voip/udpsound.cxx Log: Tidy it up so works with the trunk version of opal. Modified: sofaswitch/trunk/voip/udpconnection.cxx ============================================================================== --- sofaswitch/trunk/voip/udpconnection.cxx (original) +++ sofaswitch/trunk/voip/udpconnection.cxx Thu Apr 3 19:49:43 2008 @@ -153,7 +153,7 @@ void OpalUdpSsConnection::OnEstablished() { OpalConnection::OnEstablished(); - PTRACE(3, "Opal UDP SS Connection is now established. "); + PTRACE(3, "Media\tOpal UDP SS Connection is now established. "); } @@ -171,7 +171,7 @@ formats += OpalPCM16; // Sound card can only do 16 bit PCM #if OPAL_VIDEO - AddVideoMediaFormats(formats); + //AddVideoMediaFormats(formats); sound card don't do video. #endif return formats; } @@ -182,8 +182,11 @@ unsigned sessionID, bool isSource) { - if (sessionID != OpalMediaFormat::DefaultAudioSessionID) + PTRACE(3, "Sofa\tCreateMediaStream " << mediaFormat); + if (sessionID != OpalMediaFormat::DefaultAudioSessionID) { + PTRACE(3, "Sofa\tCreateMediaStream " << mediaFormat << " default one"); return OpalConnection::CreateMediaStream(mediaFormat, sessionID, isSource); + } PSoundChannel * soundChannel = CreateSoundChannel(isSource); if (soundChannel == NULL) Modified: sofaswitch/trunk/voip/udpsound.cxx ============================================================================== --- sofaswitch/trunk/voip/udpsound.cxx (original) +++ sofaswitch/trunk/voip/udpsound.cxx Thu Apr 3 19:49:43 2008 @@ -59,7 +59,7 @@ audioSocket(_myOpalCall.GetAudioSocket()), isSource(_isSource) { IncUdpSoundChannel(); - PTRACE(6, "ZZZ\tCreate UdpSoundSocket for " << GetSSLabel(isSource)); + PTRACE(6, "UDPSoundChanel\tCreate UdpSoundSocket for " << GetSSLabel(isSource)); os_handle = -2; } @@ -107,11 +107,19 @@ audioSocket.GetSendAddress(destination, dPort); - PTRACE(6, "MEDIA\tWrite " << amount << " bytes to the socket " << destination << ":" << dPort); + PTRACE(4, "MEDIA\tWrite " << amount << " bytes to the socket " << destination << ":" << dPort); } if (!IsOpen()) { PTRACE(3, "MEDIA\tWrite failed as this sound channel is closed"); + PTRACE(3, "MEDIA\tWrite failed as this sound channel is closed"); + PTRACE(3, "MEDIA\tWrite failed as this sound channel is closed"); + PTRACE(3, "MEDIA\tWrite failed as this sound channel is closed"); + PTRACE(3, "MEDIA\tWrite failed as this sound channel is closed"); + PTRACE(3, "MEDIA\tWrite failed as this sound channel is closed"); + PTRACE(3, "MEDIA\tWrite failed as this sound channel is closed"); + PTRACE(3, "MEDIA\tWrite failed as this sound channel is closed"); + PTRACE(3, "MEDIA\tWrite failed as this sound channel is closed"); return false; } @@ -123,13 +131,17 @@ audioSocket.GetSendAddress(destination, dPort); PTRACE(5, "MEDIA\tWrite destination is " << destination << " : " << dPort); PTRACE(5, "MEDIA\tThat write failed " << audioSocket.GetErrorText()); + PTRACE(5, "MEDIA\tThat write failed " << audioSocket.GetErrorText()); + PTRACE(5, "MEDIA\tThat write failed " << audioSocket.GetErrorText()); + PTRACE(5, "MEDIA\tThat write failed " << audioSocket.GetErrorText()); + PTRACE(5, "MEDIA\tThat write failed " << audioSocket.GetErrorText()); + PTRACE(5, "MEDIA\tThat write failed " << audioSocket.GetErrorText()); } delay.Delay(amount / 16); lastWriteCount = amount; - PTRACE(7, "MEDIA\tWrite to socket return " << audioSocket.IsOpen()); return audioSocket.IsOpen(); } @@ -142,8 +154,8 @@ } bool readOk = true; - PTRACE(7, "MEDIA\tNow do a read of " << amount << " bytes for " << GetSSLabel(isSource)); - PTRACE(7, "MEDIA\tThe read queue has a buffered bytes size of " << readQueue.GetLength()); + PTRACE(4, "MEDIA\tNow do a read of " << amount << " bytes for " << GetSSLabel(isSource)); + PTRACE(4, "MEDIA\tThe read queue has a buffered bytes size of " << readQueue.GetLength()); while (amount > readQueue.GetLength()) { @@ -157,7 +169,7 @@ << audioSocket.GetLastReadCount() << " bytes"); readOk = readQueue.Write(readBuffer.GetPointer(), audioSocket.GetLastReadCount()); - PTRACE(7, "The readqueue now has a size of " + PTRACE(4, "The readqueue now has a size of " << readQueue.GetLength() << " bytes"); if (!readOk) { PTRACE(3, "Failed to write incoming packet to the memory queue"); @@ -167,7 +179,7 @@ readOk = readQueue.Read(buffer, amount); lastReadCount = readQueue.GetLastReadCount(); - PTRACE(7, "Requested " << amount << " return after getting the next packet, so supply " << lastReadCount); + PTRACE(4, "Requested " << amount << " return after getting the next packet, so supply " << lastReadCount); return readOk; }

1 0