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

Fewer C-style pointer casts of tracks; comments justify static_cast

Browse Source
This commit is contained in:
Paul Licameli 2016-09-15 09:54:38 -04:00
parent 837173e9ad
commit 88611a4530
18 changed files with 223 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/Menus.cpp
View File

@ -2994,11 +2994,11 @@ void AudacityProject::OnTrackPan()
if (!track || (track->GetKind() != Track::Wave)) {
return;
}
const auto wt = static_cast<WaveTrack*>(track);
LWSlider *slider = mTrackPanel->GetTrackInfo()->PanSlider
(static_cast<WaveTrack*>(track));
LWSlider *slider = mTrackPanel->GetTrackInfo()->PanSlider(wt);
if (slider->ShowDialog()) {
SetTrackPan(track, slider);
SetTrackPan(wt, slider);
}
}
@ -3008,11 +3008,11 @@ void AudacityProject::OnTrackPanLeft()
if (!track || (track->GetKind() != Track::Wave)) {
return;
}
const auto wt = static_cast<WaveTrack*>(track);
LWSlider *slider = mTrackPanel->GetTrackInfo()->PanSlider
(static_cast<WaveTrack*>(track));
LWSlider *slider = mTrackPanel->GetTrackInfo()->PanSlider(wt);
slider->Decrease(1);
SetTrackPan(track, slider);
SetTrackPan(wt, slider);
}
void AudacityProject::OnTrackPanRight()
@ -3021,11 +3021,11 @@ void AudacityProject::OnTrackPanRight()
if (!track || (track->GetKind() != Track::Wave)) {
return;
}
const auto wt = static_cast<WaveTrack*>(track);
LWSlider *slider = mTrackPanel->GetTrackInfo()->PanSlider
(static_cast<WaveTrack*>(track));
LWSlider *slider = mTrackPanel->GetTrackInfo()->PanSlider(wt);
slider->Increase(1);
SetTrackPan(track, slider);
SetTrackPan(wt, slider);
}
void AudacityProject::OnTrackGain()
@ -3035,11 +3035,11 @@ void AudacityProject::OnTrackGain()
if (!track || (track->GetKind() != Track::Wave)) {
return;
}
const auto wt = static_cast<WaveTrack*>(track);
LWSlider *slider = mTrackPanel->GetTrackInfo()->GainSlider
(static_cast<WaveTrack*>(track));
LWSlider *slider = mTrackPanel->GetTrackInfo()->GainSlider(wt);
if (slider->ShowDialog()) {
SetTrackGain(track, slider);
SetTrackGain(wt, slider);
}
}
@ -3049,11 +3049,11 @@ void AudacityProject::OnTrackGainInc()
if (!track || (track->GetKind() != Track::Wave)) {
return;
}
const auto wt = static_cast<WaveTrack*>(track);
LWSlider *slider = mTrackPanel->GetTrackInfo()->GainSlider
(static_cast<WaveTrack*>(track));
LWSlider *slider = mTrackPanel->GetTrackInfo()->GainSlider(wt);
slider->Increase(1);
SetTrackGain(track, slider);
SetTrackGain(wt, slider);
}
void AudacityProject::OnTrackGainDec()
@ -3062,11 +3062,11 @@ void AudacityProject::OnTrackGainDec()
if (!track || (track->GetKind() != Track::Wave)) {
return;
}
const auto wt = static_cast<WaveTrack*>(track);
LWSlider *slider = mTrackPanel->GetTrackInfo()->GainSlider
(static_cast<WaveTrack*>(track));
LWSlider *slider = mTrackPanel->GetTrackInfo()->GainSlider(wt);
slider->Decrease(1);
SetTrackGain(track, slider);
SetTrackGain(wt, slider);
}
void AudacityProject::OnTrackMenu()

8
src/MixerBoard.cpp
View File

@ -1036,7 +1036,9 @@ void MixerBoard::UpdateTrackClusters()
#else
mMixerTrackClusters[nClusterIndex]->mLeftTrack = (WaveTrack*)pLeftTrack;
#endif
mMixerTrackClusters[nClusterIndex]->mRightTrack = (WaveTrack*)pRightTrack;
// Assume linked track is wave or null
mMixerTrackClusters[nClusterIndex]->mRightTrack =
static_cast<WaveTrack*>(pRightTrack);
mMixerTrackClusters[nClusterIndex]->UpdateForStateChange();
}
else
@ -1051,7 +1053,9 @@ void MixerBoard::UpdateTrackClusters()
wxSize clusterSize(kMixerTrackClusterWidth, nClusterHeight);
pMixerTrackCluster =
safenew MixerTrackCluster(mScrolledWindow, this, mProject,
(WaveTrack*)pLeftTrack, (WaveTrack*)pRightTrack,
static_cast<WaveTrack*>(pLeftTrack),
// Assume linked track is wave or null
static_cast<WaveTrack*>(pRightTrack),
clusterPos, clusterSize);
if (pMixerTrackCluster)
mMixerTrackClusters.Add(pMixerTrackCluster);

26
src/Project.cpp
View File

@ -5233,38 +5233,36 @@ void AudacityProject::DoTrackSolo(Track *t, bool exclusive)
mTrackPanel->Refresh(false);
}
void AudacityProject::SetTrackGain(Track * track, LWSlider * slider)
void AudacityProject::SetTrackGain(WaveTrack * wt, LWSlider * slider)
{
wxASSERT(track);
if (track->GetKind() != Track::Wave)
return;
wxASSERT(wt);
float newValue = slider->Get();
WaveTrack *const link = static_cast<WaveTrack*>(mTracks->GetLink(track));
static_cast<WaveTrack*>(track)->SetGain(newValue);
// Assume linked track is wave or null
const auto link = static_cast<WaveTrack*>(mTracks->GetLink(wt));
wt->SetGain(newValue);
if (link)
link->SetGain(newValue);
PushState(_("Adjusted gain"), _("Gain"), UndoPush::CONSOLIDATE);
GetTrackPanel()->RefreshTrack(track);
GetTrackPanel()->RefreshTrack(wt);
}
void AudacityProject::SetTrackPan(Track * track, LWSlider * slider)
void AudacityProject::SetTrackPan(WaveTrack * wt, LWSlider * slider)
{
wxASSERT(track);
if (track->GetKind() != Track::Wave)
return;
wxASSERT(wt);
float newValue = slider->Get();
WaveTrack *const link = static_cast<WaveTrack*>(mTracks->GetLink(track));
static_cast<WaveTrack*>(track)->SetPan(newValue);
// Assume linked track is wave or null
const auto link = static_cast<WaveTrack*>(mTracks->GetLink(wt));
wt->SetPan(newValue);
if (link)
link->SetPan(newValue);
PushState(_("Adjusted Pan"), _("Pan"), UndoPush::CONSOLIDATE);
GetTrackPanel()->RefreshTrack(track);
GetTrackPanel()->RefreshTrack(wt);
}
/// Removes the specified track. Called from HandleClosing.

