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

Remove overwrite argument -- it's always !fromSaveAs

Browse Source
This commit is contained in:
Paul Licameli 2018-01-16 17:34:27 -05:00
parent 1d9b8b7bad
commit 4d364ee7f3
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Project.cpp
View File

@ -3774,13 +3774,13 @@ bool AudacityProject::Save()
if (mDirManager->GetProjectName() == wxT("")) if (mDirManager->GetProjectName() == wxT(""))
return SaveAs(); return SaveAs();
return DoSave(true, false, false); return DoSave(false, false);
} }
// Assumes AudacityProject::mFileName has been set to the desired path. // Assumes AudacityProject::mFileName has been set to the desired path.
bool AudacityProject::DoSave bool AudacityProject::DoSave
(const bool overwrite, const bool fromSaveAs, const bool bWantSaveCompressed) (const bool fromSaveAs, const bool bWantSaveCompressed)
{ {
// See explanation above // See explanation above
// ProjectDisabler disabler(this); // ProjectDisabler disabler(this);
@ -3940,7 +3940,7 @@ bool AudacityProject::DoSave
// be empty of all of its files.) // be empty of all of its files.)
std::vector<movable_ptr<WaveTrack::Locker>> lockers; std::vector<movable_ptr<WaveTrack::Locker>> lockers;
if (mLastSavedTracks && !overwrite) { if (mLastSavedTracks && fromSaveAs) {
lockers.reserve(mLastSavedTracks->size()); lockers.reserve(mLastSavedTracks->size());
TrackListIterator iter(mLastSavedTracks.get()); TrackListIterator iter(mLastSavedTracks.get());
Track *t = iter.First(); Track *t = iter.First();
@ -3955,7 +3955,7 @@ bool AudacityProject::DoSave
// This renames the project directory, and moves or copies // This renames the project directory, and moves or copies
// all of our block files over. // all of our block files over.
success = mDirManager->SetProject(projPath, projName, !overwrite); success = mDirManager->SetProject(projPath, projName, fromSaveAs);
} }
if (!success) if (!success)
@ -4340,7 +4340,7 @@ bool AudacityProject::SaveAs(const wxString & newFileName, bool bWantSaveCompres
//Don't change the title, unless we succeed. //Don't change the title, unless we succeed.
//SetProjectTitle(); //SetProjectTitle();
success = DoSave(false, true, bWantSaveCompressed); success = DoSave(true, bWantSaveCompressed);
if (success && addToHistory) { if (success && addToHistory) {
wxGetApp().AddFileToHistory(mFileName); wxGetApp().AddFileToHistory(mFileName);
@ -4439,7 +4439,7 @@ For an audio file that will open in other apps, use 'Export'.\n"),
mFileName = oldFileName; mFileName = oldFileName;
} ); } );
success = DoSave(false, true, bWantSaveCompressed); success = DoSave(true, bWantSaveCompressed);
if (success) { if (success) {
wxGetApp().AddFileToHistory(mFileName); wxGetApp().AddFileToHistory(mFileName);
@ -5826,7 +5826,7 @@ bool AudacityProject::SaveFromTimerRecording(wxFileName fnFile) {
mFileName = sOldFilename; mFileName = sOldFilename;
} ); } );
bSuccess = DoSave(false, true, false); bSuccess = DoSave(true, false);
if (bSuccess) { if (bSuccess) {
wxGetApp().AddFileToHistory(mFileName); wxGetApp().AddFileToHistory(mFileName);

2
src/Project.h
View File

@ -279,7 +279,7 @@ public:
bool SaveCompressedWaveTracks(const wxString & strProjectPathName); // full path for aup except extension bool SaveCompressedWaveTracks(const wxString & strProjectPathName); // full path for aup except extension
#endif #endif
private: private:
bool DoSave(bool overwrite, bool fromSaveAs, bool bWantSaveCompressed); bool DoSave(bool fromSaveAs, bool bWantSaveCompressed);
public: public:
void Clear(); void Clear();