Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-01 08:09:41 +02:00
Code Issues Releases Wiki Activity

Replace last wxProgressDialog with ProgressDialog; remove all wx/progdlg.h

Browse Source
This commit is contained in:
Paul Licameli 2020-05-06 13:48:40 -04:00
parent 928f3c8788
commit c941647db6
14 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/AudacityHeaders.h
View File

@ -35,7 +35,6 @@
#include <wx/image.h>
#include <wx/ffile.h>
#include <wx/filename.h>
#include <wx/progdlg.h>
#include <wx/textfile.h>
#include <wx/thread.h>
#include <wx/tooltip.h>

1
src/Dependencies.cpp
View File

@ -43,7 +43,6 @@ AliasedFile s.
#include <wx/filename.h>
#include <wx/listctrl.h>
#include <wx/menu.h>
#include <wx/progdlg.h>
#include <wx/choice.h>
#include <wx/clipbrd.h>
#include <wx/dataobj.h>

1
src/DirManager.cpp
View File

@ -72,7 +72,6 @@
#include <wx/log.h>
#include <wx/filefn.h>
#include <wx/hash.h>
#include <wx/progdlg.h>
#include <wx/timer.h>
#include <wx/intl.h>
#include <wx/file.h>

1
src/Mix.cpp
View File

@ -27,7 +27,6 @@
#include <math.h>
#include <wx/textctrl.h>
#include <wx/progdlg.h>
#include <wx/timer.h>
#include <wx/intl.h>

1
src/TimerRecordDialog.cpp
View File

@ -35,7 +35,6 @@
#include <wx/datectrl.h>
#include <wx/datetime.h>
#include <wx/intl.h>
#include <wx/progdlg.h>
#include <wx/sizer.h>
#include <wx/string.h>
#include <wx/timer.h>

2
src/effects/VST/VSTControlGTK.h
View File

@ -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 <gtk/gtk.h>
#include <gdk/gdkx.h>
#undef Success
#undef Region
#include "VSTControl.h"

27
src/effects/VST/VSTEffect.cpp
View File

@ -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 <wx/log.h>
#include <wx/module.h>
#include <wx/process.h>
#include <wx/progdlg.h>
#include <wx/recguard.h>
#include <wx/sizer.h>
#include <wx/slider.h>
@ -517,7 +518,7 @@ unsigned VSTEffectsModule::DiscoverPluginsAtPath(
wxString effectIDs = wxT("0;");
wxStringTokenizer effectTzr(effectIDs, wxT(";"));
Optional<wxProgressDialog> progress{};
Optional<ProgressDialog> 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<int>(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)

1
src/export/Export.cpp
View File

@ -35,7 +35,6 @@
#include <wx/file.h>
#include <wx/filectrl.h>
#include <wx/filename.h>
#include <wx/progdlg.h>
#include <wx/simplebook.h>
#include <wx/sizer.h>
#include <wx/slider.h>

1
src/export/ExportFFmpeg.cpp
View File

@ -26,7 +26,6 @@ function.
#include <wx/choice.h>
#include <wx/intl.h>
#include <wx/timer.h>
#include <wx/progdlg.h>
#include <wx/string.h>
#include <wx/textctrl.h>
#include <wx/listbox.h>

1
src/export/ExportFFmpegDialogs.cpp
View File

@ -50,7 +50,6 @@
#include <wx/choice.h>
#include <wx/intl.h>
#include <wx/timer.h>
#include <wx/progdlg.h>
#include <wx/string.h>
#include <wx/textctrl.h>
#include <wx/listbox.h>

1
src/export/ExportFLAC.cpp
View File

@ -24,7 +24,6 @@ and libvorbis examples, Monty <monty@xiph.org>
#include "Export.h"
#include <wx/progdlg.h>
#include <wx/ffile.h>
#include <wx/log.h>

1
src/export/ExportPCM.cpp
View File

@ -17,7 +17,6 @@
#include <wx/filename.h>
#include <wx/intl.h>
#include <wx/timer.h>
#include <wx/progdlg.h>
#include <wx/string.h>
#include <wx/textctrl.h>
#include <wx/window.h>

1
src/import/ImportMP3.cpp
View File

@ -65,7 +65,6 @@ static Importer::RegisteredUnusableImportPlugin registered{
#include <wx/textctrl.h>
#include <wx/file.h>
#include <wx/thread.h>
#include <wx/progdlg.h>
#include <wx/string.h>
#include <wx/timer.h>
#include <wx/intl.h>

1
src/import/ImportRaw.cpp
View File

@ -44,7 +44,6 @@ and sample size to help you importing data of an unknown format.
#include <wx/choice.h>
#include <wx/intl.h>
#include <wx/panel.h>
#include <wx/progdlg.h>
#include <wx/sizer.h>
#include <wx/stattext.h>
#include <wx/textctrl.h>