Update of /cvsroot/audacity/audacity-src/src/blockfile
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv895/blockfile
Modified Files:
LegacyAliasBlockFile.cpp LegacyAliasBlockFile.h
LegacyBlockFile.cpp LegacyBlockFile.h PCMAliasBlockFile.cpp
PCMAliasBlockFile.h SilentBlockFile.cpp SilentBlockFile.h
SimpleBlockFile.cpp SimpleBlockFile.h
Log Message:
1) Rework of XML file writing.
2) Cleaned up old (FROM)FILENAME() macro usage and added OSFILENAME() usage
only where needed.
3) Removed Mac specific filename encodings as it's handled by WX now.
4) Fixed a couple of missing wxT()s (one resulted in a day or so debugging
session ;-)).
5) Commented all PACKAGE_* macros in configtemplate.h as they conflict with the
latest SoundTouch.
Index: LegacyAliasBlockFile.cpp
===================================================================
RCS file:
/cvsroot/audacity/audacity-src/src/blockfile/LegacyAliasBlockFile.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- LegacyAliasBlockFile.cpp 8 Feb 2005 04:49:32 -0000 1.7
+++ LegacyAliasBlockFile.cpp 23 Sep 2006 02:25:48 -0000 1.8
@@ -61,23 +61,21 @@
return newBlockFile;
}
-void LegacyAliasBlockFile::SaveXML(int depth, wxFFile &xmlFile)
+void LegacyAliasBlockFile::SaveXML(XMLWriter &xmlFile)
{
- for(int i = 0; i < depth; i++)
- xmlFile.Write(wxT("\t"));
- xmlFile.Write(wxT("<legacyblockfile "));
- xmlFile.Write(wxT("alias='1' "));
- xmlFile.Write(wxString::Format(wxT("name='%s' "),
-
XMLTagHandler::XMLEsc(mFileName.GetFullName()).c_str()));
- xmlFile.Write(wxString::Format(wxT("aliaspath='%s' "),
-
XMLTagHandler::XMLEsc(mAliasedFileName.GetFullPath()).c_str()));
- xmlFile.Write(wxString::Format(wxT("aliasstart='%d' "), mAliasStart));
- xmlFile.Write(wxString::Format(wxT("aliaslen='%d' "), mLen));
- xmlFile.Write(wxString::Format(wxT("aliaschannel='%d' "), mAliasChannel));
- xmlFile.Write(wxString::Format(wxT("summarylen='%d' "),
mSummaryInfo.totalSummaryBytes));
+ xmlFile.StartTag(wxT("legacyblockfile"));
+
+ xmlFile.WriteAttr(wxT("alias"), 1);
+ xmlFile.WriteAttr(wxT("name"), mFileName.GetFullName());
+ xmlFile.WriteAttr(wxT("aliaspath"), mAliasedFileName.GetFullPath());
+ xmlFile.WriteAttr(wxT("aliasstart"), mAliasStart);
+ xmlFile.WriteAttr(wxT("aliaslen"), mLen);
+ xmlFile.WriteAttr(wxT("aliaschannel"), mAliasChannel);
+ xmlFile.WriteAttr(wxT("summarylen"), mSummaryInfo.totalSummaryBytes);
if (mSummaryInfo.fields < 3)
- xmlFile.Write(wxString::Format(wxT("norms='1' ")));
- xmlFile.Write(wxT("/>\n"));
+ xmlFile.WriteAttr(wxT("norms"), 1);
+
+ xmlFile.EndTag(wxT("legacyblockfile"));
}
BlockFile *LegacyAliasBlockFile::BuildFromXML(wxString projDir, const wxChar
**attrs)
Index: SilentBlockFile.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/blockfile/SilentBlockFile.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- SilentBlockFile.cpp 8 Feb 2005 04:49:33 -0000 1.4
+++ SilentBlockFile.cpp 23 Sep 2006 02:25:48 -0000 1.5
@@ -34,13 +34,13 @@
return len;
}
-void SilentBlockFile::SaveXML(int depth, wxFFile &xmlFile)
+void SilentBlockFile::SaveXML(XMLWriter &xmlFile)
{
- for(int i = 0; i < depth; i++)
- xmlFile.Write(wxT("\t"));
- xmlFile.Write(wxT("<silentblockfile "));
- xmlFile.Write(wxString::Format(wxT("len='%d' "), mLen));
- xmlFile.Write(wxT("/>\n"));
+ xmlFile.StartTag(wxT("silentblockfile"));
+
+ xmlFile.WriteAttr(wxT("len"), mLen);
+
+ xmlFile.EndTag(wxT("silentblockfile"));
}
/// static
Index: SilentBlockFile.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/blockfile/SilentBlockFile.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- SilentBlockFile.h 8 Feb 2005 04:49:33 -0000 1.5
+++ SilentBlockFile.h 23 Sep 2006 02:25:48 -0000 1.6
@@ -38,7 +38,7 @@
/// Create a new block file identical to this one
virtual BlockFile *Copy(wxFileName newFileName);
/// Write an XML representation of this file
- virtual void SaveXML(int depth, wxFFile &xmlFile);
+ virtual void SaveXML(XMLWriter &xmlFile);
virtual int GetSpaceUsage();
virtual void Recover() { };
Index: SimpleBlockFile.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/blockfile/SimpleBlockFile.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- SimpleBlockFile.cpp 24 Jul 2006 14:58:57 -0000 1.19
+++ SimpleBlockFile.cpp 23 Sep 2006 02:25:48 -0000 1.20
@@ -79,7 +79,7 @@
//wxASSERT( !wxFileExists(FILENAME(mFileName.GetFullPath())) );
// Open and write the file
- wxFFile file(FILENAME(mFileName.GetFullPath()).c_str(), wxT("wb"));
+ wxFFile file(mFileName.GetFullPath(), wxT("wb"));
if( !file.IsOpened() ){
// Can't do anything else.
@@ -174,7 +174,7 @@
/// mSummaryinfo.totalSummaryBytes long.
bool SimpleBlockFile::ReadSummary(void *data)
{
- wxFFile file(FILENAME(mFileName.GetFullPath()).c_str(), wxT("rb"));
+ wxFFile file(mFileName.GetFullPath(), wxT("rb"));
wxLogNull *silence=0;
if(mSilentLog)silence= new wxLogNull();
@@ -220,13 +220,7 @@
memset(&info, 0, sizeof(info));
- #ifdef _UNICODE
- /* sf_open doesn't handle fn_Str() in Unicode build. May or may not
actually work. */
- SNDFILE *sf=sf_open(FILENAME(mFileName.GetFullPath()).mb_str(),
SFM_READ, &info);
- #else // ANSI
- SNDFILE *sf=sf_open(FILENAME(mFileName.GetFullPath()).fn_str(),
SFM_READ, &info);
- #endif // Unicode/ANSI
-
+ SNDFILE *sf=sf_open(OSFILENAME(mFileName.GetFullPath()), SFM_READ, &info);
if (!sf){
memset(data,0,SAMPLE_SIZE(format)*len);
@@ -280,29 +274,17 @@
return framesRead;
}
-wxString SimpleBlockFile::GetXMLString()
+void SimpleBlockFile::SaveXML(XMLWriter &xmlFile)
{
- wxString s = wxT("<simpleblockfile ");
- s += wxString::Format(wxT("filename='%s' "),
-
XMLTagHandler::XMLEsc(mFileName.GetFullName()).c_str());
- s += wxString::Format(wxT("len='%d' "), mLen);
- s += wxString::Format(wxT("min='%s' "),
- Internat::ToString(mMin).c_str());
- s += wxString::Format(wxT("max='%s' "),
- Internat::ToString(mMax).c_str());
- s += wxString::Format(wxT("rms='%s'"),
- Internat::ToString(mRMS).c_str());
- s += wxT("/>");
+ xmlFile.StartTag(wxT("simpleblockfile"));
- return s;
-}
+ xmlFile.WriteAttr(wxT("filename"), mFileName.GetFullName());
+ xmlFile.WriteAttr(wxT("len"), mLen);
+ xmlFile.WriteAttr(wxT("min"), mMin);
+ xmlFile.WriteAttr(wxT("max"), mMax);
+ xmlFile.WriteAttr(wxT("rms"), mRMS);
-void SimpleBlockFile::SaveXML(int depth, wxFFile &xmlFile)
-{
- for(int i = 0; i < depth; i++)
- xmlFile.Write(wxT("\t"));
- xmlFile.Write(GetXMLString());
- xmlFile.Write(wxT("\n"));
+ xmlFile.EndTag(wxT("simpleblockfile"));
}
/// static
@@ -350,7 +332,7 @@
}
void SimpleBlockFile::Recover(){
- wxFFile file(FILENAME(mFileName.GetFullPath()).c_str(), wxT("wb"));
+ wxFFile file(mFileName.GetFullPath(), wxT("wb"));
int i;
if( !file.IsOpened() ){
Index: LegacyBlockFile.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/blockfile/LegacyBlockFile.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- LegacyBlockFile.cpp 29 Jun 2006 09:35:26 -0000 1.16
+++ LegacyBlockFile.cpp 23 Sep 2006 02:25:48 -0000 1.17
@@ -69,7 +69,7 @@
info->format);
wxLogNull *silence=0;
- wxFFile summaryFile(fileName.GetFullPath().c_str(), wxT("rb"));
+ wxFFile summaryFile(fileName.GetFullPath(), wxT("rb"));
int read;
if(Silent)silence= new wxLogNull();
@@ -150,7 +150,7 @@
/// mSummaryinfo.totalSummaryBytes long.
bool LegacyBlockFile::ReadSummary(void *data)
{
- wxFFile summaryFile(mFileName.GetFullPath().c_str(), wxT("rb"));
+ wxFFile summaryFile(mFileName.GetFullPath(), wxT("rb"));
wxLogNull *silence=0;
if(mSilentLog)silence= new wxLogNull();
@@ -205,12 +205,7 @@
info.frames = mLen + (mSummaryInfo.totalSummaryBytes /
SAMPLE_SIZE(mFormat));
- #ifdef _UNICODE
- /* sf_open doesn't handle fn_Str() in Unicode build. May or may not
actually work. */
- SNDFILE *sf=sf_open(FILENAME(mFileName.GetFullPath()).mb_str(),
SFM_READ, &info);
- #else // ANSI
- SNDFILE *sf=sf_open(FILENAME(mFileName.GetFullPath()).fn_str(),
SFM_READ, &info);
- #endif // Unicode/ANSI
+ SNDFILE *sf=sf_open(OSFILENAME(mFileName.GetFullPath()), SFM_READ, &info);
wxLogNull *silence=0;
if(mSilentLog)silence= new wxLogNull();
@@ -266,18 +261,17 @@
return framesRead;
}
-void LegacyBlockFile::SaveXML(int depth, wxFFile &xmlFile)
+void LegacyBlockFile::SaveXML(XMLWriter &xmlFile)
{
- for(int i = 0; i < depth; i++)
- xmlFile.Write(wxT("\t"));
- xmlFile.Write(wxT("<legacyblockfile "));
- xmlFile.Write(wxString::Format(wxT("name='%s' "),
-
XMLTagHandler::XMLEsc(mFileName.GetFullName()).c_str()));
- xmlFile.Write(wxString::Format(wxT("len='%d' "), mLen));
+ xmlFile.StartTag(wxT("legacyblockfile"));
+
+ xmlFile.WriteAttr(wxT("name"), mFileName.GetFullName());
+ xmlFile.WriteAttr(wxT("len"), mLen);
if (mSummaryInfo.fields < 3)
- xmlFile.Write(wxString::Format(wxT("norms='1' ")));
- xmlFile.Write(wxString::Format(wxT("summarylen='%d' "),
mSummaryInfo.totalSummaryBytes));
- xmlFile.Write(wxT("/>\n"));
+ xmlFile.WriteAttr(wxT("norms"), 1);
+ xmlFile.WriteAttr(wxT("summarylen"), mSummaryInfo.totalSummaryBytes);
+
+ xmlFile.EndTag(wxT("legacyblockfile"));
}
/// static
Index: LegacyBlockFile.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/blockfile/LegacyBlockFile.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- LegacyBlockFile.h 8 Feb 2005 04:49:33 -0000 1.7
+++ LegacyBlockFile.h 23 Sep 2006 02:25:48 -0000 1.8
@@ -56,7 +56,7 @@
/// Create a new block file identical to this one
virtual BlockFile *Copy(wxFileName newFileName);
/// Write an XML representation of this file
- virtual void SaveXML(int depth, wxFFile &xmlFile);
+ virtual void SaveXML(XMLWriter &xmlFile);
virtual int GetSpaceUsage();
virtual void Recover();
Index: SimpleBlockFile.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/blockfile/SimpleBlockFile.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- SimpleBlockFile.h 24 Jul 2006 14:58:57 -0000 1.9
+++ SimpleBlockFile.h 23 Sep 2006 02:25:48 -0000 1.10
@@ -16,6 +16,7 @@
#include "../BlockFile.h"
#include "../DirManager.h"
+#include "../xml/XMLWriter.h"
class SimpleBlockFile : public BlockFile {
public:
@@ -43,8 +44,7 @@
/// Create a new block file identical to this one
virtual BlockFile *Copy(wxFileName newFileName);
/// Write an XML representation of this file
- virtual void SaveXML(int depth, wxFFile &xmlFile);
- wxString GetXMLString();
+ virtual void SaveXML(XMLWriter &xmlFile);
virtual int GetSpaceUsage();
virtual void Recover();
Index: PCMAliasBlockFile.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/blockfile/PCMAliasBlockFile.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- PCMAliasBlockFile.cpp 6 Jul 2005 22:32:18 -0000 1.10
+++ PCMAliasBlockFile.cpp 23 Sep 2006 02:25:48 -0000 1.11
@@ -61,15 +61,8 @@
memset(&info, 0, sizeof(info));
- #ifdef _UNICODE
- /* sf_open doesn't handle fn_Str() in Unicode build. May or may not
actually work. */
- SNDFILE *sf=sf_open(FILENAME(mAliasedFileName.GetFullPath()).mb_str(),
- SFM_READ, &info);
- #else // ANSI
- SNDFILE *sf=sf_open(FILENAME(mAliasedFileName.GetFullPath()).fn_str(),
+ SNDFILE *sf=sf_open(OSFILENAME(mAliasedFileName.GetFullPath()),
SFM_READ, &info);
- #endif // Unicode/ANSI
-
if (!sf){
memset(data,0,SAMPLE_SIZE(format)*len);
@@ -131,25 +124,20 @@
return newBlockFile;
}
-void PCMAliasBlockFile::SaveXML(int depth, wxFFile &xmlFile)
+void PCMAliasBlockFile::SaveXML(XMLWriter &xmlFile)
{
- for(int i = 0; i < depth; i++)
- xmlFile.Write(wxT("\t"));
- xmlFile.Write(wxT("<pcmaliasblockfile "));
- xmlFile.Write(wxString::Format(wxT("summaryfile='%s' "),
-
XMLTagHandler::XMLEsc(mFileName.GetFullName()).c_str()));
- xmlFile.Write(wxString::Format(wxT("aliasfile='%s' "),
-
XMLTagHandler::XMLEsc(mAliasedFileName.GetFullPath()).c_str()));
- xmlFile.Write(wxString::Format(wxT("aliasstart='%d' "), mAliasStart));
- xmlFile.Write(wxString::Format(wxT("aliaslen='%d' "), mLen));
- xmlFile.Write(wxString::Format(wxT("aliaschannel='%d' "), mAliasChannel));
- xmlFile.Write(wxString::Format(wxT("min='%s' "),
- Internat::ToString(mMin).c_str()));
- xmlFile.Write(wxString::Format(wxT("max='%s' "),
- Internat::ToString(mMax).c_str()));
- xmlFile.Write(wxString::Format(wxT("rms='%s'"),
- Internat::ToString(mRMS).c_str()));
- xmlFile.Write(wxT("/>\n"));
+ xmlFile.StartTag(wxT("pcmaliasblockfile"));
+
+ xmlFile.WriteAttr(wxT("summaryfile"), mFileName.GetFullName());
+ xmlFile.WriteAttr(wxT("aliasfile"), mAliasedFileName.GetFullPath());
+ xmlFile.WriteAttr(wxT("aliasstart"), mAliasStart);
+ xmlFile.WriteAttr(wxT("aliaslen"), mLen);
+ xmlFile.WriteAttr(wxT("aliaschannel"), mAliasChannel);
+ xmlFile.WriteAttr(wxT("min"), mMin);
+ xmlFile.WriteAttr(wxT("max"), mMax);
+ xmlFile.WriteAttr(wxT("rms"), mRMS);
+
+ xmlFile.EndTag(wxT("pcmaliasblockfile"));
}
BlockFile *PCMAliasBlockFile::BuildFromXML(DirManager &dm, const wxChar
**attrs)
Index: PCMAliasBlockFile.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/blockfile/PCMAliasBlockFile.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- PCMAliasBlockFile.h 8 Feb 2005 04:49:33 -0000 1.6
+++ PCMAliasBlockFile.h 23 Sep 2006 02:25:48 -0000 1.7
@@ -36,7 +36,7 @@
/// Reads the specified data from the aliased file using libsndfile
virtual int ReadData(samplePtr data, sampleFormat format,
sampleCount start, sampleCount len);
- virtual void SaveXML(int depth, wxFFile &xmlFile);
+ virtual void SaveXML(XMLWriter &xmlFile);
virtual BlockFile *Copy(wxFileName fileName);
virtual void Recover();
Index: LegacyAliasBlockFile.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/blockfile/LegacyAliasBlockFile.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- LegacyAliasBlockFile.h 8 Feb 2005 04:49:33 -0000 1.5
+++ LegacyAliasBlockFile.h 23 Sep 2006 02:25:48 -0000 1.6
@@ -31,7 +31,7 @@
bool noRMS);
virtual ~LegacyAliasBlockFile();
- virtual void SaveXML(int depth, wxFFile &xmlFile);
+ virtual void SaveXML(XMLWriter &xmlFile);
virtual BlockFile *Copy(wxFileName fileName);
virtual void Recover();
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
