mirror of
https://github.com/cookiengineer/audacity
synced 2025-06-18 17:10:05 +02:00
Remove AudacityProject::IsCapturing()...
... because it was in fact tracking global state, not any per-project state.
This commit is contained in:
parent
227fb315ea
commit
ada9f2baad
@ -548,7 +548,7 @@ CommandFlag MenuManager::GetUpdateFlags
|
|||||||
if (!EffectManager::Get().RealtimeIsActive())
|
if (!EffectManager::Get().RealtimeIsActive())
|
||||||
flags |= IsRealtimeNotActiveFlag;
|
flags |= IsRealtimeNotActiveFlag;
|
||||||
|
|
||||||
if (!project.IsCapturing())
|
if ( !( gAudioIO->IsBusy() && gAudioIO->GetNumCaptureChannels() > 0 ) )
|
||||||
flags |= CaptureNotBusyFlag;
|
flags |= CaptureNotBusyFlag;
|
||||||
|
|
||||||
ControlToolBar *bar = project.GetControlToolBar();
|
ControlToolBar *bar = project.GetControlToolBar();
|
||||||
|
@ -1438,10 +1438,6 @@ AudacityProject::AudacityProject(wxWindow * parent, wxWindowID id,
|
|||||||
mTrackPanel->SetDropTarget(safenew DropTarget(this));
|
mTrackPanel->SetDropTarget(safenew DropTarget(this));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
wxTheApp->Bind(EVT_AUDIOIO_CAPTURE,
|
|
||||||
&AudacityProject::OnCapture,
|
|
||||||
this);
|
|
||||||
|
|
||||||
wxTheApp->Bind(EVT_THEME_CHANGE, &AudacityProject::OnThemeChange, this);
|
wxTheApp->Bind(EVT_THEME_CHANGE, &AudacityProject::OnThemeChange, this);
|
||||||
|
|
||||||
#ifdef EXPERIMENTAL_DA2
|
#ifdef EXPERIMENTAL_DA2
|
||||||
@ -1565,16 +1561,6 @@ void AudacityProject::RefreshCursor()
|
|||||||
mTrackPanel->HandleCursorForPresentMouseState();
|
mTrackPanel->HandleCursorForPresentMouseState();
|
||||||
}
|
}
|
||||||
|
|
||||||
void AudacityProject::OnCapture(wxCommandEvent& evt)
|
|
||||||
{
|
|
||||||
evt.Skip();
|
|
||||||
|
|
||||||
if (evt.GetInt() != 0)
|
|
||||||
mIsCapturing = true;
|
|
||||||
else
|
|
||||||
mIsCapturing = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
void AudacityProject::OnThemeChange(wxCommandEvent& evt)
|
void AudacityProject::OnThemeChange(wxCommandEvent& evt)
|
||||||
{
|
{
|
||||||
evt.Skip();
|
evt.Skip();
|
||||||
@ -1588,7 +1574,6 @@ void AudacityProject::OnThemeChange(wxCommandEvent& evt)
|
|||||||
GetRulerPanel()->ReCreateButtons();
|
GetRulerPanel()->ReCreateButtons();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const std::shared_ptr<DirManager> &AudacityProject::GetDirManager()
|
const std::shared_ptr<DirManager> &AudacityProject::GetDirManager()
|
||||||
{
|
{
|
||||||
return mDirManager;
|
return mDirManager;
|
||||||
|
@ -542,7 +542,6 @@ public:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
void OnCapture(wxCommandEvent & evt);
|
|
||||||
void OnThemeChange(wxCommandEvent & evt);
|
void OnThemeChange(wxCommandEvent & evt);
|
||||||
void InitialState();
|
void InitialState();
|
||||||
|
|
||||||
@ -711,14 +710,6 @@ public:
|
|||||||
private:
|
private:
|
||||||
bool mbInitializingScrollbar{ false };
|
bool mbInitializingScrollbar{ false };
|
||||||
|
|
||||||
// Flag that we're recoding.
|
|
||||||
bool mIsCapturing{ false };
|
|
||||||
|
|
||||||
public:
|
|
||||||
bool IsCapturing() const { return mIsCapturing; }
|
|
||||||
|
|
||||||
private:
|
|
||||||
|
|
||||||
// See explanation in OnCloseWindow
|
// See explanation in OnCloseWindow
|
||||||
bool mIsBeingDeleted{ false };
|
bool mIsBeingDeleted{ false };
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user