Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-01 08:29:27 +02:00
Code Issues Releases Wiki Activity

Move function from AudacityProject to TransportActions

Browse Source
This commit is contained in:
Paul Licameli 2019-04-22 20:23:54 -04:00
parent d2717cac21
commit 22f6ee789c
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Menus.cpp
View File

@ -781,7 +781,7 @@ bool MenuManager::TryToMakeActionAllowed
auto MissingFlags = (~flags & flagsRqd) & mask;
if( mStopIfWasPaused && (MissingFlags & AudioIONotBusyFlag ) ){
project.StopIfPaused();
TransportActions::StopIfPaused( project );
// Hope this will now reflect stopped audio.
flags = GetMenuManager(project).GetUpdateFlags(project);
bAllowed = ((flags & mask) == (flagsRqd & mask));

1
src/Menus.h
View File

@ -134,6 +134,7 @@ void DoZoomFitV( AudacityProject &project );
/// Namespace for functions for Transport menu
namespace TransportActions {
void StopIfPaused( AudacityProject &project );
bool DoPlayStopSelect( AudacityProject &project, bool click, bool shift );
void DoPlayStopSelect( AudacityProject &project );
void DoStop( AudacityProject & );

8
src/Project.cpp
View File

@ -5707,11 +5707,3 @@ void AudacityProject::ZoomOutByFactor( double ZoomFactor )
// newh = (newh > 0) ? newh : 0;
TP_ScrollWindow(newh);
}
// Stop playing or recording, if paused.
void AudacityProject::StopIfPaused()
{
auto flags = GetMenuManager(*this).GetUpdateFlags(*this);
if( flags & PausedFlag )
TransportActions::DoStop(*this);
}

1
src/Project.h
View File

@ -401,7 +401,6 @@ public:
void UpdatePrefsVariables();
void RedrawProject(const bool bForceWaveTracks = false);
void RefreshCursor();
void StopIfPaused();
void Zoom(double level);
void ZoomBy(double multiplier);
void Rewind(bool shift);

8
src/menus/TransportMenus.cpp
View File

@ -193,6 +193,14 @@ namespace TransportActions {
// exported helper functions
// Stop playing or recording, if paused.
void StopIfPaused( AudacityProject &project )
{
auto flags = GetMenuManager( project ).GetUpdateFlags( project );
if( flags & PausedFlag )
DoStop( project );
}
bool DoPlayStopSelect
(AudacityProject &project, bool click, bool shift)
{

4
src/toolbars/ControlToolBar.cpp
View File

@ -1305,7 +1305,7 @@ void ControlToolBar::OnRewind(wxCommandEvent & WXUNUSED(evt))
AudacityProject *p = GetActiveProject();
if (p) {
p->StopIfPaused();
TransportActions::StopIfPaused( *p );
p->Rewind(mRewind->WasShiftDown());
}
}
@ -1318,7 +1318,7 @@ void ControlToolBar::OnFF(wxCommandEvent & WXUNUSED(evt))
AudacityProject *p = GetActiveProject();
if (p) {
p->StopIfPaused();
TransportActions::StopIfPaused( *p );
p->SkipEnd(mFF->WasShiftDown());
}
}

2
src/tracks/ui/TrackButtonHandles.cpp
View File

@ -145,7 +145,7 @@ UIHandle::Result CloseButtonHandle::CommitChanges
auto pTrack = mpTrack.lock();
if (pTrack)
{
pProject->StopIfPaused();
TransportActions::StopIfPaused( *pProject );
if (!pProject->IsAudioActive()) {
// This pushes an undo item:
TrackActions::DoRemoveTrack(*pProject, pTrack.get());