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

Eliminate calls to GetActiveProject in src/prefs

Browse Source
This commit is contained in:
Paul Licameli
2020-01-04 13:15:07 -05:00
parent c3b32d1106
commit f924df16f8
6 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/prefs/WaveformPrefs.cpp
View File

@@ -30,9 +30,11 @@ Paul Licameli
#include "../tracks/playabletrack/wavetrack/ui/WaveTrackView.h"
#include "../tracks/playabletrack/wavetrack/ui/WaveTrackViewConstants.h"
WaveformPrefs::WaveformPrefs(wxWindow * parent, wxWindowID winid, WaveTrack *wt)
WaveformPrefs::WaveformPrefs(wxWindow * parent, wxWindowID winid,
AudacityProject *pProject, WaveTrack *wt)
/* i18n-hint: A waveform is a visual representation of vibration */
: PrefsPanel(parent, winid, XO("Waveforms"))
, mProject{ pProject }
, mWt(wt)
, mPopulating(false)
{
@@ -191,9 +193,8 @@ bool WaveformPrefs::Commit()
}
if (isOpenPage) {
auto pProject = ::GetActiveProject();
if ( pProject ) {
auto &tp = TrackPanel::Get( *pProject );
if ( mProject ) {
auto &tp = TrackPanel::Get( *mProject );
tp.UpdateVRulers();
tp.Refresh(false);
}
@@ -256,9 +257,9 @@ END_EVENT_TABLE()
PrefsPanel::Factory
WaveformPrefsFactory(WaveTrack *wt)
{
return [=](wxWindow *parent, wxWindowID winid, AudacityProject *)
return [=](wxWindow *parent, wxWindowID winid, AudacityProject *pProject)
{
wxASSERT(parent); // to justify safenew
return safenew WaveformPrefs(parent, winid, wt);
return safenew WaveformPrefs(parent, winid, pProject, wt);
};
}