Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-09-18 00:50:52 +02:00
Code Issues Releases Wiki Activity

Remove short functions from namespace TransportActions

Browse Source
This commit is contained in:
Paul Licameli 2019-07-03 10:20:53 -04:00
parent c8c76cf294
commit 2c840a75c5
8 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/AdornedRulerPanel.cpp
View File

@ -1263,7 +1263,7 @@ auto AdornedRulerPanel::QPHandle::Click
if(scrubber.HasMark()) { if(scrubber.HasMark()) {
// We can't stop scrubbing yet (see comments in Bug 1391), // We can't stop scrubbing yet (see comments in Bug 1391),
// but we can pause it. // but we can pause it.
TransportActions::DoPause(*pProject); ProjectAudioManager::Get( *pProject ).OnPause();
} }
// Store the initial play region state // Store the initial play region state

2
src/AudacityApp.cpp
View File

@ -1654,7 +1654,7 @@ void AudacityApp::OnKeyDown(wxKeyEvent &event)
gAudioIO->GetNumCaptureChannels() == 0) || gAudioIO->GetNumCaptureChannels() == 0) ||
scrubbing) scrubbing)
// ESC out of other play (but not record) // ESC out of other play (but not record)
TransportActions::DoStop(*project); ProjectAudioManager::Get( *project ).Stop();
else else
event.Skip(); event.Skip();
} }

2
src/BatchCommands.cpp
View File

@ -719,7 +719,7 @@ bool MacroCommands::DoAudacityCommand(
if (flags & EffectManager::kConfigured) if (flags & EffectManager::kConfigured)
{ {
TransportActions::DoStop(project); ProjectAudioManager::Get( project ).Stop();
// SelectAllIfNone(); // SelectAllIfNone();
} }

17
src/ProjectAudioManager.cpp
View File

@ -1019,7 +1019,7 @@ namespace TransportActions {
void StopIfPaused( AudacityProject &project ) void StopIfPaused( AudacityProject &project )
{ {
if( AudioIOBase::Get()->IsPaused() ) if( AudioIOBase::Get()->IsPaused() )
DoStop( project ); ProjectAudioManager::Get( project ).Stop();
} }
bool DoPlayStopSelect 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" #include "CommonCommandFlags.h"

3
src/ProjectAudioManager.h
View File

@ -166,9 +166,6 @@ namespace TransportActions {
void StopIfPaused( AudacityProject &project ); void StopIfPaused( AudacityProject &project );
bool DoPlayStopSelect( AudacityProject &project, bool click, bool shift ); bool DoPlayStopSelect( AudacityProject &project, bool click, bool shift );
void DoPlayStopSelect( AudacityProject &project ); void DoPlayStopSelect( AudacityProject &project );
void DoStop( AudacityProject & );
void DoPause( AudacityProject & );
void DoRecord( AudacityProject & );
} }
#endif #endif

4
src/TimerRecordDialog.cpp
View File

@ -543,7 +543,7 @@ int TimerRecordDialog::RunWaitDialog()
return POST_TIMER_RECORD_CANCEL_WAIT; return POST_TIMER_RECORD_CANCEL_WAIT;
} else { } else {
// Record for specified time. // Record for specified time.
TransportActions::DoRecord(*pProject); ProjectAudioManager::Get( *pProject ).OnRecord(false);
bool bIsRecording = true; bool bIsRecording = true;
wxString sPostAction = m_pTimerAfterCompleteChoiceCtrl->GetString(m_pTimerAfterCompleteChoiceCtrl->GetSelection()); 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 // 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. // 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. // Let the caller handle cancellation or failure from recording progress.
if (updateResult == ProgressResult::Cancelled || updateResult == ProgressResult::Failed) if (updateResult == ProgressResult::Cancelled || updateResult == ProgressResult::Failed)

2
src/effects/EffectManager.cpp
View File

@ -130,7 +130,7 @@ void EffectManager::UnregisterEffect(const PluginID & ID)
// for batch commands // for batch commands
if (flags & EffectManager::kConfigured) if (flags & EffectManager::kConfigured)
{ {
TransportActions::DoStop(project); ProjectAudioManager::Get( project ).Stop();
SelectUtilities::SelectAllIfNone( project ); SelectUtilities::SelectAllIfNone( project );
} }

6
src/menus/TransportMenus.cpp
View File

@ -224,12 +224,12 @@ void OnPlayLooped(const CommandContext &context)
void OnPause(const CommandContext &context) void OnPause(const CommandContext &context)
{ {
DoPause( context.project ); ProjectAudioManager::Get( context.project ).OnPause();
} }
void OnRecord(const CommandContext &context) 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 // If first choice is record same track 2nd choice is record NEW track
@ -543,7 +543,7 @@ void OnToggleAutomatedInputLevelAdjustment(
void OnStop(const CommandContext &context) void OnStop(const CommandContext &context)
{ {
DoStop( context.project ); ProjectAudioManager::Get( context.project ).Stop();
} }
void OnPlayOneSecond(const CommandContext &context) void OnPlayOneSecond(const CommandContext &context)