Update of /cvsroot/audacity/audacity-src/src/xml
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv1802/xml
Modified Files:
XMLFileReader.cpp XMLTagHandler.cpp XMLTagHandler.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: XMLFileReader.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/xml/XMLFileReader.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- XMLFileReader.cpp 29 Jun 2006 09:35:27 -0000 1.10
+++ XMLFileReader.cpp 23 Sep 2006 02:27:38 -0000 1.11
@@ -44,7 +44,7 @@
bool XMLFileReader::Parse(XMLTagHandler *baseHandler,
const wxString &fname)
{
- wxFFile theXMLFile(FILENAME(fname).c_str(), wxT("rb"));
+ wxFFile theXMLFile(fname, wxT("rb"));
if (!theXMLFile.IsOpened()) {
wxString errStr;
mErrorStr.Printf(_("Could not open file: \"%s\""), fname.c_str());
Index: XMLTagHandler.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/xml/XMLTagHandler.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- XMLTagHandler.h 21 Oct 2005 02:55:14 -0000 1.7
+++ XMLTagHandler.h 23 Sep 2006 02:27:38 -0000 1.8
@@ -11,12 +11,13 @@
using XML files.
**********************************************************************/
+#ifndef __AUDACITY_XML_TAG_HANDLER__
+#define __AUDACITY_XML_TAG_HANDLER__
#include <wx/string.h>
#include <stdio.h>
-#ifndef __AUDACITY_XML_TAG_HANDLER__
-#define __AUDACITY_XML_TAG_HANDLER__
+#include "XMLWriter.h"
class XMLTagHandler {
public:
@@ -48,7 +49,7 @@
// all of your children to the file. One tag should appear
// per line, and each tag should be preceded with [depth]
// tab characters.
- virtual void WriteXML(int depth, FILE *fp) = 0;
+ virtual void WriteXML(XMLWriter &xmlFile) = 0;
//
// Utility methods you should call
Index: XMLTagHandler.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/xml/XMLTagHandler.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- XMLTagHandler.cpp 29 Jun 2006 09:35:27 -0000 1.8
+++ XMLTagHandler.cpp 23 Sep 2006 02:27:38 -0000 1.9
@@ -54,7 +54,7 @@
}
}
- return Internat::LocalToUTF8(result);
+ return result;
}
bool XMLTagHandler::ReadXMLTag(const char *tag, const char **attrs)
-------------------------------------------------------------------------
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
