[Opalvoip-svn] SF.net SVN: opalvoip:[21338] ptlib/trunk

[<rjo...@us...>]

Revision: 21338
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=21338&view=rev
Author:   rjongbloed
Date:     2008-10-15 03:53:52 +0000 (Wed, 15 Oct 2008)

Log Message:
-----------
More fixes to VXML, thank you Antonio Rivera

Modified Paths:
--------------
    ptlib/trunk/src/ptclib/vxml.cxx

Property Changed:
----------------
    ptlib/trunk/


Property changes on: ptlib/trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /ptlib/branches/v2_2:20746,20791,20827
/ptlib/branches/v2_4:21086,21094,21147,21160,21185,21281,21296,21305,21322
   + /ptlib/branches/v2_2:20746,20791,20827
/ptlib/branches/v2_4:21086,21094,21147,21160,21185,21281,21296,21305,21322,21337

Modified: ptlib/trunk/src/ptclib/vxml.cxx
===================================================================
--- ptlib/trunk/src/ptclib/vxml.cxx	2008-10-15 03:52:04 UTC (rev 21337)
+++ ptlib/trunk/src/ptclib/vxml.cxx	2008-10-15 03:53:52 UTC (rev 21338)
@@ -1251,7 +1251,6 @@
     
     // create a semaphore, and then wait for the recording to terminate
     StartRecording(file, dtmfTerm, maxTime, termTime);
-    recordSync.Wait(maxTime);
     
     if (!recordSync.Wait(maxTime)) {
       // The Wait() has timed out, to signal that the record timed out.
@@ -1513,30 +1512,23 @@
   return (vxmlChannel != NULL) && vxmlChannel->IsPlaying();
 }
 
-PBoolean PVXMLSession::StartRecording(const PFilePath & /*_recordFn*/, 
-                                               PBoolean /*_recordDTMFTerm*/, 
-                              const PTimeInterval & /*_recordMaxTime*/, 
-                              const PTimeInterval & /*_recordFinalSilence*/)
+PBoolean PVXMLSession::StartRecording(const PFilePath & p_recordFn, 
+                                               PBoolean p_recordDTMFTerm, 
+                                  const PTimeInterval & p_recordMaxTime, 
+                                  const PTimeInterval & p_recordFinalSilence)
 {
-  /*
-  recording          = PTrue;
-  recordFn           = _recordFn;
-  recordDTMFTerm     = _recordDTMFTerm;
-  recordMaxTime      = _recordMaxTime;
-  recordFinalSilence = _recordFinalSilence;
+  recording          = true;
+  recordFn           = p_recordFn;
+  recordDTMFTerm     = p_recordDTMFTerm;
+  recordMaxTime      = p_recordMaxTime;
+  recordFinalSilence = p_recordFinalSilence;
 
-  if (incomingChannel != NULL) {
-    PXMLElement* element = (PXMLElement*) currentNode;
-    if ( element->HasAttribute("name")) {
-      PString chanName = element->GetAttribute("name");
-      incomingChannel->SetName(chanName);
-    }
-    return incomingChannel->StartRecording(recordFn, (unsigned )recordFinalSilence.GetMilliSeconds());
-  }
+  if (vxmlChannel != NULL) 
+    return vxmlChannel->StartRecording(recordFn,
+                                       (unsigned)recordFinalSilence.GetMilliSeconds(), 
+                                       (unsigned)recordMaxTime.GetMilliSeconds());
 
-  */
-
-  return PFalse;
+  return false;
 }
 
 void PVXMLSession::RecordEnd()
@@ -2585,6 +2577,8 @@
     return PFalse;
   }
 
+  item->SetData(data);
+
   if (QueuePlayable(item))
     return PTrue;
 
@@ -2674,7 +2668,7 @@
 void PVXMLChannelPCM::GetBeepData(PBYTEArray & data, unsigned ms)
 {
   data.SetSize(0);
-  while (data.GetSize() < (PINDEX)((ms * 8) / 2)) {
+  while (data.GetSize() < (PINDEX)(ms * 16)) {
     PINDEX len = data.GetSize();
     data.SetSize(len + sizeof(beepData));
     memcpy(len + data.GetPointer(), beepData, sizeof(beepData));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.