Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-23 15:50:05 +02:00
Code Issues Releases Wiki Activity

Fewer calls to GetActiveProject() in AudioIO.cpp

Browse Source
This commit is contained in:
Paul Licameli 2018-08-08 17:29:08 -04:00
parent 2472b128d3
commit 6f7eaf7746
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/AudioIO.cpp
View File

@ -2487,8 +2487,7 @@ void AudioIO::SetMeters()
if (mOutputMeter) if (mOutputMeter)
mOutputMeter->Reset(mRate, true); mOutputMeter->Reset(mRate, true);
AudacityProject* pProj = GetActiveProject(); MixerBoard* pMixerBoard = mOwningProject->GetMixerBoard();
MixerBoard* pMixerBoard = pProj->GetMixerBoard();
if (pMixerBoard) if (pMixerBoard)
pMixerBoard->ResetMeters(true); pMixerBoard->ResetMeters(true);
@ -2723,8 +2722,7 @@ void AudioIO::StopStream()
} }
} }
AudacityProject *p = GetActiveProject(); ControlToolBar *bar = mOwningProject->GetControlToolBar();
ControlToolBar *bar = p->GetControlToolBar();
bar->CommitRecording(); bar->CommitRecording();
} }
} }
@ -4580,7 +4578,7 @@ double AudioIO::AILAGetLastDecisionTime() {
} }
void AudioIO::AILAProcess(double maxPeak) { void AudioIO::AILAProcess(double maxPeak) {
AudacityProject *proj = GetActiveProject(); AudacityProject *const proj = mOwningProject);
if (proj && mAILAActive) { if (proj && mAILAActive) {
if (mInputMeter && mInputMeter->IsClipping()) { if (mInputMeter && mInputMeter->IsClipping()) {
mAILAClipped = true; mAILAClipped = true;
@ -4892,15 +4890,13 @@ int AudioIO::AudioCallback(const void *inputBuffer, void *outputBuffer,
if(mPauseRec && inputBuffer && mInputMeter) { if(mPauseRec && inputBuffer && mInputMeter) {
if(mInputMeter->GetMaxPeak() < mSilenceLevel ) { if(mInputMeter->GetMaxPeak() < mSilenceLevel ) {
if(!IsPaused()) { if(!IsPaused()) {
AudacityProject *p = GetActiveProject(); ControlToolBar *bar = mOwningProject->GetControlToolBar();
ControlToolBar *bar = p->GetControlToolBar();
bar->CallAfter(&ControlToolBar::Pause); bar->CallAfter(&ControlToolBar::Pause);
} }
} }
else { else {
if(IsPaused()) { if(IsPaused()) {
AudacityProject *p = GetActiveProject(); ControlToolBar *bar = mOwningProject->GetControlToolBar();
ControlToolBar *bar = p->GetControlToolBar();
bar->CallAfter(&ControlToolBar::Pause); bar->CallAfter(&ControlToolBar::Pause);
} }
} }
@ -5403,8 +5399,7 @@ int AudioIO::AudioCallback(const void *inputBuffer, void *outputBuffer,
// and in TrackPanel::OnTimer() if Software Playthrough is on, but not now. // and in TrackPanel::OnTimer() if Software Playthrough is on, but not now.
// PRL 12 Jul 2015: and what was in TrackPanel::OnTimer is now handled by means of event // PRL 12 Jul 2015: and what was in TrackPanel::OnTimer is now handled by means of event
// type EVT_TRACK_PANEL_TIMER // type EVT_TRACK_PANEL_TIMER
//AudacityProject* pProj = GetActiveProject(); //MixerBoard* pMixerBoard = mOwningProject->GetMixerBoard();
//MixerBoard* pMixerBoard = pProj->GetMixerBoard();
//if (pMixerBoard) //if (pMixerBoard)
// pMixerBoard->UpdateMeters(GetStreamTime(), // pMixerBoard->UpdateMeters(GetStreamTime(),
// (pProj->mLastPlayMode == loopedPlay)); // (pProj->mLastPlayMode == loopedPlay));