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

Use enum class ProgressResult, don't interconvert with int or bool

Browse Source
This commit is contained in:
Paul Licameli
2016-12-24 10:43:25 -05:00
parent 5036583549
commit aa0d55ac83
33 changed files with 216 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/export/ExportMP3.cpp
View File

@@ -1602,7 +1602,7 @@ public:
// Required
wxWindow *OptionsCreate(wxWindow *parent, int format);
int Export(AudacityProject *project,
ProgressResult Export(AudacityProject *project,
unsigned channels,
const wxString &fName,
bool selectedOnly,
@@ -1662,7 +1662,7 @@ int ExportMP3::SetNumExportChannels()
}
int ExportMP3::Export(AudacityProject *project,
ProgressResult ExportMP3::Export(AudacityProject *project,
unsigned channels,
const wxString &fName,
bool selectionOnly,
@@ -1693,7 +1693,7 @@ int ExportMP3::Export(AudacityProject *project,
gPrefs->Write(wxT("/MP3/MP3LibPath"), wxString(wxT("")));
gPrefs->Flush();
return false;
return ProgressResult::Cancelled;
}
if (!exporter.ValidLibraryLoaded()) {
@@ -1701,7 +1701,7 @@ int ExportMP3::Export(AudacityProject *project,
gPrefs->Write(wxT("/MP3/MP3LibPath"), wxString(wxT("")));
gPrefs->Flush();
return false;
return ProgressResult::Cancelled;
}
#endif // DISABLE_DYNAMIC_LOADING_LAME
@@ -1764,7 +1764,7 @@ int ExportMP3::Export(AudacityProject *project,
(rate < lowrate) || (rate > highrate)) {
rate = AskResample(bitrate, rate, lowrate, highrate);
if (rate == 0) {
return false;
return ProgressResult::Cancelled;
}
}
@@ -1782,7 +1782,7 @@ int ExportMP3::Export(AudacityProject *project,
auto inSamples = exporter.InitializeStream(channels, rate);
if (((int)inSamples) < 0) {
wxMessageBox(_("Unable to initialize MP3 stream"));
return false;
return ProgressResult::Cancelled;
}
// Put ID3 tags at beginning of file
@@ -1793,7 +1793,7 @@ int ExportMP3::Export(AudacityProject *project,
wxFFile outFile(fName, wxT("w+b"));
if (!outFile.IsOpened()) {
wxMessageBox(_("Unable to open target file for writing"));
return false;
return ProgressResult::Cancelled;
}
char *id3buffer = NULL;
@@ -1805,7 +1805,7 @@ int ExportMP3::Export(AudacityProject *project,
}
wxFileOffset pos = outFile.Tell();
int updateResult = eProgressSuccess;
auto updateResult = ProgressResult::Success;
long bytes;
int bufferSize = exporter.GetOutBufferSize();
@@ -1843,7 +1843,7 @@ int ExportMP3::Export(AudacityProject *project,
ProgressDialog progress(wxFileName(fName).GetName(), title);
while (updateResult == eProgressSuccess) {
while (updateResult == ProgressResult::Success) {
auto blockLen = mixer->Process(inSamples);
if (blockLen == 0) {