diff --git a/src/AdornedRulerPanel.cpp b/src/AdornedRulerPanel.cpp index 8bb341d52..900a7fcb1 100644 --- a/src/AdornedRulerPanel.cpp +++ b/src/AdornedRulerPanel.cpp @@ -1263,7 +1263,7 @@ auto AdornedRulerPanel::QPHandle::Click if(scrubber.HasMark()) { // We can't stop scrubbing yet (see comments in Bug 1391), // but we can pause it. - TransportActions::DoPause(*pProject); + ProjectAudioManager::Get( *pProject ).OnPause(); } // Store the initial play region state diff --git a/src/AudacityApp.cpp b/src/AudacityApp.cpp index e014c66f6..8c653f870 100644 --- a/src/AudacityApp.cpp +++ b/src/AudacityApp.cpp @@ -1654,7 +1654,7 @@ void AudacityApp::OnKeyDown(wxKeyEvent &event) gAudioIO->GetNumCaptureChannels() == 0) || scrubbing) // ESC out of other play (but not record) - TransportActions::DoStop(*project); + ProjectAudioManager::Get( *project ).Stop(); else event.Skip(); } diff --git a/src/BatchCommands.cpp b/src/BatchCommands.cpp index 6f8eeee4f..29a8da7c1 100644 --- a/src/BatchCommands.cpp +++ b/src/BatchCommands.cpp @@ -719,7 +719,7 @@ bool MacroCommands::DoAudacityCommand( if (flags & EffectManager::kConfigured) { - TransportActions::DoStop(project); + ProjectAudioManager::Get( project ).Stop(); // SelectAllIfNone(); } diff --git a/src/ProjectAudioManager.cpp b/src/ProjectAudioManager.cpp index 5f9caa43a..de943e476 100644 --- a/src/ProjectAudioManager.cpp +++ b/src/ProjectAudioManager.cpp @@ -1019,7 +1019,7 @@ namespace TransportActions { void StopIfPaused( AudacityProject &project ) { if( AudioIOBase::Get()->IsPaused() ) - DoStop( project ); + ProjectAudioManager::Get( project ).Stop(); } bool DoPlayStopSelect @@ -1095,21 +1095,6 @@ void DoPlayStopSelect(AudacityProject &project) } } -void DoPause( AudacityProject &project ) -{ - ProjectAudioManager::Get( project ).OnPause(); -} - -void DoRecord( AudacityProject &project ) -{ - ProjectAudioManager::Get( project ).OnRecord(false); -} - -void DoStop( AudacityProject &project ) -{ - ProjectAudioManager::Get( project ).Stop(); -} - } #include "CommonCommandFlags.h" diff --git a/src/ProjectAudioManager.h b/src/ProjectAudioManager.h index 2cccb9338..3752bfd4f 100644 --- a/src/ProjectAudioManager.h +++ b/src/ProjectAudioManager.h @@ -166,9 +166,6 @@ namespace TransportActions { void StopIfPaused( AudacityProject &project ); bool DoPlayStopSelect( AudacityProject &project, bool click, bool shift ); void DoPlayStopSelect( AudacityProject &project ); -void DoStop( AudacityProject & ); -void DoPause( AudacityProject & ); -void DoRecord( AudacityProject & ); } #endif diff --git a/src/TimerRecordDialog.cpp b/src/TimerRecordDialog.cpp index 4e4d5fa7b..084be2378 100644 --- a/src/TimerRecordDialog.cpp +++ b/src/TimerRecordDialog.cpp @@ -543,7 +543,7 @@ int TimerRecordDialog::RunWaitDialog() return POST_TIMER_RECORD_CANCEL_WAIT; } else { // Record for specified time. - TransportActions::DoRecord(*pProject); + ProjectAudioManager::Get( *pProject ).OnRecord(false); bool bIsRecording = true; wxString sPostAction = m_pTimerAfterCompleteChoiceCtrl->GetString(m_pTimerAfterCompleteChoiceCtrl->GetSelection()); @@ -591,7 +591,7 @@ int TimerRecordDialog::RunWaitDialog() // Must do this AFTER the timer project dialog has been deleted to ensure the application // responds to the AUDIOIO events...see not about bug #334 in the ProgressDialog constructor. - TransportActions::DoStop(*pProject); + ProjectAudioManager::Get( *pProject ).Stop(); // Let the caller handle cancellation or failure from recording progress. if (updateResult == ProgressResult::Cancelled || updateResult == ProgressResult::Failed) diff --git a/src/effects/EffectManager.cpp b/src/effects/EffectManager.cpp index 6b3de8523..107cef40b 100644 --- a/src/effects/EffectManager.cpp +++ b/src/effects/EffectManager.cpp @@ -130,7 +130,7 @@ void EffectManager::UnregisterEffect(const PluginID & ID) // for batch commands if (flags & EffectManager::kConfigured) { - TransportActions::DoStop(project); + ProjectAudioManager::Get( project ).Stop(); SelectUtilities::SelectAllIfNone( project ); } diff --git a/src/menus/TransportMenus.cpp b/src/menus/TransportMenus.cpp index de9ef557b..762747c91 100644 --- a/src/menus/TransportMenus.cpp +++ b/src/menus/TransportMenus.cpp @@ -224,12 +224,12 @@ void OnPlayLooped(const CommandContext &context) void OnPause(const CommandContext &context) { - DoPause( context.project ); + ProjectAudioManager::Get( context.project ).OnPause(); } void OnRecord(const CommandContext &context) { - DoRecord( context.project ); + ProjectAudioManager::Get( context.project ).OnRecord(false); } // If first choice is record same track 2nd choice is record NEW track @@ -543,7 +543,7 @@ void OnToggleAutomatedInputLevelAdjustment( void OnStop(const CommandContext &context) { - DoStop( context.project ); + ProjectAudioManager::Get( context.project ).Stop(); } void OnPlayOneSecond(const CommandContext &context)