Update of /cvsroot/audacity/audacity-src/src/blockfile
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12796/blockfile

Modified Files:
        PCMAliasBlockFile.cpp 
Log Message:
Fixing OD Amp bug where min/max/rms for amplify weren't being read correctly on 
loading a saved file.

Index: PCMAliasBlockFile.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/blockfile/PCMAliasBlockFile.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- PCMAliasBlockFile.cpp       8 Mar 2009 19:53:38 -0000       1.17
+++ PCMAliasBlockFile.cpp       14 Aug 2009 17:10:22 -0000      1.18
@@ -178,6 +178,7 @@
    wxFileName aliasFileName;
    int aliasStart=0, aliasLen=0, aliasChannel=0;
    float min=0, max=0, rms=0;
+   double dblValue;
    long nValue;
 
    while(*attrs)
@@ -225,7 +226,18 @@
             max = nValue;
          else if( !wxStricmp(attr, wxT("rms")) )
             rms = nValue;
-      }
+      }      
+               //the min/max can be (are?) doubles as well, so handle this 
case:
+               else if( !wxStrcmp(attr, wxT("min")) && 
+               XMLValueChecker::IsGoodString(strValue) && 
Internat::CompatibleToDouble(strValue, &dblValue))
+         min = dblValue;
+      else if( !wxStrcmp(attr, wxT("max")) && 
+               XMLValueChecker::IsGoodString(strValue) && 
Internat::CompatibleToDouble(strValue, &dblValue))
+         max = dblValue;
+      else if( !wxStrcmp(attr, wxT("rms")) && 
+               XMLValueChecker::IsGoodString(strValue) && 
Internat::CompatibleToDouble(strValue, &dblValue))
+         rms = dblValue;
+
    }
 
    if (!XMLValueChecker::IsGoodFileName(summaryFileName.GetFullName(), 
summaryFileName.GetPath(wxPATH_GET_VOLUME)) || 


------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs

Reply via email to