Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-09-16 16:20:50 +02:00
Code Issues Releases Wiki Activity

Get rid of AutoSaveMinutes pref, as it wasn't actually used correctly.

Browse Source 
Now doing autosave on every PushState, ModifyState, and PopState.
This commit is contained in:
v.audacity 2010-06-30 23:19:21 +00:00
parent 60dbfddd06
commit 406594a1dc
3 changed files with 33 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/Project.cpp
View File

@ -2452,12 +2452,15 @@ void AudacityProject::OpenFile(wxString fileName, bool addtohistory)
// recovered file mFileName is faked to point to the original file
// which has been recovered, not the one in the auto-save folder.
GetDirManager()->ProjectFSCK(err, true); // silently correct problems
AutoSave();
// PushState calls AutoSave(), so no longer need to do so here.
this->PushState(_("Project was recovered"), _("Recover"));
if (!wxRemoveFile(fileName))
wxMessageBox(_("Could not remove old auto save file"),
_("Error"), wxICON_STOP, this);
this->PushState(_("Project was recovered"), _("Recover"));
} else
}
else
{
// This is a regular project, check it and ask user
int status=GetDirManager()->ProjectFSCK(err, false);
@ -3008,7 +3011,7 @@ bool AudacityProject::Save(bool overwrite /* = true */ ,
bool success = false;
if (bWantSaveCompressed)
{
//vvv Move this condition into SaveCompressedWaveTracks() if want to support other formats.
//v Move this condition into SaveCompressedWaveTracks() if want to support other formats.
#ifdef USE_LIBVORBIS
success = this->SaveCompressedWaveTracks(project);
#endif
@ -3533,12 +3536,15 @@ void AudacityProject::PushState(wxString desc,
if (GetTracksFitVerticallyZoomed())
this->DoZoomFitV();
AutoSaveIfNeeded();
if (IsAutoSaveEnabled())
AutoSave();
}
void AudacityProject::ModifyState()
{
mUndoManager.ModifyState(mTracks, mViewInfo.sel0, mViewInfo.sel1);
if (IsAutoSaveEnabled())
AutoSave();
}
// LL: Is there a memory leak here as "l" and "t" are not deleted???
@ -3594,6 +3600,9 @@ void AudacityProject::PopState(TrackList * l)
#ifdef EXPERIMENTAL_MIXER_BOARD
this->UpdateMixerBoard();
#endif
if (IsAutoSaveEnabled())
AutoSave();
}
void AudacityProject::SetStateTo(unsigned int n)
@ -4253,24 +4262,6 @@ void AudacityProject::ReleaseKeyboard(wxWindow *w)
}
}
void AudacityProject::DeleteCurrentAutoSaveFile()
{
if (!mAutoSaveFileName.IsEmpty())
{
if (wxFileExists(mAutoSaveFileName))
{
if (!wxRemoveFile(mAutoSaveFileName))
{
wxMessageBox(_("Could not remove old autosave file: ") +
mAutoSaveFileName, _("Error"), wxICON_STOP, this);
return;
}
}
mAutoSaveFileName = wxT("");
}
}
// static
bool AudacityProject::IsAutoSaveEnabled()
{
@ -4279,22 +4270,6 @@ bool AudacityProject::IsAutoSaveEnabled()
return autoSaveEnabled;
}
void AudacityProject::AutoSaveIfNeeded()
{
if (!IsAutoSaveEnabled())
return; // user disabled auto-save
double autoSaveMinutes = 2.0;
gPrefs->Read(wxT("/Directories/AutoSaveMinutes"), &autoSaveMinutes);
if (mAutoSaveFileName.IsEmpty() ||
wxGetLocalTime() > mLastAutoSaveTime + autoSaveMinutes * 60)
{
// We need to auto-save, so do it
AutoSave();
}
}
void AudacityProject::AutoSave()
{
// To minimize the possibility of race conditions, we first write to a
@ -4356,6 +4331,25 @@ void AudacityProject::AutoSave()
mLastAutoSaveTime = wxGetLocalTime();
}
void AudacityProject::DeleteCurrentAutoSaveFile()
{
if (!mAutoSaveFileName.IsEmpty())
{
if (wxFileExists(mAutoSaveFileName))
{
if (!wxRemoveFile(mAutoSaveFileName))
{
wxMessageBox(_("Could not remove old autosave file: ") +
mAutoSaveFileName, _("Error"), wxICON_STOP, this);
return;
}
}
mAutoSaveFileName = wxT("");
}
}
void AudacityProject::MayStartMonitoring()
{
#ifdef EXPERIMENTAL_EXTRA_MONITORING

1
src/Project.h
View File

@ -408,7 +408,6 @@ class AUDACITY_DLL_API AudacityProject: public wxFrame,
void GetRegionsByLabel( Regions &regions );
void AutoSaveIfNeeded();
void AutoSave();
static bool IsAutoSaveEnabled();
void DeleteCurrentAutoSaveFile();

13
src/prefs/ProjectsPrefs.cpp
View File

@ -52,8 +52,6 @@ void ProjectsPrefs::Populate()
void ProjectsPrefs::PopulateOrExchange(ShuttleGui & S)
{
wxTextCtrl *w;
S.SetBorder(2);
S.StartStatic(_("When saving a project that depends on other audio files"));
@ -76,17 +74,6 @@ void ProjectsPrefs::PopulateOrExchange(ShuttleGui & S)
S.TieCheckBox(_("Auto &save a copy of the project in a separate folder"),
wxT("/Directories/AutoSaveEnabled"),
true);
S.StartThreeColumn();
{
w = S.TieTextBox(_("Auto save in&terval:"),
wxT("/Directories/AutoSaveMinutes"),
2.0,
9);
S.AddUnits(_("minutes"));
w->SetName(w->GetName() + wxT(" ") + _("minutes"));
}
S.EndThreeColumn();
}
S.EndStatic();
}