[Audacity-cvs] audacity-src/src/blockfile LegacyAliasBlockFile.cpp, 1.3.6.3, 1.3.6.4 SimpleBlockFile.cpp, 1.8.2.2.2.5, 1.8.2.2.2.6

[Vaughan Johnson]

Update of /cvsroot/audacity/audacity-src/src/blockfile
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv17874/blockfile

Modified Files:
      Tag: Audacity_UmixIt
        LegacyAliasBlockFile.cpp SimpleBlockFile.cpp 
Log Message:
Branding Panel updates, including merging some of the Thinklabs changes 
relevant to UmixIt requests.

Index: LegacyAliasBlockFile.cpp
===================================================================
RCS file: 
/cvsroot/audacity/audacity-src/src/blockfile/LegacyAliasBlockFile.cpp,v
retrieving revision 1.3.6.3
retrieving revision 1.3.6.4
diff -u -d -r1.3.6.3 -r1.3.6.4
--- LegacyAliasBlockFile.cpp    20 Dec 2006 22:55:45 -0000      1.3.6.3
+++ LegacyAliasBlockFile.cpp    18 Apr 2007 01:34:53 -0000      1.3.6.4
@@ -97,7 +97,7 @@
          break;
 
       const wxString strValue = value;
-      if( !wxStricmp(attr, "name") )
+       if( !wxStricmp(attr, "name") )
        {
          if (!XMLValueChecker::IsGoodFileName(strValue, projDir))
             return NULL;
@@ -115,17 +115,17 @@
        }
        else if (XMLValueChecker::IsGoodInt(strValue) && 
strValue.ToLong(&nValue)) 
        { // integer parameters
-         if( !wxStricmp(attr, "aliasstart") )
+       if( !wxStricmp(attr, "aliasstart") )
             aliasStart = nValue;
-         if( !wxStricmp(attr, "aliaslen") )
+       if( !wxStricmp(attr, "aliaslen") )
             aliasLen = nValue;
-         if( !wxStricmp(attr, "aliaschannel") )
+       if( !wxStricmp(attr, "aliaschannel") )
             aliasChannel = nValue;
-         if( !wxStricmp(attr, "summarylen") )
+       if( !wxStricmp(attr, "summarylen") )
             summaryLen = nValue;
-         if( !wxStricmp(attr, "norms") )
+       if( !wxStricmp(attr, "norms") )
             noRMS = (nValue != 0);
-       }
+   }
    }
 
    if (!XMLValueChecker::IsGoodFileName(summaryFileName.GetFullName(), 

Index: SimpleBlockFile.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/blockfile/SimpleBlockFile.cpp,v
retrieving revision 1.8.2.2.2.5
retrieving revision 1.8.2.2.2.6
diff -u -d -r1.8.2.2.2.5 -r1.8.2.2.2.6
--- SimpleBlockFile.cpp 26 Feb 2007 10:17:20 -0000      1.8.2.2.2.5
+++ SimpleBlockFile.cpp 18 Apr 2007 01:34:53 -0000      1.8.2.2.2.6
@@ -258,7 +258,7 @@
          break;
 
        const wxString strValue = value;
-       if( !strcmp(attr, "filename") ) 
+       if( !strcmp(attr, "filename") )
        {
          if (!XMLValueChecker::IsGoodFileName(strValue, projDir))
             return NULL;


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs