From c941647db6a8bef7491961fc88eba5505897cea8 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Wed, 6 May 2020 13:48:40 -0400 Subject: [PATCH] Replace last wxProgressDialog with ProgressDialog; remove all wx/progdlg.h --- src/AudacityHeaders.h | 1 - src/Dependencies.cpp | 1 - src/DirManager.cpp | 1 - src/Mix.cpp | 1 - src/TimerRecordDialog.cpp | 1 - src/effects/VST/VSTControlGTK.h | 2 ++ src/effects/VST/VSTEffect.cpp | 27 +++++++++++++++------------ src/export/Export.cpp | 1 - src/export/ExportFFmpeg.cpp | 1 - src/export/ExportFFmpegDialogs.cpp | 1 - src/export/ExportFLAC.cpp | 1 - src/export/ExportPCM.cpp | 1 - src/import/ImportMP3.cpp | 1 - src/import/ImportRaw.cpp | 1 - 14 files changed, 17 insertions(+), 24 deletions(-) diff --git a/src/AudacityHeaders.h b/src/AudacityHeaders.h index 5aee78fc5..56421d519 100644 --- a/src/AudacityHeaders.h +++ b/src/AudacityHeaders.h @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include diff --git a/src/Dependencies.cpp b/src/Dependencies.cpp index cdbbcd314..148ff4eb2 100644 --- a/src/Dependencies.cpp +++ b/src/Dependencies.cpp @@ -43,7 +43,6 @@ AliasedFile s. #include #include #include -#include #include #include #include diff --git a/src/DirManager.cpp b/src/DirManager.cpp index 71922a395..eacfcd3ae 100644 --- a/src/DirManager.cpp +++ b/src/DirManager.cpp @@ -72,7 +72,6 @@ #include #include #include -#include #include #include #include diff --git a/src/Mix.cpp b/src/Mix.cpp index 4ce9a63aa..bab990f00 100644 --- a/src/Mix.cpp +++ b/src/Mix.cpp @@ -27,7 +27,6 @@ #include #include -#include #include #include diff --git a/src/TimerRecordDialog.cpp b/src/TimerRecordDialog.cpp index fa2fab4c4..a2680e052 100644 --- a/src/TimerRecordDialog.cpp +++ b/src/TimerRecordDialog.cpp @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include diff --git a/src/effects/VST/VSTControlGTK.h b/src/effects/VST/VSTControlGTK.h index 87d9e7406..24f088966 100644 --- a/src/effects/VST/VSTControlGTK.h +++ b/src/effects/VST/VSTControlGTK.h @@ -11,10 +11,12 @@ #ifndef AUDACITY_VSTCONTROLGTK_H #define AUDACITY_VSTCONTROLGTK_H + // Must include after ours since we have a lot of name collisions #define Region XRegion // Conflicts with Audacity's Region structure #include #include +#undef Success #undef Region #include "VSTControl.h" diff --git a/src/effects/VST/VSTEffect.cpp b/src/effects/VST/VSTEffect.cpp index 8512ef31a..d5c9050cb 100644 --- a/src/effects/VST/VSTEffect.cpp +++ b/src/effects/VST/VSTEffect.cpp @@ -27,6 +27,8 @@ #include "../../Audacity.h" // for USE_* macros #include "VSTEffect.h" +#include "../../widgets/ProgressDialog.h" + #if 0 #if defined(BUILDING_AUDACITY) #include "../../PlatformCompatibility.h" @@ -58,7 +60,6 @@ #include #include #include -#include #include #include #include @@ -517,7 +518,7 @@ unsigned VSTEffectsModule::DiscoverPluginsAtPath( wxString effectIDs = wxT("0;"); wxStringTokenizer effectTzr(effectIDs, wxT(";")); - Optional progress{}; + Optional progress{}; size_t idCnt = 0; size_t idNdx = 0; @@ -577,17 +578,18 @@ unsigned VSTEffectsModule::DiscoverPluginsAtPath( idCnt = effectTzr.CountTokens(); if (idCnt > 3) { - progress.emplace( _("Scanning Shell VST"), - wxString::Format(_("Registering %d of %d: %-64.64s"), 0, idCnt, - proc.GetSymbol().Translation()), - static_cast(idCnt), - nullptr, - wxPD_APP_MODAL | + progress.emplace( XO("Scanning Shell VST"), + XO("Registering %d of %d: %-64.64s") + .Format( 0, idCnt, proc.GetSymbol().Translation()) + /* + , wxPD_APP_MODAL | wxPD_AUTO_HIDE | wxPD_CAN_ABORT | wxPD_ELAPSED_TIME | wxPD_ESTIMATED_TIME | - wxPD_REMAINING_TIME ); + wxPD_REMAINING_TIME + */ + ); progress->Show(); } break; @@ -652,9 +654,10 @@ unsigned VSTEffectsModule::DiscoverPluginsAtPath( if (progress) { idNdx++; - cont = progress->Update(idNdx, - wxString::Format(_("Registering %d of %d: %-64.64s"), idNdx, idCnt, - proc.GetSymbol().Translation() )); + auto result = progress->Update((int)idNdx, (int)idCnt, + XO("Registering %d of %d: %-64.64s") + .Format( idNdx, idCnt, proc.GetSymbol().Translation() )); + cont = (result == ProgressResult::Success); } if (!skip && cont) diff --git a/src/export/Export.cpp b/src/export/Export.cpp index 81984ae49..d404a071b 100644 --- a/src/export/Export.cpp +++ b/src/export/Export.cpp @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include diff --git a/src/export/ExportFFmpeg.cpp b/src/export/ExportFFmpeg.cpp index aacf2bbf3..69419c017 100644 --- a/src/export/ExportFFmpeg.cpp +++ b/src/export/ExportFFmpeg.cpp @@ -26,7 +26,6 @@ function. #include #include #include -#include #include #include #include diff --git a/src/export/ExportFFmpegDialogs.cpp b/src/export/ExportFFmpegDialogs.cpp index 4f4528ef3..1cf972f27 100644 --- a/src/export/ExportFFmpegDialogs.cpp +++ b/src/export/ExportFFmpegDialogs.cpp @@ -50,7 +50,6 @@ #include #include #include -#include #include #include #include diff --git a/src/export/ExportFLAC.cpp b/src/export/ExportFLAC.cpp index 8a81a3266..888fcbfb8 100644 --- a/src/export/ExportFLAC.cpp +++ b/src/export/ExportFLAC.cpp @@ -24,7 +24,6 @@ and libvorbis examples, Monty #include "Export.h" -#include #include #include diff --git a/src/export/ExportPCM.cpp b/src/export/ExportPCM.cpp index 0871d9542..3836443ae 100644 --- a/src/export/ExportPCM.cpp +++ b/src/export/ExportPCM.cpp @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include diff --git a/src/import/ImportMP3.cpp b/src/import/ImportMP3.cpp index 5d83630e3..4d57d789b 100644 --- a/src/import/ImportMP3.cpp +++ b/src/import/ImportMP3.cpp @@ -65,7 +65,6 @@ static Importer::RegisteredUnusableImportPlugin registered{ #include #include #include -#include #include #include #include diff --git a/src/import/ImportRaw.cpp b/src/import/ImportRaw.cpp index 87dab5b81..45127bc14 100644 --- a/src/import/ImportRaw.cpp +++ b/src/import/ImportRaw.cpp @@ -44,7 +44,6 @@ and sample size to help you importing data of an unknown format. #include #include #include -#include #include #include #include