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

WaveTrackView::BuildSubViews can be simplified...

Browse Source 
... The setting of scale type now happens in the default constructor of
WaveformSettings, which calls LoadPrefs.

Since creation of WaveformSettings is always forced, we don't need the
distinction between WaveTrack::GetWaveformSettings and
WaveTrack::GetIndependentWaveformSettings.

That distinction was more analogy with the handling of SpectrogramSettings that
we don't need now.
This commit is contained in:
Paul Licameli
2020-10-10 11:14:20 -04:00
parent 046548ad2b
commit 9d6cfcc746
7 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/WaveTrack.cpp
View File

@@ -704,22 +704,13 @@ void WaveTrack::UseSpectralPrefs( bool bUse )
const WaveformSettings &WaveTrack::GetWaveformSettings() const
{
if (mpWaveformSettings)
return *mpWaveformSettings;
else
return WaveformSettings::defaults();
// Create on demand
return const_cast<WaveTrack*>(this)->GetWaveformSettings();
}
WaveformSettings &WaveTrack::GetWaveformSettings()
{
if (mpWaveformSettings)
return *mpWaveformSettings;
else
return WaveformSettings::defaults();
}
WaveformSettings &WaveTrack::GetIndependentWaveformSettings()
{
// Create on demand
if (!mpWaveformSettings)
mpWaveformSettings = std::make_unique<WaveformSettings>(WaveformSettings::defaults());
return *mpWaveformSettings;