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

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

Revision: 34697
          http://sourceforge.net/p/opalvoip/code/34697
Author:   rjongbloed
Date:     2016-03-19 15:11:45 +0000 (Sat, 19 Mar 2016)
Log Message:
-----------
Merged revision(s) 34684-34696 from ptlib/branches/v2_16:
Applied variant of patch #324 "Fix vxml record m_recordStopOnDTMF always set to true", thanks MichaelT

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

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

Index: ptlib/trunk
===================================================================
--- ptlib/trunk	2016-03-19 15:09:41 UTC (rev 34696)
+++ ptlib/trunk	2016-03-19 15:11:45 UTC (rev 34697)

Property changes on: ptlib/trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -6,7 +6,7 ##
 /ptlib/branches/v2_10:25177-29189,32921,32947
 /ptlib/branches/v2_12:28485-31603
 /ptlib/branches/v2_14:31501-33720
-/ptlib/branches/v2_16:34085-34683
+/ptlib/branches/v2_16:34085-34696
 /ptlib/branches/v2_2:20746,20791,20827,22014,22942
 /ptlib/branches/v2_4:21086,21094,21147,21160,21185,21281,21296,21305,21322,21337,21363,21467,21471-21472,21506,21508,21623,21695,21744,21746,21763,22241,22958,23045-23046,23061,23066,23712
 /ptlib/branches/v2_6:22195,22243,22295,22304,22311,22317,22320,22356,22458,22509,22587,22601-22602,22611,22629,22633,22673,22681,22729,22731-22732,22736,22742,22848,22960,22992,23161,23163,23167,23169,23177,23239,23291,23298,23336,23429,23595,23823,23827,23873,24816
\ No newline at end of property
Modified: ptlib/trunk/src/ptclib/vxml.cxx
===================================================================
--- ptlib/trunk/src/ptclib/vxml.cxx	2016-03-19 15:09:41 UTC (rev 34696)
+++ ptlib/trunk/src/ptclib/vxml.cxx	2016-03-19 15:11:45 UTC (rev 34697)
@@ -1484,7 +1484,8 @@
     SetVar(m_recordingName + "$.size", '0');
   }
 
-  m_recordStopOnDTMF = element.HasAttribute("dtmfterm")|| !(element.GetAttribute("dtmfterm") *= "false");
+  // Disable stop on DTMF if attribute explicitly false, default is true
+  m_recordStopOnDTMF = !(element.GetAttribute("dtmfterm") *= "false");
 
   PFile::Remove(destination);
 

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