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

static UndoManager::Get()...

Browse Source 
... not member functions of AudacityProject
This commit is contained in:
Paul Licameli
2019-01-21 17:45:03 -05:00
parent b5a57682b6
commit 72b7c776a8
12 changed files with 69 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/Project.cpp
View File

@@ -1058,8 +1058,7 @@ AudacityProject::AudacityProject(wxWindow * parent, wxWindowID id,
gPrefs->Read(wxT("/FrequencySelectionFormatName"), wxT("")) ) ),
mBandwidthSelectionFormatName( NumericTextCtrl::LookupFormat(
NumericConverter::BANDWIDTH,
gPrefs->Read(wxT("/BandwidthSelectionFormatName"), wxT("")) ) ),
mUndoManager(std::make_unique<UndoManager>())
gPrefs->Read(wxT("/BandwidthSelectionFormatName"), wxT("")) ) )
, mCommandManager( std::make_unique<CommandManager>() )
{
auto &project = *this;
@@ -2562,7 +2561,7 @@ void AudacityProject::OnCloseWindow(wxCloseEvent & event)
// We may not bother to prompt the user to save, if the
// project is now empty.
if (event.CanVeto() && (mEmptyCanBeDirty || bHasTracks)) {
if (GetUndoManager()->UnsavedChanges()) {
if ( UndoManager::Get( project ).UnsavedChanges() ) {
TitleRestorer Restorer( this );// RAII
/* i18n-hint: The first %s numbers the project, the second %s is the project name.*/
wxString Title = wxString::Format(_("%sSave changes to %s?"), Restorer.sProjNumber, Restorer.sProjName);
@@ -2678,7 +2677,7 @@ void AudacityProject::OnCloseWindow(wxCloseEvent & event)
// This must be done before the following Deref() since it holds
// references to the DirManager.
GetUndoManager()->ClearStates();
UndoManager::Get( project ).ClearStates();
// MM: Tell the DirManager it can now DELETE itself
// if it finds it is no longer needed. If it is still
@@ -3854,6 +3853,7 @@ bool AudacityProject::DoSave (const bool fromSaveAs,
{
// See explanation above
// ProjectDisabler disabler(this);
auto &proj = *this;
wxASSERT_MSG(!bWantSaveCopy || fromSaveAs, "Copy Project SHOULD only be availabele from SaveAs");
@@ -3864,7 +3864,7 @@ bool AudacityProject::DoSave (const bool fromSaveAs,
auto &tracks = TrackList::Get( project );
if ( ! tracks.Any() )
{
if (GetUndoManager()->UnsavedChanges() && mEmptyCanBeDirty) {
if ( UndoManager::Get( proj ).UnsavedChanges() && mEmptyCanBeDirty) {
int result = AudacityMessageBox(_("Your project is now empty.\nIf saved, the project will have no tracks.\n\nTo save any previously open tracks:\nClick 'No', Edit > Undo until all tracks\nare open, then File > Save Project.\n\nSave anyway?"),
_("Warning - Empty Project"),
wxYES_NO | wxICON_QUESTION, this);
@@ -4074,8 +4074,7 @@ bool AudacityProject::DoSave (const bool fromSaveAs,
mLastSavedTracks->Clear();
mLastSavedTracks = TrackList::Create();
auto &project = *this;
auto &tracks = TrackList::Get( project );
auto &tracks = TrackList::Get( proj );
for ( auto t : tracks.Any() ) {
mLastSavedTracks->Add(t->Duplicate());
@@ -4085,7 +4084,7 @@ bool AudacityProject::DoSave (const bool fromSaveAs,
// wt->MarkSaved();
}
GetUndoManager()->StateSaved();
UndoManager::Get( proj ).StateSaved();
}
// If we get here, saving the project was successful, so we can DELETE
@@ -4634,14 +4633,15 @@ void AudacityProject::InitialState()
auto &project = *this;
auto &tracks = TrackList::Get( project );
auto &viewInfo = ViewInfo::Get( project );
auto &undoManager = UndoManager::Get( project );
GetUndoManager()->ClearStates();
undoManager.ClearStates();
GetUndoManager()->PushState(
undoManager.PushState(
&tracks, viewInfo.selectedRegion, mTags,
_("Created new project"), wxT(""));
GetUndoManager()->StateSaved();
undoManager.StateSaved();
GetMenuManager(*this).ModifyUndoMenuItems(*this);
@@ -4652,7 +4652,8 @@ bool AudacityProject::UndoAvailable()
{
auto &project = *this;
auto &tracks = TrackList::Get( project );
return GetUndoManager()->UndoAvailable() &&
auto &undoManager = UndoManager::Get( project );
return undoManager.UndoAvailable() &&
!tracks.HasPendingTracks();
}
@@ -4660,8 +4661,9 @@ bool AudacityProject::RedoAvailable()
{
auto &project = *this;
auto &tracks = TrackList::Get( project );
return GetUndoManager()->RedoAvailable() &&
!tracks.HasPendingTracks();
auto &undoManager = UndoManager::Get( project );
return undoManager.RedoAvailable() &&
!tracks.HasPendingTracks();
}
void AudacityProject::PushState(const wxString &desc, const wxString &shortDesc)
@@ -4676,7 +4678,8 @@ void AudacityProject::PushState(const wxString &desc,
auto &project = *this;
auto &tracks = TrackList::Get( project );
auto &viewInfo = ViewInfo::Get( project );
GetUndoManager()->PushState(
auto &undoManager = UndoManager::Get( project );
undoManager.PushState(
&tracks, viewInfo.selectedRegion, mTags,
desc, shortDesc, flags);
@@ -4696,7 +4699,9 @@ void AudacityProject::PushState(const wxString &desc,
void AudacityProject::RollbackState()
{
SetStateTo(GetUndoManager()->GetCurrentState());
auto &project = *this;
auto &undoManager = UndoManager::Get( project );
SetStateTo( undoManager.GetCurrentState() );
}
void AudacityProject::ModifyState(bool bWantsAutoSave)
@@ -4704,7 +4709,8 @@ void AudacityProject::ModifyState(bool bWantsAutoSave)
auto &project = *this;
auto &tracks = TrackList::Get( project );
auto &viewInfo = ViewInfo::Get( project );
GetUndoManager()->ModifyState(
auto &undoManager = UndoManager::Get( project );
undoManager.ModifyState(
&tracks, viewInfo.selectedRegion, mTags);
if (bWantsAutoSave)
AutoSave();
@@ -4772,7 +4778,9 @@ void AudacityProject::PopState(const UndoState &state)
void AudacityProject::SetStateTo(unsigned int n)
{
GetUndoManager()->SetStateTo(n,
auto &project = *this;
auto &undoManager = UndoManager::Get( project );
undoManager.SetStateTo(n,
[this]( const UndoState &state ){ PopState(state); } );
HandleResize();
@@ -5354,7 +5362,8 @@ void AudacityProject::ResetProjectToEmpty() {
projectFileIO.ResetProjectFileIO();
mDirty = false;
GetUndoManager()->ClearStates();
auto &undoManager = UndoManager::Get( project );
undoManager.ClearStates();
}
void AudacityProject::ResetProjectFileIO()
@@ -5545,8 +5554,10 @@ MixerBoardFrame* AudacityProject::GetMixerBoardFrame(bool create)
HistoryWindow *AudacityProject::GetHistoryWindow(bool create)
{
auto &project = *this;
auto &undoManager = UndoManager::Get( project );
if (create && !mHistoryWindow)
mHistoryWindow = safenew HistoryWindow{ this, GetUndoManager() };
mHistoryWindow = safenew HistoryWindow{ this, &undoManager };
return mHistoryWindow;
}