From 395499808314c9153096b061e6c206f88d3fa208 Mon Sep 17 00:00:00 2001 From: Leland Lucius Date: Wed, 15 Jul 2020 09:43:48 -0500 Subject: [PATCH] AUP3: UP-33 History window shows misleading "space used" The "Project file size" field in the History dialog didn't work because it didn't take the journal size into account. So, I removed the field and improved the size calculation a bit for the sample blocks. --- src/HistoryWindow.cpp | 9 --------- src/HistoryWindow.h | 1 - src/SqliteSampleBlock.cpp | 3 ++- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/HistoryWindow.cpp b/src/HistoryWindow.cpp index a135b133f..9633f91bc 100644 --- a/src/HistoryWindow.cpp +++ b/src/HistoryWindow.cpp @@ -100,11 +100,6 @@ HistoryDialog::HistoryDialog(AudacityProject *parent, UndoManager *manager): S.StartMultiColumn(3, wxCENTRE); { - mFileSize = S.Id(ID_FILESIZE) - .ConnectRoot(wxEVT_KEY_DOWN, &HistoryDialog::OnChar) - .AddTextBox(XXO("&Project file size"), wxT("0"), 10); - S.AddVariableText( {} )->Hide(); - mTotal = S.Id(ID_TOTAL) .ConnectRoot(wxEVT_KEY_DOWN, &HistoryDialog::OnChar) .AddTextBox(XXO("&Total space used"), wxT("0"), 10); @@ -208,10 +203,6 @@ void HistoryDialog::DoUpdate() mList->DeleteAllItems(); - wxFileName filename(ProjectFileIO::Get(*mProject).GetFileName()); - wxULongLong_t filesize = filename.GetSize().GetValue(); - mFileSize->SetValue(Internat::FormatSize(filesize).Translation()); - wxLongLong_t total = 0; mSelected = mManager->GetCurrentState() - 1; for (i = 0; i < (int)mManager->GetNumStates(); i++) { diff --git a/src/HistoryWindow.h b/src/HistoryWindow.h index 089b95ae5..e86eb3fc6 100644 --- a/src/HistoryWindow.h +++ b/src/HistoryWindow.h @@ -46,7 +46,6 @@ class HistoryDialog final : public wxDialogWrapper { AudacityProject *mProject; UndoManager *mManager; wxListCtrl *mList; - wxTextCtrl *mFileSize; wxTextCtrl *mTotal; wxTextCtrl *mClipboard; wxTextCtrl *mAvail; diff --git a/src/SqliteSampleBlock.cpp b/src/SqliteSampleBlock.cpp index ae1760dc6..c4752bbf0 100644 --- a/src/SqliteSampleBlock.cpp +++ b/src/SqliteSampleBlock.cpp @@ -433,7 +433,8 @@ MinMaxRMS SqliteSampleBlock::DoGetMinMaxRMS() const size_t SqliteSampleBlock::GetSpaceUsage() const { - return mSampleCount * SAMPLE_SIZE(mSampleFormat); + // Not an exact number, but close enough + return mSummary256Bytes + mSummary64kBytes + mSampleBytes; } size_t SqliteSampleBlock::GetBlob(void *dest,