Update of /cvsroot/audacity/audacity-src/src/blockfile
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv8243
Modified Files:
LegacyBlockFile.h SilentBlockFile.cpp SimpleBlockFile.cpp
SimpleBlockFile.h SilentBlockFile.h LegacyBlockFile.cpp
Log Message:
Use wxLongLong for file and disk space usage calcs (at least I think I got them
all)
Index: SilentBlockFile.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/blockfile/SilentBlockFile.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- SilentBlockFile.cpp 23 Sep 2006 02:25:48 -0000 1.5
+++ SilentBlockFile.cpp 4 Nov 2006 19:55:29 -0000 1.6
@@ -68,7 +68,7 @@
return newBlockFile;
}
-int SilentBlockFile::GetSpaceUsage()
+wxLongLong SilentBlockFile::GetSpaceUsage()
{
return 0;
}
Index: SilentBlockFile.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/blockfile/SilentBlockFile.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- SilentBlockFile.h 23 Sep 2006 02:25:48 -0000 1.6
+++ SilentBlockFile.h 4 Nov 2006 19:55:29 -0000 1.7
@@ -39,7 +39,7 @@
virtual BlockFile *Copy(wxFileName newFileName);
/// Write an XML representation of this file
virtual void SaveXML(XMLWriter &xmlFile);
- virtual int GetSpaceUsage();
+ virtual wxLongLong GetSpaceUsage();
virtual void Recover() { };
static BlockFile *BuildFromXML(DirManager &dm, const wxChar **attrs);
Index: SimpleBlockFile.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/blockfile/SimpleBlockFile.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- SimpleBlockFile.cpp 23 Sep 2006 02:25:48 -0000 1.20
+++ SimpleBlockFile.cpp 4 Nov 2006 19:55:29 -0000 1.21
@@ -325,7 +325,7 @@
return newBlockFile;
}
-int SimpleBlockFile::GetSpaceUsage()
+wxLongLong SimpleBlockFile::GetSpaceUsage()
{
wxFFile dataFile(mFileName.GetFullPath());
return dataFile.Length();
Index: LegacyBlockFile.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/blockfile/LegacyBlockFile.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- LegacyBlockFile.cpp 23 Sep 2006 02:25:48 -0000 1.17
+++ LegacyBlockFile.cpp 4 Nov 2006 19:55:29 -0000 1.18
@@ -316,7 +316,7 @@
return newBlockFile;
}
-int LegacyBlockFile::GetSpaceUsage()
+wxLongLong LegacyBlockFile::GetSpaceUsage()
{
wxFFile dataFile(mFileName.GetFullPath());
return dataFile.Length();
Index: LegacyBlockFile.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/blockfile/LegacyBlockFile.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- LegacyBlockFile.h 23 Sep 2006 02:25:48 -0000 1.8
+++ LegacyBlockFile.h 4 Nov 2006 19:55:29 -0000 1.9
@@ -57,7 +57,7 @@
virtual BlockFile *Copy(wxFileName newFileName);
/// Write an XML representation of this file
virtual void SaveXML(XMLWriter &xmlFile);
- virtual int GetSpaceUsage();
+ virtual wxLongLong GetSpaceUsage();
virtual void Recover();
static BlockFile *BuildFromXML(wxString dir, const wxChar **attrs,
Index: SimpleBlockFile.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/blockfile/SimpleBlockFile.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- SimpleBlockFile.h 23 Sep 2006 02:25:48 -0000 1.10
+++ SimpleBlockFile.h 4 Nov 2006 19:55:29 -0000 1.11
@@ -46,7 +46,7 @@
/// Write an XML representation of this file
virtual void SaveXML(XMLWriter &xmlFile);
- virtual int GetSpaceUsage();
+ virtual wxLongLong GetSpaceUsage();
virtual void Recover();
static BlockFile *BuildFromXML(DirManager &dm, const wxChar **attrs);
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
