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

Moved mixer board update code out of class AudacityProject...

Browse Source 
... And we don't need GetMixerBoard() any more
This commit is contained in:
Paul Licameli 2018-02-17 17:33:35 -05:00
parent 723cecbeac
commit 012ea76132
4 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/MixerBoard.cpp
View File

@ -937,7 +937,8 @@ MixerBoard::MixerBoard(AudacityProject* pProject,
void MixerBoard::UpdatePrefs() void MixerBoard::UpdatePrefs()
{ {
mProject->RecreateMixerBoard(); // Destroys this:
static_cast<MixerBoardFrame*>(GetParent())->Recreate( mProject );
// Old approach modified things in situ. // Old approach modified things in situ.
// However with a theme change there is so much to modify, it is easier // However with a theme change there is so much to modify, it is easier
@ -1450,4 +1451,22 @@ void MixerBoardFrame::OnKeyEvent(wxKeyEvent & event)
project->GetCommandManager()->FilterKeyEvent(project, event, true); project->GetCommandManager()->FilterKeyEvent(project, event, true);
} }
void MixerBoardFrame::Recreate( AudacityProject *pProject )
{
wxPoint pos = mMixerBoard->GetPosition();
wxSize siz = mMixerBoard->GetSize();
wxSize siz2 = this->GetSize();
//wxLogDebug("Got rid of board %p", mMixerBoard );
mMixerBoard->Destroy();
mMixerBoard = NULL;
mMixerBoard = safenew MixerBoard(pProject, this, pos, siz);
//wxLogDebug("Created NEW board %p", mMixerBoard );
mMixerBoard->UpdateTrackClusters();
mMixerBoard->SetSize( siz );
this->SetSize( siz2 );
}

2
src/MixerBoard.h
View File

@ -266,6 +266,8 @@ public:
MixerBoardFrame(AudacityProject* parent); MixerBoardFrame(AudacityProject* parent);
virtual ~MixerBoardFrame(); virtual ~MixerBoardFrame();
void Recreate(AudacityProject *pProject);
private: private:
// event handlers // event handlers
void OnCloseWindow(wxCloseEvent &WXUNUSED(event)); void OnCloseWindow(wxCloseEvent &WXUNUSED(event));

18
src/Project.cpp
View File

@ -4713,24 +4713,6 @@ void AudacityProject::SetStateTo(unsigned int n)
GetMenuManager(*this).ModifyUndoMenuItems(*this); GetMenuManager(*this).ModifyUndoMenuItems(*this);
} }
void AudacityProject::RecreateMixerBoard( )
{
wxASSERT( mMixerBoard );
wxASSERT( mMixerBoardFrame );
wxPoint pos = mMixerBoard->GetPosition();
wxSize siz = mMixerBoard->GetSize();
wxSize siz2 = mMixerBoardFrame->GetSize();
//wxLogDebug("Got rid of board %p", mMixerBoard );
mMixerBoard->Destroy();
mMixerBoard = NULL;
mMixerBoard = safenew MixerBoard(this, mMixerBoardFrame, pos, siz);
mMixerBoardFrame->mMixerBoard = mMixerBoard;
//wxLogDebug("Created NEW board %p", mMixerBoard );
mMixerBoard->UpdateTrackClusters();
mMixerBoard->SetSize( siz );
mMixerBoardFrame->SetSize( siz2 );
}
// //
// Clipboard methods // Clipboard methods
// //

2
src/Project.h
View File

@ -531,7 +531,6 @@ public:
LyricsWindow* GetLyricsWindow(bool create = false); LyricsWindow* GetLyricsWindow(bool create = false);
MixerBoardFrame* GetMixerBoardFrame(bool create = false); MixerBoardFrame* GetMixerBoardFrame(bool create = false);
MixerBoard* GetMixerBoard() { return mMixerBoard; }
HistoryWindow *GetHistoryWindow(bool create = false); HistoryWindow *GetHistoryWindow(bool create = false);
MacrosWindow *GetMacrosWindow(bool bExpanded, bool create = false); MacrosWindow *GetMacrosWindow(bool bExpanded, bool create = false);
FreqWindow *GetFreqWindow(bool create = false); FreqWindow *GetFreqWindow(bool create = false);
@ -601,7 +600,6 @@ public:
public: public:
void ModifyState(bool bWantsAutoSave); // if true, writes auto-save file. Should set only if you really want the state change restored after void ModifyState(bool bWantsAutoSave); // if true, writes auto-save file. Should set only if you really want the state change restored after
// a crash, as it can take many seconds for large (eg. 10 track-hours) projects // a crash, as it can take many seconds for large (eg. 10 track-hours) projects
void RecreateMixerBoard();
void PopState(const UndoState &state); void PopState(const UndoState &state);