Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-16 15:41:11 +02: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

12
src/export/ExportMP2.cpp
View File

@@ -173,7 +173,7 @@ public:
// Required
wxWindow *OptionsCreate(wxWindow *parent, int format);
int Export(AudacityProject *project,
ProgressResult Export(AudacityProject *project,
unsigned channels,
const wxString &fName,
bool selectedOnly,
@@ -203,7 +203,7 @@ ExportMP2::ExportMP2()
SetDescription(_("MP2 Files"),0);
}
int ExportMP2::Export(AudacityProject *project,
ProgressResult ExportMP2::Export(AudacityProject *project,
unsigned channels, const wxString &fName,
bool selectionOnly, double t0, double t1, MixerSpec *mixerSpec, const Tags *metadata,
int WXUNUSED(subformat))
@@ -228,7 +228,7 @@ int ExportMP2::Export(AudacityProject *project,
wxMessageBox(_("Cannot export MP2 with this sample rate and bit rate"),
_("Error"), wxICON_STOP);
twolame_close(&encodeOptions);
return false;
return ProgressResult::Cancelled;
}
// Put ID3 tags at beginning of file
@@ -239,7 +239,7 @@ int ExportMP2::Export(AudacityProject *project,
if (!outFile.IsOpened()) {
wxMessageBox(_("Unable to open target file for writing"));
twolame_close(&encodeOptions);
return false;
return ProgressResult::Cancelled;
}
char *id3buffer = NULL;
@@ -260,7 +260,7 @@ int ExportMP2::Export(AudacityProject *project,
const WaveTrackConstArray waveTracks =
tracks->GetWaveTrackConstArray(selectionOnly, false);
int updateResult = eProgressSuccess;
auto updateResult = ProgressResult::Success;
{
auto mixer = CreateMixer(waveTracks,
tracks->GetTimeTrack(),
@@ -273,7 +273,7 @@ int ExportMP2::Export(AudacityProject *project,
wxString::Format(_("Exporting selected audio at %ld kbps"), bitrate) :
wxString::Format(_("Exporting entire file at %ld kbps"), bitrate));
while (updateResult == eProgressSuccess) {
while (updateResult == ProgressResult::Success) {
auto pcmNumSamples = mixer->Process(pcmBufferSize);
if (pcmNumSamples == 0)