diff --git a/src/Project.cpp b/src/Project.cpp index c7b524dd6..85cba3da2 100755 --- a/src/Project.cpp +++ b/src/Project.cpp @@ -827,10 +827,6 @@ AudacityProject::AudacityProject(wxWindow * parent, wxWindowID id, UpdatePrefs(); - // Some extra information - mViewInfo.bIsPlaying = false; - mViewInfo.bRedrawWaveform = false; - mLockPlayRegion = false; // Make sure valgrind sees mIsSyncLocked is initialized, even @@ -4285,11 +4281,6 @@ void AudacityProject::SetCaptureMeter(Meter *capture) } } -void AudacityProject::SetStop(bool bStopped) -{ - mTrackPanel->SetStop(bStopped); -} - void AudacityProject::OnTimer(wxTimerEvent& WXUNUSED(event)) { MixerToolBar *mixerToolBar = GetMixerToolBar(); diff --git a/src/Project.h b/src/Project.h index 05353bbaa..12886ad2c 100755 --- a/src/Project.h +++ b/src/Project.h @@ -304,7 +304,6 @@ class AUDACITY_DLL_API AudacityProject: public wxFrame, void Zoom(double level); void Rewind(bool shift); void SkipEnd(bool shift); - void SetStop(bool bStopped); void EditByLabel( WaveTrack::EditFunction action, bool bSyncLockedTracks ); void EditClipboardByLabel( WaveTrack::EditDestFunction action ); bool IsSyncLocked(); diff --git a/src/TrackArtist.cpp b/src/TrackArtist.cpp index 2ab608d52..7fce99fd0 100644 --- a/src/TrackArtist.cpp +++ b/src/TrackArtist.cpp @@ -1737,18 +1737,6 @@ void TrackArtist::DrawSpectrum(WaveTrack *track, viewInfo->selectedRegion.t0(), viewInfo->selectedRegion.t1(), viewInfo->h, viewInfo->zoom); - if(!viewInfo->bUpdateTrackIndicator && viewInfo->bIsPlaying) { - // BG: Draw (undecorated) waveform instead of spectrum - DrawWaveform(track, dc, r, viewInfo, false, false, false, false, false); - /* - // BG: uncomment to draw grey instead of spectrum - dc.SetBrush(unselectedBrush); - dc.SetPen(unselectedPen); - dc.DrawRectangle(r); - */ - return; - } - WaveTrackCache cache(track); for (WaveClipList::compatibility_iterator it = track->GetClipIterator(); it; it = it->GetNext()) { DrawClipSpectrum(cache, it->GetData(), dc, r, viewInfo, autocorrelation, logF); diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp index aedfeeeca..7cc9ea37a 100755 --- a/src/TrackPanel.cpp +++ b/src/TrackPanel.cpp @@ -866,12 +866,6 @@ void TrackPanel::UpdatePrefs() Refresh(); } -void TrackPanel::SetStop(bool bStopped) -{ - mViewInfo->bIsPlaying = !bStopped; - Refresh(false); -} - /// Remembers the track we clicked on and why we captured it. /// We also use this method to clear the record /// of the captured track, passing NULL as the track. diff --git a/src/TrackPanel.h b/src/TrackPanel.h index 12c69946f..6de1bc21c 100755 --- a/src/TrackPanel.h +++ b/src/TrackPanel.h @@ -172,8 +172,6 @@ class AUDACITY_DLL_API TrackPanel:public wxPanel { virtual void SelectNone(); - virtual void SetStop(bool bStopped); - virtual void Refresh(bool eraseBackground = true, const wxRect *rect = (const wxRect *) NULL); virtual void RefreshTrack(Track *trk, bool refreshbacking = true); diff --git a/src/ViewInfo.h b/src/ViewInfo.h index 0a6e069e3..d27965aa3 100644 --- a/src/ViewInfo.h +++ b/src/ViewInfo.h @@ -51,10 +51,7 @@ struct ViewInfo { // Other stuff, mainly states (true or false) related to autoscroll and // drawing the waveform. Maybe this should be put somewhere else? - bool bRedrawWaveform; bool bUpdateTrackIndicator; - - bool bIsPlaying; }; #endif