Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-15 00:51:21 +01:00
Code Issues Releases Wiki Activity

BlockFile::GetSpaceUsage() returns an unsigned value

Browse Source
This commit is contained in:
Paul Licameli
2016-09-05 15:48:08 -04:00
parent 0b31690ace
commit c9bff2f0f4
14 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blockfile/LegacyBlockFile.cpp
View File

@@ -344,7 +344,7 @@ BlockFilePtr LegacyBlockFile::Copy(wxFileNameWrapper &&newFileName)
mLen, mSummaryInfo.fields < 3);
}
wxLongLong LegacyBlockFile::GetSpaceUsage() const
auto LegacyBlockFile::GetSpaceUsage() const -> DiskByteCount
{
wxFFile dataFile(mFileName.GetFullPath());
return dataFile.Length();

2
src/blockfile/LegacyBlockFile.h
View File

@@ -57,7 +57,7 @@ class LegacyBlockFile final : public BlockFile {
BlockFilePtr Copy(wxFileNameWrapper &&newFileName) override;
/// Write an XML representation of this file
void SaveXML(XMLWriter &xmlFile) override;
wxLongLong GetSpaceUsage() const override;
DiskByteCount GetSpaceUsage() const override;
void Recover() override;
static BlockFilePtr BuildFromXML(const wxString &dir, const wxChar **attrs,

2
src/blockfile/ODDecodeBlockFile.cpp
View File

@@ -77,7 +77,7 @@ ODDecodeBlockFile::~ODDecodeBlockFile()
//Check to see if we have the file for these calls.
wxLongLong ODDecodeBlockFile::GetSpaceUsage() const
auto ODDecodeBlockFile::GetSpaceUsage() const -> DiskByteCount
{
if(IsSummaryAvailable())
{

2
src/blockfile/ODDecodeBlockFile.h
View File

@@ -60,7 +60,7 @@ class ODDecodeBlockFile final : public SimpleBlockFile
bool IsSummaryBeingComputed() override { return false; }
//Calls that rely on summary files need to be overidden
wxLongLong GetSpaceUsage() const override;
DiskByteCount GetSpaceUsage() const override;
/// Gets extreme values for the specified region
void GetMinMax(sampleCount start, sampleCount len,
float *outMin, float *outMax, float *outRMS) const override;

4
src/blockfile/ODPCMAliasBlockFile.cpp
View File

@@ -77,11 +77,11 @@ ODPCMAliasBlockFile::~ODPCMAliasBlockFile()
//Check to see if we have the file for these calls.
wxLongLong ODPCMAliasBlockFile::GetSpaceUsage() const
auto ODPCMAliasBlockFile::GetSpaceUsage() const -> DiskByteCount
{
if(IsSummaryAvailable())
{
wxLongLong ret;
DiskByteCount ret;
mFileNameMutex.Lock();
wxFFile summaryFile(mFileName.GetFullPath());
ret= summaryFile.Length();

2
src/blockfile/ODPCMAliasBlockFile.h
View File

@@ -63,7 +63,7 @@ class ODPCMAliasBlockFile final : public PCMAliasBlockFile
bool IsSummaryBeingComputed() override { return mSummaryBeingComputed; }
//Calls that rely on summary files need to be overidden
wxLongLong GetSpaceUsage() const override;
DiskByteCount GetSpaceUsage() const override;
/// Gets extreme values for the specified region
void GetMinMax(sampleCount start, sampleCount len,
float *outMin, float *outMax, float *outRMS) const override;

2
src/blockfile/SilentBlockFile.cpp
View File

@@ -82,7 +82,7 @@ BlockFilePtr SilentBlockFile::Copy(wxFileNameWrapper &&)
return newBlockFile;
}
wxLongLong SilentBlockFile::GetSpaceUsage() const
auto SilentBlockFile::GetSpaceUsage() const -> DiskByteCount
{
return 0;
}

2
src/blockfile/SilentBlockFile.h
View File

@@ -42,7 +42,7 @@ class SilentBlockFile final : public BlockFile {
BlockFilePtr Copy(wxFileNameWrapper &&newFileName) override;
/// Write an XML representation of this file
void SaveXML(XMLWriter &xmlFile) override;
wxLongLong GetSpaceUsage() const override;
DiskByteCount GetSpaceUsage() const override;
void Recover() override { };
static BlockFilePtr BuildFromXML(DirManager &dm, const wxChar **attrs);

8
src/blockfile/SimpleBlockFile.cpp
View File

@@ -547,7 +547,7 @@ BlockFilePtr SimpleBlockFile::Copy(wxFileNameWrapper &&newFileName)
return newBlockFile;
}
wxLongLong SimpleBlockFile::GetSpaceUsage() const
auto SimpleBlockFile::GetSpaceUsage() const -> DiskByteCount
{
if (mCache.active && mCache.needWrite)
{
@@ -598,9 +598,11 @@ wxLongLong SimpleBlockFile::GetSpaceUsage() const
file.Close();
}
return sizeof(auHeader) +
return
sizeof(auHeader) +
mSummaryInfo.totalSummaryBytes +
(GetLength() * SAMPLE_SIZE_DISK(mFormat));
(GetLength() * SAMPLE_SIZE_DISK(mFormat))
;
}
void SimpleBlockFile::Recover(){

2
src/blockfile/SimpleBlockFile.h
View File

@@ -72,7 +72,7 @@ class PROFILE_DLL_API SimpleBlockFile /* not final */ : public BlockFile {
/// Write an XML representation of this file
void SaveXML(XMLWriter &xmlFile) override;
wxLongLong GetSpaceUsage() const override;
DiskByteCount GetSpaceUsage() const override;
void Recover() override;
static BlockFilePtr BuildFromXML(DirManager &dm, const wxChar **attrs);