4
src/Project.h
View File

@ -371,8 +371,8 @@ class AUDACITY_DLL_API AudacityProject final : public wxFrame,
void DoTrackMute(Track *pTrack, bool exclusive);
void DoTrackSolo(Track *pTrack, bool exclusive);
void SetTrackGain(Track * track, LWSlider * slider);
void SetTrackPan(Track * track, LWSlider * slider);
void SetTrackGain(WaveTrack * track, LWSlider * slider);
void SetTrackPan(WaveTrack * track, LWSlider * slider);
void RemoveTrack(Track * toRemove);

3
src/Snap.h
View File

@ -25,6 +25,7 @@ class Track;
class TrackArray;
class TrackClipArray;
class WaveClip;
class WaveTrack;
class TrackList;
class ZoomInfo;
@ -42,7 +43,7 @@ public:
Track *track;
Track *origTrack;
Track *dstTrack;
WaveTrack *dstTrack;
WaveClip *clip;
movable_ptr<WaveClip> holder;
};

237
src/TrackPanel.cpp
View File

@ -726,13 +726,13 @@ void TrackPanel::DeleteMenus(void)
#ifdef EXPERIMENTAL_OUTPUT_DISPLAY
void TrackPanel::UpdateVirtualStereoOrder()
{
TrackListIterator iter(mTracks);
TrackListOfKindIterator iter(TrackKind::Wave, mTracks);
Track *t;
int temp;
for (t = iter.First(); t; t = iter.Next()) {
if(t->GetKind() == Track::Wave && t->GetChannel() == Track::MonoChannel){
WaveTrack *wt = (WaveTrack*)t;
const auto wt = static_cast<WaveTrack*>(t);
if(t->GetChannel() == Track::MonoChannel){
if(WaveTrack::mMonoAsVirtualStereo && wt->GetPan() != 0){
temp = wt->GetHeight();
@ -1474,19 +1474,18 @@ void TrackPanel::HandleCenterFrequencyCursor
}
void TrackPanel::HandleCenterFrequencyClick
(bool shiftDown, Track *pTrack, double value)
(bool shiftDown, const WaveTrack *wt, double value)
{
if (shiftDown) {
// Disable time selection
mSelStartValid = false;
mFreqSelTrack = static_cast<WaveTrack*>(pTrack);
mFreqSelTrack = wt;
mFreqSelPin = value;
mFreqSelMode = FREQ_SEL_DRAG_CENTER;
}
else {
#ifndef SPECTRAL_EDITING_ESC_KEY
// Start center snapping
WaveTrack *wt = static_cast<WaveTrack*>(pTrack);
// Turn center snapping on (the only way to do this)
mFreqSelMode = FREQ_SEL_SNAPPING_CENTER;
// Disable time selection
@ -2006,7 +2005,8 @@ void TrackPanel::SelectionHandleClick(wxMouseEvent & event,
case SBBottom:
case SBTop:
{
mFreqSelTrack = static_cast<const WaveTrack*>(pTrack);
// Reach this case only for wave tracks
mFreqSelTrack = static_cast<const WaveTrack *>(pTrack);
mFreqSelPin = value;
mFreqSelMode =
(boundary == SBBottom)
@ -2018,7 +2018,9 @@ void TrackPanel::SelectionHandleClick(wxMouseEvent & event,
break;
}
case SBCenter:
HandleCenterFrequencyClick(true, pTrack, value);
HandleCenterFrequencyClick(true,
// Reach this case only for wave tracks
static_cast<const WaveTrack *>(pTrack), value);
break;
#endif
default:
@ -2096,6 +2098,7 @@ void TrackPanel::SelectionHandleClick(wxMouseEvent & event,
startNewSelection = false;
// Disable time selection
mSelStartValid = false;
// Reach this case only for wave tracks
mFreqSelTrack = static_cast<const WaveTrack*>(pTrack);
mFreqSelPin = value;
mFreqSelMode =
@ -2104,7 +2107,9 @@ void TrackPanel::SelectionHandleClick(wxMouseEvent & event,
FREQ_SEL_TOP_FREE;
break;
case SBCenter:
HandleCenterFrequencyClick(false, pTrack, value);
HandleCenterFrequencyClick(false,
// Reach this case only for wave track
static_cast<const WaveTrack *>(pTrack), value);
startNewSelection = false;
break;
#endif
@ -2117,7 +2122,8 @@ void TrackPanel::SelectionHandleClick(wxMouseEvent & event,
#ifdef USE_MIDI
if (stretch) {
NoteTrack *nt = (NoteTrack *) pTrack;
// stretch is true only when pTrack is note
const auto nt = static_cast<NoteTrack *>(pTrack);
// find nearest beat to sel0, sel1
double minPeriod = 0.05; // minimum beat period
double qBeat0, qBeat1;
@ -2429,7 +2435,8 @@ void TrackPanel::MoveSnappingFreqSelection (int mouseYCoordinate,
if (pTrack &&
pTrack->GetSelected() &&
isSpectralSelectionTrack(pTrack)) {
WaveTrack *const wt = static_cast<WaveTrack*>(pTrack);
// Spectral selection track is always wave
const auto wt = static_cast<const WaveTrack *>(pTrack);
// PRL:
// What happens if center snapping selection began in one spectrogram track,
// then continues inside another? We do not then recalculate
@ -2472,7 +2479,8 @@ void TrackPanel::StartFreqSelection (int mouseYCoordinate, int trackTopEdge,
mFreqSelPin = SelectedRegion::UndefinedFrequency;
if (isSpectralSelectionTrack(pTrack)) {
mFreqSelTrack = static_cast<WaveTrack*>(pTrack);
// Spectral selection track is always wave
mFreqSelTrack = static_cast<const WaveTrack *>(pTrack);
mFreqSelMode = FREQ_SEL_FREE;
mFreqSelPin =
PositionToFrequency(mFreqSelTrack, false, mouseYCoordinate,
@ -2974,7 +2982,8 @@ bool mayDragWidth, bool onlyWithinSnapDistance,
if (!mViewInfo->selectedRegion.isPoint() &&
t0 <= selend && selend < t1 &&
isSpectralSelectionTrack(pTrack)) {
const WaveTrack *const wt = static_cast<const WaveTrack*>(pTrack);
// Spectral selection track is always wave
const auto wt = static_cast<const WaveTrack*>(pTrack);
const wxInt64 bottomSel = (f0 >= 0)
? FrequencyToPosition(wt, f0, rect.y, rect.height)
: rect.y + rect.height;
@ -3090,7 +3099,8 @@ void TrackPanel::HandleEnvelope(wxMouseEvent & event)
/// send events for its envelope.
void TrackPanel::ForwardEventToTimeTrackEnvelope(wxMouseEvent & event)
{
TimeTrack *ptimetrack = (TimeTrack *) mCapturedTrack;
// Assume captured track was time
const auto ptimetrack = static_cast<TimeTrack *>(mCapturedTrack);
Envelope *pspeedenvelope = ptimetrack->GetEnvelope();
wxRect envRect = mCapturedRect;
@ -3115,7 +3125,8 @@ void TrackPanel::ForwardEventToTimeTrackEnvelope(wxMouseEvent & event)
/// send events for its envelope.
void TrackPanel::ForwardEventToWaveTrackEnvelope(wxMouseEvent & event)
{
WaveTrack *pwavetrack = (WaveTrack *) mCapturedTrack;
// Assume captured track was wave
const auto pwavetrack = static_cast<WaveTrack*>(mCapturedTrack);
Envelope *penvelope = mCapturedEnvelope;
// Possibly no-envelope, for example when in spectrum view mode.
@ -3144,7 +3155,8 @@ void TrackPanel::ForwardEventToWaveTrackEnvelope(wxMouseEvent & event)
// If this track is linked to another track, make the identical
// change to the linked envelope:
WaveTrack *link = (WaveTrack *) mCapturedTrack->GetLink();
// Assume linked track is wave or null
const auto link = static_cast<WaveTrack *>(mCapturedTrack->GetLink());
if (link) {
Envelope *e2 = link->GetEnvelopeAtX(event.GetX());
// There isn't necessarily an envelope there; no guarantee a
@ -3224,7 +3236,9 @@ void TrackPanel::HandleSlide(wxMouseEvent & event)
{
// Now that user has dropped the clip into a different track,
// make sure the sample rate matches the destination track (mCapturedTrack).
pWaveClip->Resample(static_cast<WaveTrack*>(trackClip.track)->GetRate());
// Assume the clip was dropped in a wave track
pWaveClip->Resample
(static_cast<WaveTrack*>(trackClip.track)->GetRate());
pWaveClip->MarkChanged();
}
}
@ -3376,9 +3390,12 @@ void TrackPanel::StartSlide(wxMouseEvent & event)
// Check for stereo partner
Track *partner = mTracks->GetLink(vt);
if (mCapturedClip && partner && partner->GetKind() == Track::Wave) {
WaveTrack *wt;
if (mCapturedClip &&
// Assume linked track is wave or null
nullptr != (wt = static_cast<WaveTrack*>(partner))) {
WaveClip *const clip =
FindClipAtTime(static_cast<WaveTrack*>(partner),
FindClipAtTime(wt,
mViewInfo->PositionToTime(event.m_x, GetLeftOffset()));
if (clip)
mCapturedClipArray.push_back(TrackClip(partner, clip));
@ -3663,13 +3680,14 @@ void TrackPanel::DoSlide(wxMouseEvent & event)
if (trackClip.clip) {
// Move all clips up or down by an equal count of audio tracks.
Track *const pSrcTrack = trackClip.track;
Track *pDstTrack = NthAudioTrack(*mTracks,
auto pDstTrack = NthAudioTrack(*mTracks,
diff + TrackPosition(*mTracks, pSrcTrack));
// Can only move mono to mono, or left to left, or right to right
// And that must be so for each captured clip
bool stereo = (pSrcTrack->GetLink() != 0);
if (pDstTrack && stereo && !pSrcTrack->GetLinked())
pDstTrack = pDstTrack->GetLink();
// Assume linked track is wave or null
pDstTrack = static_cast<WaveTrack*>(pDstTrack->GetLink());
bool ok = pDstTrack &&
(stereo == (pDstTrack->GetLink() != 0)) &&
(!stereo || (pSrcTrack->GetLinked() == pDstTrack->GetLinked()));
@ -3688,7 +3706,9 @@ void TrackPanel::DoSlide(wxMouseEvent & event)
WaveClip *const pSrcClip = trackClip.clip;
if (pSrcClip)
trackClip.holder =
static_cast<WaveTrack*>(trackClip.track)->RemoveAndReturnClip(pSrcClip);
// Assume track is wave because it has a clip
static_cast<WaveTrack*>(trackClip.track)->
RemoveAndReturnClip(pSrcClip);
}
// Now check that the move is possible
@ -3697,7 +3717,7 @@ void TrackPanel::DoSlide(wxMouseEvent & event)
TrackClip &trackClip = mCapturedClipArray[ii];
WaveClip *const pSrcClip = trackClip.clip;
if (pSrcClip)
ok = static_cast<WaveTrack*>(trackClip.dstTrack)->CanInsertClip(pSrcClip);
ok = trackClip.dstTrack->CanInsertClip(pSrcClip);
}
if (!ok) {
@ -3705,9 +3725,10 @@ void TrackPanel::DoSlide(wxMouseEvent & event)
for (unsigned ii = 0, nn = mCapturedClipArray.size(); ii < nn; ++ii) {
TrackClip &trackClip = mCapturedClipArray[ii];
WaveClip *const pSrcClip = trackClip.clip;
if (pSrcClip) {
static_cast<WaveTrack*>(trackClip.track)->AddClip(std::move(trackClip.holder));
}
if (pSrcClip)
// Assume track is wave because it has a clip
static_cast<WaveTrack*>(trackClip.track)->
AddClip(std::move(trackClip.holder));
}
return;
}
@ -3717,8 +3738,8 @@ void TrackPanel::DoSlide(wxMouseEvent & event)
TrackClip &trackClip = mCapturedClipArray[ii];
WaveClip *const pSrcClip = trackClip.clip;
if (pSrcClip) {
Track *const dstTrack = trackClip.dstTrack;
static_cast<WaveTrack*>(dstTrack)->AddClip(std::move(trackClip.holder));
const auto dstTrack = trackClip.dstTrack;
dstTrack->AddClip(std::move(trackClip.holder));
trackClip.track = dstTrack;
}
}
@ -4082,7 +4103,8 @@ void TrackPanel::HandleWaveTrackVZoom
WaveTrack *track, bool shiftDown, bool rightUp,
bool fixedMousePoint)
{
WaveTrack *const partner = static_cast<WaveTrack *>(tracks->GetLink(track));
// Assume linked track is wave or null
const auto partner = static_cast<WaveTrack *>(tracks->GetLink(track));
int height = track->GetHeight() - (kTopMargin + kBottomMargin);
int ypos = rect.y + kBorderThickness;
@ -4312,19 +4334,11 @@ bool SampleResolutionTest(const ViewInfo &viewInfo, const WaveTrack *wt, double
/// Determines if we can edit samples in a wave track.
/// Also pops up warning messages in certain cases where we can't.
/// @return true if we can edit the samples, false otherwise.
bool TrackPanel::IsSampleEditingPossible( wxMouseEvent &event, Track * t )
bool TrackPanel::IsSampleEditingPossible( wxMouseEvent &event, const WaveTrack * wt )
{
//Exit if we don't have a track
if(!t)
return false;
//Exit if it's not a WaveTrack
if(t->GetKind() != Track::Wave)
return false;
//Exit if it's not waveform display
//Get out of here if we shouldn't be drawing right now:
//If we aren't displaying the waveform, Display a message dialog
WaveTrack *const wt = static_cast<WaveTrack*>(t);
const int display = wt->GetDisplay();
if (WaveTrack::Waveform != display)
@ -4337,7 +4351,6 @@ bool TrackPanel::IsSampleEditingPossible( wxMouseEvent &event, Track * t )
{
wxRect rect;
FindTrack(event.m_x, event.m_y, false, false, &rect);
WaveTrack *const wt = static_cast<WaveTrack*>(t);
const double rate = wt->GetRate();
const double time = mViewInfo->PositionToTime(event.m_x, rect.x);
int width;
@ -4396,13 +4409,13 @@ void TrackPanel::HandleSampleEditingClick( wxMouseEvent & event )
if (!t || (t->GetKind() != Track::Wave))
return;
if( !IsSampleEditingPossible( event, t ) )
const auto wt = static_cast<WaveTrack *>(t);
if( !IsSampleEditingPossible( event, wt ) )
return;
/// \todo Should mCapturedTrack take the place of mDrawingTrack??
mDrawingTrack = static_cast<WaveTrack*>(t);
mDrawingTrackTop=rect.y + kTopMargin;
mDrawingTrack = wt;
mDrawingTrackTop = rect.y + kTopMargin;
//If we are still around, we are drawing in earnest. Set some member data structures up:
//First, calculate the starting sample. To get this, we need the time
@ -4795,15 +4808,19 @@ void TrackPanel::HandleSliders(wxMouseEvent &event, bool pan)
float newValue = slider->Get();
MixerBoard* pMixerBoard = this->GetMixerBoard(); // Update mixer board, too.
#ifdef EXPERIMENTAL_MIDI_OUT
if (capturedTrack->GetKind() == Track::Wave) {
if (capturedTrack->GetKind() == Track::Wave)
#endif
WaveTrack *link = (WaveTrack *)mTracks->GetLink(capturedTrack);
{
const auto wt = static_cast<WaveTrack*>(capturedTrack);
// Assume linked track is wave or null
const auto link = static_cast<WaveTrack *>(mTracks->GetLink(wt));
if (pan) {
#ifdef EXPERIMENTAL_OUTPUT_DISPLAY
panZero = ((WaveTrack *)capturedTrack)->SetPan(newValue);
panZero = wt->SetPan(newValue);
#else
((WaveTrack *)capturedTrack)->SetPan(newValue);
wt->SetPan(newValue);
#endif
if (link)
link->SetPan(newValue);
@ -4813,20 +4830,23 @@ void TrackPanel::HandleSliders(wxMouseEvent &event, bool pan)
#endif
if (pMixerBoard)
pMixerBoard->UpdatePan((WaveTrack*)capturedTrack);
pMixerBoard->UpdatePan(wt);
}
else {
((WaveTrack *)capturedTrack)->SetGain(newValue);
wt->SetGain(newValue);
if (link)
link->SetGain(newValue);
if (pMixerBoard)
pMixerBoard->UpdateGain((WaveTrack*)capturedTrack);
pMixerBoard->UpdateGain(wt);
}
}
#ifdef EXPERIMENTAL_MIDI_OUT
} else { // Note: funny indentation to match "if" about 20 lines back
else {
// mCapturedTrack is not wave...
if (!pan) {
((NoteTrack *) capturedTrack)->SetGain(newValue);
// .. so assume it is note
static_cast<NoteTrack*>(mCapturedTrack)->SetGain(newValue);
#ifdef EXPERIMENTAL_MIXER_BOARD
if (pMixerBoard)
// probably should modify UpdateGain to take a track that is
@ -5728,7 +5748,8 @@ void TrackPanel::HandleWheelRotationInVRuler
{
if (pTrack->GetKind() == Track::Wave) {
WaveTrack *const wt = static_cast<WaveTrack*>(pTrack);
WaveTrack *const partner = static_cast<WaveTrack*>(wt->GetLink());
// Assume linked track is wave or null
const auto partner = static_cast<WaveTrack*>(wt->GetLink());
const bool isDB =
wt->GetDisplay() == WaveTrack::Waveform &&
wt->GetWaveformSettings().scaleType == WaveformSettings::stLogarithmic;
@ -6112,9 +6133,11 @@ void TrackPanel::OnMouseEvent(wxMouseEvent & event)
HandleZoom(event);
break;
case IsAdjustingLabel:
// Reach this case only when the captured track was label
HandleGlyphDragRelease(static_cast<LabelTrack *>(mCapturedTrack), event);
break;
case IsSelectingLabelText:
// Reach this case only when the captured track was label
HandleTextDragRelease(static_cast<LabelTrack *>(mCapturedTrack), event);
break;
default: //includes case of IsUncaptured
@ -6187,7 +6210,9 @@ bool TrackPanel::HandleTrackLocationMouseEvent(WaveTrack * track, wxRect &rect,
if (track->ExpandCutLine(mCapturedTrackLocation.pos, &cutlineStart, &cutlineEnd))
{
WaveTrack* linked = (WaveTrack*)mTracks->GetLink(track);
// Assume linked track is wave or null
const auto linked =
static_cast<WaveTrack*>(mTracks->GetLink(track));
if (linked) {
// Expand the cutline in the opposite channel if it is present.
@ -6214,7 +6239,9 @@ bool TrackPanel::HandleTrackLocationMouseEvent(WaveTrack * track, wxRect &rect,
if (!track->MergeClips(mCapturedTrackLocation.clipidx1, mCapturedTrackLocation.clipidx2))
return false;
WaveTrack* linked = (WaveTrack*)mTracks->GetLink(track);
// Assume linked track is wave or null
const auto linked =
static_cast<WaveTrack*>(mTracks->GetLink(track));
if (linked) {
// Don't assume correspondence of merge points across channels!
int idx = FindMergeLine(linked, pos);
@ -6233,7 +6260,9 @@ bool TrackPanel::HandleTrackLocationMouseEvent(WaveTrack * track, wxRect &rect,
if (!handled && event.RightDown())
{
track->RemoveCutLine(mCapturedTrackLocation.pos);
WaveTrack* linked = (WaveTrack*)mTracks->GetLink(track);
// Assume linked track is wave or null
const auto linked =
static_cast<WaveTrack*>(mTracks->GetLink(track));
if (linked)
linked->RemoveCutLine(mCapturedTrackLocation.pos);
MakeParentPushState(_("Removed Cut Line"), _("Remove") );
@ -6384,9 +6413,9 @@ void TrackPanel::HandleGlyphDragRelease(LabelTrack * lTrack, wxMouseEvent & even
/// TrackPanel which suitably modified belong in other classes.
if (event.Dragging()) {
;
} else if (event.LeftUp() && mCapturedTrack && (mCapturedTrack->GetKind() == Track::Label)) {
SetCapturedTrack(NULL);
}
else if (event.LeftUp())
SetCapturedTrack(NULL);
if (lTrack->HandleGlyphDragRelease(event, mCapturedRect,
*mViewInfo, &mViewInfo->selectedRegion)) {
@ -6417,9 +6446,9 @@ void TrackPanel::HandleTextDragRelease(LabelTrack * lTrack, wxMouseEvent & event
/// TrackPanel which suitably modified belong in other classes.
if (event.Dragging()) {
;
} else if (event.ButtonUp() && mCapturedTrack && (mCapturedTrack->GetKind() == Track::Label)) {
SetCapturedTrack(NULL);
}
else if (event.ButtonUp())
SetCapturedTrack(NULL);
// handle dragging
if (event.Dragging()) {
@ -7107,6 +7136,7 @@ void TrackPanel::DrawOutside(Track * t, wxDC * dc, const wxRect & rec,
mTrackInfo.DrawBordersWithin( dc, rect, bIsWave );
auto wt = bIsWave ? static_cast<WaveTrack*>(t) : nullptr;
if (bIsWave) {
mTrackInfo.DrawMuteSolo(dc, rect, t, (captured && mMouseCapture == IsMuting), false, HasSoloButton());
mTrackInfo.DrawMuteSolo(dc, rect, t, (captured && mMouseCapture == IsSoloing), true, HasSoloButton());
@ -7116,7 +7146,7 @@ void TrackPanel::DrawOutside(Track * t, wxDC * dc, const wxRect & rec,
int offset = 8;
if (rect.y + 22 + 12 < rec.y + rec.height - 19)
dc->DrawText(TrackSubText(t),
dc->DrawText(TrackSubText(wt),
trackRect.x + offset,
trackRect.y + 22);
@ -7882,11 +7912,9 @@ void TrackPanel::DrawShadow(Track * /* t */ , wxDC * dc, const wxRect & rect)
/// Returns the string to be displayed in the track label
/// indicating whether the track is mono, left, right, or
/// stereo and what sample rate it's using.
wxString TrackPanel::TrackSubText(Track * t)
wxString TrackPanel::TrackSubText(WaveTrack * t)
{
wxString s = wxString::Format(wxT("%dHz"),
(int) (((WaveTrack *) t)->GetRate() +
0.5));
wxString s = wxString::Format(wxT("%dHz"), (int) (t->GetRate() + 0.5));
#ifdef EXPERIMENTAL_OUTPUT_DISPLAY
if (t->GetLinked() && t->GetChannel() != Track::MonoChannel)
s = _("Stereo, ") + s;
@ -7985,12 +8013,17 @@ void TrackPanel::SplitStereo(bool stereo)
mPopupMenuTarget->SetChannel(Track::MonoChannel);
Track *partner = mPopupMenuTarget->GetLink();
wxASSERT(partner);
if (!partner)
return;
#ifdef EXPERIMENTAL_OUTPUT_DISPLAY
if(!stereo && MONO_WAVE_PAN(mPopupMenuTarget))
((WaveTrack*)mPopupMenuTarget)->SetVirtualState(true,true);
// Come here only from wave track menu
static_cast<WaveTrack*>(mPopupMenuTarget)->SetVirtualState(true,true);
if(!stereo && MONO_WAVE_PAN(partner))
((WaveTrack*)partner)->SetVirtualState(true,true);
// Assume partner is present, and is wave
static_cast<WaveTrack*>(partner)->SetVirtualState(true,true);
#endif
if (partner)
@ -8056,8 +8089,13 @@ void TrackPanel::OnMergeStereo(wxCommandEvent & WXUNUSED(event))
partner->SetMinimized(bBothMinimizedp);
//On Demand - join the queues together.
if(ODManager::IsInstanceCreated() && partner->GetKind() == Track::Wave && mPopupMenuTarget->GetKind() == Track::Wave )
if(!ODManager::Instance()->MakeWaveTrackDependent((WaveTrack*)partner,(WaveTrack*)mPopupMenuTarget))
WaveTrack *wt, *pwt;
if(ODManager::IsInstanceCreated() &&
// Assume linked track is wave or null
nullptr != (pwt = static_cast<WaveTrack*>(partner)) &&
// Come here only from the wave track menu
nullptr != (wt = static_cast<WaveTrack*>(mPopupMenuTarget)))
if(!ODManager::Instance()->MakeWaveTrackDependent(pwt, wt))
{
;
//TODO: in the future, we will have to check the return value of MakeWaveTrackDependent -
@ -8109,7 +8147,8 @@ void TrackPanel::OnSpectrogramSettings(wxCommandEvent &)
_("Stop the Audio First"), wxOK | wxICON_EXCLAMATION | wxCENTRE);
return;
}
WaveTrack *const wt = static_cast<WaveTrack*>(mPopupMenuTarget);
// Get here only from the wave track menu
const auto wt = static_cast<WaveTrack*>(mPopupMenuTarget);
// WaveformPrefsFactory waveformFactory(wt);
SpectrumPrefsFactory spectrumFactory(wt);
@ -8164,7 +8203,8 @@ void TrackPanel::OnSetDisplay(wxCommandEvent & event)
? WaveformSettings::stLinear
: WaveformSettings::stLogarithmic;
WaveTrack *l = static_cast<WaveTrack *>(wt->GetLink());
// Assume linked track is wave or null
const auto l = static_cast<WaveTrack*>(wt->GetLink());
if (l) {
l->SetLastScaleType();
l->SetDisplay(WaveTrack::WaveTrackDisplay(id));
@ -8189,16 +8229,17 @@ void TrackPanel::OnSetDisplay(wxCommandEvent & event)
/// Sets the sample rate for a track, and if it is linked to
/// another track, that one as well.
void TrackPanel::SetRate(Track * pTrack, double rate)
void TrackPanel::SetRate(WaveTrack * wt, double rate)
{
((WaveTrack *) pTrack)->SetRate(rate);
Track *partner = mTracks->GetLink(pTrack);
wt->SetRate(rate);
// Assume linked track is wave or null
const auto partner = static_cast<WaveTrack*>(mTracks->GetLink(wt));
if (partner)
((WaveTrack *) partner)->SetRate(rate);
partner->SetRate(rate);
// Separate conversion of "rate" enables changing the decimals without affecting i18n
wxString rateString = wxString::Format(wxT("%.3f"), rate);
MakeParentPushState(wxString::Format(_("Changed '%s' to %s Hz"),
pTrack->GetName().c_str(), rateString.c_str()),
wt->GetName().c_str(), rateString.c_str()),
_("Rate Change"));
}
@ -8235,10 +8276,12 @@ void TrackPanel::OnFormatChange(wxCommandEvent & event)
bool bResult = ((WaveTrack*)mPopupMenuTarget)->ConvertToSampleFormat(newFormat);
wxASSERT(bResult); // TO DO: Actually handle this.
Track *partner = mTracks->GetLink(mPopupMenuTarget);
// Assume linked track is wave or null
const auto partner =
static_cast<WaveTrack*>(mTracks->GetLink(mPopupMenuTarget));
if (partner)
{
bResult = ((WaveTrack*)partner)->ConvertToSampleFormat(newFormat);
bResult = partner->ConvertToSampleFormat(newFormat);
wxASSERT(bResult); // TO DO: Actually handle this.
}
@ -8300,11 +8343,10 @@ void TrackPanel::OnRateChange(wxCommandEvent & event)
int id = event.GetId();
wxASSERT(id >= OnRate8ID && id <= OnRate384ID);
wxASSERT(mPopupMenuTarget
&& mPopupMenuTarget->GetKind() == Track::Wave);
SetMenuCheck( *mRateMenu, id );
SetRate(mPopupMenuTarget, gRates[id - OnRate8ID]);
// Come here only from wave track menu
SetRate(static_cast<WaveTrack*>(mPopupMenuTarget), gRates[id - OnRate8ID]);
MakeParentRedrawScrollbars();
@ -8325,8 +8367,9 @@ void TrackPanel::OnRateOther(wxCommandEvent &event)
{
BuildMenusIfNeeded();
wxASSERT(mPopupMenuTarget
&& mPopupMenuTarget->GetKind() == Track::Wave);
// Come here only from the wave track menu
const auto wt = static_cast<WaveTrack*>(mPopupMenuTarget);
wxASSERT(wt);
int newRate;
@ -8395,7 +8438,7 @@ void TrackPanel::OnRateOther(wxCommandEvent &event)
}
SetMenuCheck( *mRateMenu, event.GetId() );
SetRate(mPopupMenuTarget, newRate);
SetRate(wt, newRate);
MakeParentRedrawScrollbars();
Refresh(false);
@ -8441,7 +8484,8 @@ void TrackPanel::OnSetTimeTrackRange(wxCommandEvent & /*event*/)
void TrackPanel::OnTimeTrackLin(wxCommandEvent & /*event*/)
{
TimeTrack *t = (TimeTrack*)mPopupMenuTarget;
// Come here only from the time track menu
const auto t = static_cast<TimeTrack*>(mPopupMenuTarget);
t->SetDisplayLog(false);
UpdateVRuler(t);
MakeParentPushState(_("Set time track display to linear"), _("Set Display"));
@ -8450,7 +8494,8 @@ void TrackPanel::OnTimeTrackLin(wxCommandEvent & /*event*/)
void TrackPanel::OnTimeTrackLog(wxCommandEvent & /*event*/)
{
TimeTrack *t = (TimeTrack*)mPopupMenuTarget;
// Come here only from the time track menu
const auto t = static_cast<TimeTrack*>(mPopupMenuTarget);
t->SetDisplayLog(true);
UpdateVRuler(t);
MakeParentPushState(_("Set time track display to logarithmic"), _("Set Display"));
@ -8459,7 +8504,8 @@ void TrackPanel::OnTimeTrackLog(wxCommandEvent & /*event*/)
void TrackPanel::OnTimeTrackLogInt(wxCommandEvent & /*event*/)
{
TimeTrack *t = (TimeTrack*)mPopupMenuTarget;
// Come here only from the time track menu
const auto t = static_cast<TimeTrack*>(mPopupMenuTarget);
if(t->GetInterpolateLog()) {
t->SetInterpolateLog(false);
MakeParentPushState(_("Set time track interpolation to linear"), _("Set Interpolation"));
@ -8472,8 +8518,10 @@ void TrackPanel::OnTimeTrackLogInt(wxCommandEvent & /*event*/)
void TrackPanel::OnWaveformScaleType(wxCommandEvent &evt)
{
WaveTrack *const wt = static_cast<WaveTrack *>(mPopupMenuTarget);
WaveTrack *const partner = static_cast<WaveTrack*>(wt->GetLink());
// Get here only from vertical ruler menu for wave tracks
const auto wt = static_cast<WaveTrack *>(mPopupMenuTarget);
// Assume linked track is wave or null
const auto partner = static_cast<WaveTrack*>(wt->GetLink());
const WaveformSettings::ScaleType newScaleType =
WaveformSettings::ScaleType(
std::max(0,
@ -8492,8 +8540,10 @@ void TrackPanel::OnWaveformScaleType(wxCommandEvent &evt)
void TrackPanel::OnSpectrumScaleType(wxCommandEvent &evt)
{
WaveTrack *const wt = static_cast<WaveTrack *>(mPopupMenuTarget);
WaveTrack *const partner = static_cast<WaveTrack*>(wt->GetLink());
// Get here only from vertical ruler menu for wave tracks
const auto wt = static_cast<WaveTrack *>(mPopupMenuTarget);
// Assume linked track is wave or null
const auto partner = static_cast<WaveTrack*>(wt->GetLink());
const SpectrogramSettings::ScaleType newScaleType =
SpectrogramSettings::ScaleType(
std::max(0,
@ -8512,16 +8562,19 @@ void TrackPanel::OnSpectrumScaleType(wxCommandEvent &evt)
void TrackPanel::OnZoomInVertical(wxCommandEvent &)
{
// Get here only from vertical ruler menu for wave tracks
HandleWaveTrackVZoom(static_cast<WaveTrack*>(mPopupMenuTarget), false, false);
}
void TrackPanel::OnZoomOutVertical(wxCommandEvent &)
{
// Get here only from vertical ruler menu for wave tracks
HandleWaveTrackVZoom(static_cast<WaveTrack*>(mPopupMenuTarget), true, false);
}
void TrackPanel::OnZoomFitVertical(wxCommandEvent &)
{
// Get here only from vertical ruler menu for wave tracks
HandleWaveTrackVZoom(static_cast<WaveTrack*>(mPopupMenuTarget), true, true);
}

8
src/TrackPanel.h
View File

@ -378,7 +378,7 @@ protected:
bool fixedMousePoint);
// Handle sample editing using the 'draw' tool.
virtual bool IsSampleEditingPossible( wxMouseEvent & event, Track * t );
virtual bool IsSampleEditingPossible( wxMouseEvent & event, const WaveTrack * t );
virtual void HandleSampleEditing(wxMouseEvent & event);
float FindSampleEditingLevel(wxMouseEvent &event, double dBRange, double t0);
virtual void HandleSampleEditingClick( wxMouseEvent & event );
@ -462,7 +462,7 @@ protected:
virtual void OnZoomFitVertical(wxCommandEvent &event);
virtual void SetMenuCheck( wxMenu & menu, int newId );
virtual void SetRate(Track *pTrack, double rate);
virtual void SetRate(WaveTrack *pTrack, double rate);
virtual void OnRateChange(wxCommandEvent &event);
virtual void OnRateOther(wxCommandEvent &event);
@ -531,7 +531,7 @@ protected:
int mLabelTrackStartXPos;
int mLabelTrackStartYPos;
virtual wxString TrackSubText(Track *t);
virtual wxString TrackSubText(WaveTrack *t);
TrackInfo mTrackInfo;
public:
@ -673,7 +673,7 @@ protected:
(bool shiftDown, wxString &tip, const wxCursor ** ppCursor);
void HandleCenterFrequencyClick
(bool shiftDown, Track *pTrack, double value);
(bool shiftDown, const WaveTrack *pTrack, double value);
double PositionToFrequency(const WaveTrack *wt,
bool maySnap,

5
src/effects/AutoDuck.cpp
View File

@ -219,7 +219,8 @@ bool EffectAutoDuck::Init()
if (t->GetKind() == Track::Wave)
{
lastWasSelectedWaveTrack = true;
} else
}
else
{
wxMessageBox(
_("You selected a track which does not contain audio. AutoDuck can only process audio tracks."),
@ -387,8 +388,6 @@ bool EffectAutoDuck::Process()
while (iterTrack)
{
wxASSERT(iterTrack->GetKind() == Track::Wave);
WaveTrack* t = (WaveTrack*)iterTrack;
for (size_t i = 0; i < regions.GetCount(); i++)

6
src/effects/ChangeSpeed.cpp
View File

@ -231,7 +231,7 @@ bool EffectChangeSpeed::Process()
if (t->GetKind() == Track::Label) {
if (t->GetSelected() || t->IsSyncLockSelected())
{
if (!ProcessLabelTrack(t)) {
if (!ProcessLabelTrack(static_cast<LabelTrack*>(t))) {
bGoodResult = false;
break;
}
@ -453,13 +453,11 @@ bool EffectChangeSpeed::TransferDataFromWindow()
// Labels are time-scaled linearly inside the affected region, and labels after
// the region are shifted along according to how the region size changed.
bool EffectChangeSpeed::ProcessLabelTrack(Track *t)
bool EffectChangeSpeed::ProcessLabelTrack(LabelTrack *lt)
{
SetTimeWarper(std::make_unique<RegionTimeWarper>(mT0, mT1,
std::make_unique<LinearTimeWarper>(mT0, mT0,
mT1, mT0 + (mT1-mT0)*mFactor)));
LabelTrack *lt = (LabelTrack*)t;
if (lt == NULL) return false;
lt->WarpLabels(*GetTimeWarper());
return true;
}

2
src/effects/ChangeSpeed.h
View File

@ -63,7 +63,7 @@ private:
// EffectChangeSpeed implementation
bool ProcessOne(WaveTrack *t, sampleCount start, sampleCount end);
bool ProcessLabelTrack(Track *t);
bool ProcessLabelTrack(LabelTrack *t);
// handlers
void OnText_PercentChange(wxCommandEvent & evt);

3
src/effects/Effect.cpp
View File

@ -1346,7 +1346,8 @@ bool Effect::ProcessPass()
rightStart = 0;
if (left->GetLinked() && mNumAudioIn > 1)
{
right = (WaveTrack *) iter.Next();
// Assume linked track is wave
right = static_cast<WaveTrack *>(iter.Next());
if (!isGenerator)
{
GetSamples(right, &rightStart, &len);

9
src/effects/SBSMSEffect.cpp
View File

@ -185,12 +185,10 @@ std::unique_ptr<TimeWarper> createTimeWarper(double t0, double t1, double durati
// Labels inside the affected region are moved to match the audio; labels after
// it are shifted along appropriately.
bool EffectSBSMS::ProcessLabelTrack(Track *t)
bool EffectSBSMS::ProcessLabelTrack(LabelTrack *lt)
{
auto warper = createTimeWarper(mT0,mT1,(mT1-mT0)*mTotalStretch,rateStart,rateEnd,rateSlideType);
SetTimeWarper(std::make_unique<RegionTimeWarper>(mT0, mT1, std::move(warper)));
LabelTrack *lt = (LabelTrack*)t;
if (lt == NULL) return false;
lt->WarpLabels(*GetTimeWarper());
return true;
}
@ -231,7 +229,7 @@ bool EffectSBSMS::Process()
if (t->GetKind() == Track::Label &&
(t->GetSelected() || (mustSync && t->IsSyncLockSelected())) )
{
if (!ProcessLabelTrack(t)) {
if (!ProcessLabelTrack(static_cast<LabelTrack*>(t))) {
bGoodResult = false;
break;
}
@ -257,7 +255,8 @@ bool EffectSBSMS::Process()
WaveTrack* rightTrack = NULL;
if (leftTrack->GetLinked()) {
double t;
rightTrack = (WaveTrack*)(iter.Next());
// Assume linked track is wave or null
rightTrack = static_cast<WaveTrack*>(iter.Next());
//Adjust bounds by the right tracks markers
t = rightTrack->GetStartTime();

4
src/effects/SBSMSEffect.h
View File

@ -21,6 +21,8 @@
#include "sbsms.h"
using namespace _sbsms_;
class LabelTrack;
class EffectSBSMS /* not final */ : public Effect
{
public:
@ -37,7 +39,7 @@ protected:
wxString GetName() override { return mProxyEffectName; };
private:
bool ProcessLabelTrack(Track *track);
bool ProcessLabelTrack(LabelTrack *track);
double rateStart, rateEnd, pitchStart, pitchEnd;
bool bLinkRatePitch, bRateReferenceInput, bPitchReferenceInput;
SlideType rateSlideType;

15
src/effects/SoundTouchEffect.cpp
View File

@ -25,22 +25,18 @@ effect that uses SoundTouch to do its processing (ChangeTempo
#include "TimeWarper.h"
#include "../NoteTrack.h"
bool EffectSoundTouch::ProcessLabelTrack(Track *track)
bool EffectSoundTouch::ProcessLabelTrack(LabelTrack *lt)
{
// SetTimeWarper(std::make_unique<RegionTimeWarper>(mCurT0, mCurT1,
// std::make_unique<LinearTimeWarper>(mCurT0, mCurT0,
// mCurT1, mCurT0 + (mCurT1-mCurT0)*mFactor)));
LabelTrack *lt = (LabelTrack*)track;
if (lt == NULL) return false;
lt->WarpLabels(*GetTimeWarper());
return true;
}
#ifdef USE_MIDI
bool EffectSoundTouch::ProcessNoteTrack(Track *track)
bool EffectSoundTouch::ProcessNoteTrack(NoteTrack *nt)
{
NoteTrack *nt = (NoteTrack *) track;
if (nt == NULL) return false;
nt->WarpAndTransposeNotes(mCurT0, mCurT1, *GetTimeWarper(), mSemitones);
return true;
}
@ -74,7 +70,7 @@ bool EffectSoundTouch::Process()
if (t->GetKind() == Track::Label &&
(t->GetSelected() || (mustSync && t->IsSyncLockSelected())) )
{
if (!ProcessLabelTrack(t))
if (!ProcessLabelTrack(static_cast<LabelTrack*>(t)))
{
bGoodResult = false;
break;
@ -84,7 +80,7 @@ bool EffectSoundTouch::Process()
else if (t->GetKind() == Track::Note &&
(t->GetSelected() || (mustSync && t->IsSyncLockSelected())))
{
if (!ProcessNoteTrack(t))
if (!ProcessNoteTrack(static_cast<NoteTrack*>(t)))
{
bGoodResult = false;
break;
@ -108,7 +104,8 @@ bool EffectSoundTouch::Process()
if (leftTrack->GetLinked()) {
double t;
WaveTrack* rightTrack = (WaveTrack*)(iter.Next());
// Assume linked track is wave
WaveTrack* rightTrack = static_cast<WaveTrack*>(iter.Next());
//Adjust bounds by the right tracks markers
t = rightTrack->GetStartTime();

4
src/effects/SoundTouchEffect.h
View File

@ -55,9 +55,9 @@ protected:
double mCurT1;
private:
bool ProcessLabelTrack(Track *track);
bool ProcessLabelTrack(LabelTrack *track);
#ifdef USE_MIDI
bool ProcessNoteTrack(Track *track);
bool ProcessNoteTrack(NoteTrack *track);
#endif
bool ProcessOne(WaveTrack * t, sampleCount start, sampleCount end);
bool ProcessStereo(WaveTrack* leftTrack, WaveTrack* rightTrack,

3
src/effects/StereoToMono.cpp
View File

@ -92,7 +92,8 @@ bool EffectStereoToMono::Process()
mLeftTrack->GetSelected() &&
mLeftTrack->GetLinked()) {
mRightTrack = (WaveTrack *)iter.Next();
// Assume linked track is wave
mRightTrack = static_cast<WaveTrack*>(iter.Next());
if ((mLeftTrack->GetRate() == mRightTrack->GetRate())) {
auto leftTrackStart = mLeftTrack->TimeToLongSamples(mLeftTrack->GetStartTime());

7
src/prefs/SpectrumPrefs.cpp
View File

@ -370,8 +370,11 @@ bool SpectrumPrefs::Apply()
const bool isOpenPage = this->IsShown();
WaveTrack *const partner =
mWt ? static_cast<WaveTrack*>(mWt->GetLink()) : 0;
const auto partner =
mWt ?
// Assume linked track is wave or null
static_cast<WaveTrack*>(mWt->GetLink())
: nullptr;
ShuttleGui S(this, eIsGettingFromDialog);
PopulateOrExchange(S);

7
src/prefs/WaveformPrefs.cpp
View File

@ -136,8 +136,11 @@ bool WaveformPrefs::Apply()
{
const bool isOpenPage = this->IsShown();
WaveTrack *const partner =
mWt ? static_cast<WaveTrack*>(mWt->GetLink()) : 0;
const auto partner =
mWt ?
// Assume linked track is wave or null
static_cast<WaveTrack*>(mWt->GetLink())
: nullptr;
ShuttleGui S(this, eIsGettingFromDialog);
PopulateOrExchange(S);