diff --git a/src/toolbars/ControlToolBar.cpp b/src/toolbars/ControlToolBar.cpp index 840528a64..93af1f284 100644 --- a/src/toolbars/ControlToolBar.cpp +++ b/src/toolbars/ControlToolBar.cpp @@ -76,7 +76,6 @@ BEGIN_EVENT_TABLE(ControlToolBar, ToolBar) EVT_BUTTON(ID_PLAY_BUTTON, ControlToolBar::OnPlay) EVT_BUTTON(ID_STOP_BUTTON, ControlToolBar::OnStop) EVT_BUTTON(ID_RECORD_BUTTON, ControlToolBar::OnRecord) - EVT_BUTTON(ID_BATCH_BUTTON, ControlToolBar::OnBatch) EVT_BUTTON(ID_REW_BUTTON, ControlToolBar::OnRewind) EVT_BUTTON(ID_FF_BUTTON, ControlToolBar::OnFF) EVT_BUTTON(ID_PAUSE_BUTTON, ControlToolBar::OnPause) @@ -209,8 +208,7 @@ void ControlToolBar::Populate() void ControlToolBar::RegenerateToolsTooltips() { #if wxUSE_TOOLTIPS - // ID_BATCH_BUTTON is not an actual button, so use it as loop bound. - for (long iWinID = ID_PLAY_BUTTON; iWinID < ID_BATCH_BUTTON; iWinID++) + for (long iWinID = ID_PLAY_BUTTON; iWinID < BUTTON_COUNT; iWinID++) { wxWindow* pCtrl = this->FindWindow(iWinID); wxString strToolTip = pCtrl->GetLabel(); @@ -780,21 +778,6 @@ void ControlToolBar::StopPlaying(bool stopStream /* = true*/) } } -void ControlToolBar::OnBatch(wxCommandEvent & WXUNUSED(evt)) -{ - AudacityProject *proj = GetActiveProject(); - if (proj) - proj->OnApplyChain(); - - mPlay->Enable(); - mStop->Enable(); - mRewind->Enable(); - mFF->Enable(); - mPause->Disable(); - //mBatch->Enable(); - //mBatch->PopUp(); -} - void ControlToolBar::OnRecord(wxCommandEvent &evt) { if (gAudioIO->IsBusy()) { diff --git a/src/toolbars/ControlToolBar.h b/src/toolbars/ControlToolBar.h index e7178e259..23d1bee25 100644 --- a/src/toolbars/ControlToolBar.h +++ b/src/toolbars/ControlToolBar.h @@ -55,7 +55,6 @@ class ControlToolBar:public ToolBar { void OnRewind(wxCommandEvent & evt); void OnPlay(wxCommandEvent & evt); void OnStop(wxCommandEvent & evt); - void OnBatch(wxCommandEvent & evt); void OnRecord(wxCommandEvent & evt); void OnFF(wxCommandEvent & evt); void OnPause(wxCommandEvent & evt); @@ -109,14 +108,11 @@ class ControlToolBar:public ToolBar { ID_STOP_BUTTON, ID_FF_BUTTON, ID_REW_BUTTON, - - // ID_BATCH_BUTTON is not an actual button. - ID_BATCH_BUTTON, + BUTTON_COUNT, }; AButton *mRewind; AButton *mPlay; - //AButton *mBatch; AButton *mRecord; AButton *mPause; AButton *mStop; @@ -134,7 +130,6 @@ class ControlToolBar:public ToolBar { wxString mStrLocale; // standard locale abbreviation - //wxBoxSizer *mBatchGroup; wxBoxSizer *mSizer; TrackList* mCutPreviewTracks;