From c9bff2f0f4952e5e2171de2dfca88077d3e7c884 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Mon, 5 Sep 2016 15:48:08 -0400 Subject: [PATCH] BlockFile::GetSpaceUsage() returns an unsigned value --- src/BlockFile.cpp | 2 +- src/BlockFile.h | 6 ++++-- src/UndoManager.cpp | 2 +- src/UndoManager.h | 2 +- src/blockfile/LegacyBlockFile.cpp | 2 +- src/blockfile/LegacyBlockFile.h | 2 +- src/blockfile/ODDecodeBlockFile.cpp | 2 +- src/blockfile/ODDecodeBlockFile.h | 2 +- src/blockfile/ODPCMAliasBlockFile.cpp | 4 ++-- src/blockfile/ODPCMAliasBlockFile.h | 2 +- src/blockfile/SilentBlockFile.cpp | 2 +- src/blockfile/SilentBlockFile.h | 2 +- src/blockfile/SimpleBlockFile.cpp | 8 +++++--- src/blockfile/SimpleBlockFile.h | 2 +- 14 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/BlockFile.cpp b/src/BlockFile.cpp index 414a3de2c..77ea55a8a 100644 --- a/src/BlockFile.cpp +++ b/src/BlockFile.cpp @@ -634,7 +634,7 @@ void AliasBlockFile::ChangeAliasedFileName(wxFileNameWrapper &&newAliasedFile) mAliasedFileName = std::move(newAliasedFile); } -wxLongLong AliasBlockFile::GetSpaceUsage() const +auto AliasBlockFile::GetSpaceUsage() const -> DiskByteCount { wxFFile summaryFile(mFileName.GetFullPath()); return summaryFile.Length(); diff --git a/src/BlockFile.h b/src/BlockFile.h index 33dff4ac7..053fa2d8b 100644 --- a/src/BlockFile.h +++ b/src/BlockFile.h @@ -140,7 +140,9 @@ class PROFILE_DLL_API BlockFile /* not final, abstract */ { /// Create a NEW BlockFile identical to this, using the given filename virtual BlockFilePtr Copy(wxFileNameWrapper &&newFileName) = 0; - virtual wxLongLong GetSpaceUsage() const = 0; + // Report disk space usage. + using DiskByteCount = unsigned long long; + virtual DiskByteCount GetSpaceUsage() const = 0; /// if the on-disk state disappeared, either recover it (if it was //summary only), write out a placeholder of silence data (missing @@ -223,7 +225,7 @@ class AliasBlockFile /* not final */ : public BlockFile // Reading - wxLongLong GetSpaceUsage() const override; + DiskByteCount GetSpaceUsage() const override; /// as SilentLog (which would affect Summary data access), but // applying to Alias file access diff --git a/src/UndoManager.cpp b/src/UndoManager.cpp index 59b8dd159..d0d277b56 100644 --- a/src/UndoManager.cpp +++ b/src/UndoManager.cpp @@ -106,7 +106,7 @@ void UndoManager::CalculateSpaceUsage() // in the previous level if (prev->count( &*file ) == 0 && cur->count( &*file ) == 0) { - space[i] += file->GetSpaceUsage().GetValue(); + space[i] += { file->GetSpaceUsage() }; } // Add file to current set diff --git a/src/UndoManager.h b/src/UndoManager.h index e74d466c2..4febd7ff9 100644 --- a/src/UndoManager.h +++ b/src/UndoManager.h @@ -73,7 +73,7 @@ struct UndoState { using UndoStack = std::vector >; -using SpaceArray = std::vector ; +using SpaceArray = std::vector ; // These flags control what extra to do on a PushState // Default is AUTOSAVE diff --git a/src/blockfile/LegacyBlockFile.cpp b/src/blockfile/LegacyBlockFile.cpp index 0924db58f..d5f1d02d5 100644 --- a/src/blockfile/LegacyBlockFile.cpp +++ b/src/blockfile/LegacyBlockFile.cpp @@ -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(); diff --git a/src/blockfile/LegacyBlockFile.h b/src/blockfile/LegacyBlockFile.h index 61955e2d1..1382c179d 100644 --- a/src/blockfile/LegacyBlockFile.h +++ b/src/blockfile/LegacyBlockFile.h @@ -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, diff --git a/src/blockfile/ODDecodeBlockFile.cpp b/src/blockfile/ODDecodeBlockFile.cpp index f87fec6c3..65bad2450 100644 --- a/src/blockfile/ODDecodeBlockFile.cpp +++ b/src/blockfile/ODDecodeBlockFile.cpp @@ -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()) { diff --git a/src/blockfile/ODDecodeBlockFile.h b/src/blockfile/ODDecodeBlockFile.h index 76160def3..bb01cd2ae 100644 --- a/src/blockfile/ODDecodeBlockFile.h +++ b/src/blockfile/ODDecodeBlockFile.h @@ -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; diff --git a/src/blockfile/ODPCMAliasBlockFile.cpp b/src/blockfile/ODPCMAliasBlockFile.cpp index 75ae646e8..628433edf 100644 --- a/src/blockfile/ODPCMAliasBlockFile.cpp +++ b/src/blockfile/ODPCMAliasBlockFile.cpp @@ -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(); diff --git a/src/blockfile/ODPCMAliasBlockFile.h b/src/blockfile/ODPCMAliasBlockFile.h index adb9b88bd..1b943f0bd 100644 --- a/src/blockfile/ODPCMAliasBlockFile.h +++ b/src/blockfile/ODPCMAliasBlockFile.h @@ -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; diff --git a/src/blockfile/SilentBlockFile.cpp b/src/blockfile/SilentBlockFile.cpp index 1b13027b3..a25a79ac4 100644 --- a/src/blockfile/SilentBlockFile.cpp +++ b/src/blockfile/SilentBlockFile.cpp @@ -82,7 +82,7 @@ BlockFilePtr SilentBlockFile::Copy(wxFileNameWrapper &&) return newBlockFile; } -wxLongLong SilentBlockFile::GetSpaceUsage() const +auto SilentBlockFile::GetSpaceUsage() const -> DiskByteCount { return 0; } diff --git a/src/blockfile/SilentBlockFile.h b/src/blockfile/SilentBlockFile.h index 0a23b02c4..b06a70547 100644 --- a/src/blockfile/SilentBlockFile.h +++ b/src/blockfile/SilentBlockFile.h @@ -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); diff --git a/src/blockfile/SimpleBlockFile.cpp b/src/blockfile/SimpleBlockFile.cpp index 95faf1fca..f53397dd1 100644 --- a/src/blockfile/SimpleBlockFile.cpp +++ b/src/blockfile/SimpleBlockFile.cpp @@ -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(){ diff --git a/src/blockfile/SimpleBlockFile.h b/src/blockfile/SimpleBlockFile.h index 6eee4fe89..d4f34ffe9 100644 --- a/src/blockfile/SimpleBlockFile.h +++ b/src/blockfile/SimpleBlockFile.h @@ -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);