From bdb0790150beb4abd61ea61612adb858c3b53a88 Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Sat, 18 Mar 2017 21:15:07 -0700 Subject: Fix compiling when USE_MIDI not is defined Compilation broke in TrackPanel in ed277ec and in TrackpanelAx in a96c719c. diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp index 4db2b03f..c977175c 100644 --- a/src/TrackPanel.cpp +++ b/src/TrackPanel.cpp @@ -3732,8 +3732,11 @@ void TrackPanel::DoSlide(wxMouseEvent & event) #else { trySnap = true; - desiredSlideAmount = rint(mouseTrack->GetRate() * desiredSlideAmount) / - mouseTrack->GetRate(); // set it to a sample point + if (mouseTrack->GetKind() == Track::Wave) { + WaveTrack *mtw = (WaveTrack *)mouseTrack; + desiredSlideAmount = rint(mtw->GetRate() * desiredSlideAmount) / + mtw->GetRate(); // set it to a sample point + } if (mSnapManager && mCapturedClip) { clipLeft = mCapturedClip->GetStartTime() + desiredSlideAmount; clipRight = mCapturedClip->GetEndTime() + desiredSlideAmount; diff --git a/src/TrackPanelAx.cpp b/src/TrackPanelAx.cpp index 145b7f3a..bf9a4ec7 100644 --- a/src/TrackPanelAx.cpp +++ b/src/TrackPanelAx.cpp @@ -353,12 +353,14 @@ wxAccStatus TrackPanelAx::GetName( int childId, wxString* name ) this is a Time track.*/ name->Append( wxT(" ") + wxString(_("Time Track"))); } +#ifdef USE_MIDI else if (t->GetKind() == Track::Note) { /* i18n-hint: This is for screen reader software and indicates that this is a Note track.*/ name->Append( wxT(" ") + wxString(_("Note Track"))); } +#endif // LLL: Remove these during "refactor" if( t->GetMute() )