Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-14 17:14:07 +01:00
Code Issues Releases Wiki Activity

Clearer code for OnPlayStop

Browse Source 
The function naming is unfortunate as it is not clear that this
is a toggle between Play and Stop.  Added comments, renaming,
and split a function, and removed a little duplication.
This commit is contained in:
James Crook
2020-03-09 11:12:24 +00:00
parent 194855b738
commit 91bf05d18c
2 changed files with 39 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ProjectAudioManager.cpp
View File

@@ -1019,8 +1019,7 @@ TransportTracks ProjectAudioManager::GetAllPlaybackTracks(
} }
// Stop playing or recording, if paused. // Stop playing or recording, if paused.
void ProjectAudioManager::StopIfPaused void ProjectAudioManager::StopIfPaused()
()
{ {
if( AudioIOBase::Get()->IsPaused() ) if( AudioIOBase::Get()->IsPaused() )
Stop(); Stop();

66
src/menus/TransportMenus.cpp
View File

@@ -83,50 +83,56 @@ enum {
POST_TIMER_RECORD_SHUTDOWN POST_TIMER_RECORD_SHUTDOWN
}; };
void DoPlayStop(const CommandContext &context, bool looping = false ) // Returns true if this project was stopped, otherwise false.
// (it may though have stopped another project playing)
bool DoStopPlaying(const CommandContext &context)
{ {
auto &project = context.project; auto &project = context.project;
auto &projectAudioManager = ProjectAudioManager::Get( project ); auto &projectAudioManager = ProjectAudioManager::Get(project);
auto &toolbar = ControlToolBar::Get( project ); auto gAudioIO = AudioIOBase::Get();
auto &window = ProjectWindow::Get( project ); auto &toolbar = ControlToolBar::Get(project);
auto token = ProjectAudioIO::Get( project ).GetAudioIOToken(); auto &window = ProjectWindow::Get(project);
auto token = ProjectAudioIO::Get(project).GetAudioIOToken();
//If this project is playing, stop playing, make sure everything is unpaused. //If this project is playing, stop playing, make sure everything is unpaused.
auto gAudioIO = AudioIOBase::Get();
if (gAudioIO->IsStreamActive(token)) { if (gAudioIO->IsStreamActive(token)) {
toolbar.SetStop(); //Pushes stop down toolbar.SetStop(); //Pushes stop down
projectAudioManager.Stop(); projectAudioManager.Stop();
// Playing project was stopped. All done.
return true;
} }
else if (gAudioIO->IsStreamActive()) {
// If this project isn't playing, but another one is, stop playing the // This project isn't playing.
// old and start the NEW. // If some other project is playing, stop playing it
if (gAudioIO->IsStreamActive()) {
//find out which project we need; //find out which project we need;
auto start = AllProjects{}.begin(), finish = AllProjects{}.end(), auto start = AllProjects{}.begin(), finish = AllProjects{}.end(),
iter = std::find_if( start, finish, iter = std::find_if(start, finish,
[&]( const AllProjects::value_type &ptr ){ [&](const AllProjects::value_type &ptr) {
return gAudioIO->IsStreamActive( return gAudioIO->IsStreamActive(
ProjectAudioIO::Get( *ptr ).GetAudioIOToken()); } ); ProjectAudioIO::Get(*ptr).GetAudioIOToken()); });
//stop playing the other project //stop playing the other project
if(iter != finish) { if (iter != finish) {
auto otherProject = *iter; auto otherProject = *iter;
auto &otherToolbar = ControlToolBar::Get( *otherProject ); auto &otherToolbar = ControlToolBar::Get(*otherProject);
auto &otherProjectAudioManager = auto &otherProjectAudioManager =
ProjectAudioManager::Get( *otherProject ); ProjectAudioManager::Get(*otherProject);
otherToolbar.SetStop(); //Pushes stop down otherToolbar.SetStop(); //Pushes stop down
otherProjectAudioManager.Stop(); otherProjectAudioManager.Stop();
} }
//play the front project
if (!gAudioIO->IsBusy()) {
//Otherwise, start playing (assuming audio I/O isn't busy)
// Will automatically set mLastPlayMode
projectAudioManager.PlayCurrentRegion(looping);
}
} }
else if (!gAudioIO->IsBusy()) { return false;
}
void DoStartPlaying(const CommandContext &context, bool looping = false)
{
auto &project = context.project;
auto &projectAudioManager = ProjectAudioManager::Get(project);
auto gAudioIO = AudioIOBase::Get();
//play the front project
if (!gAudioIO->IsBusy()) {
//Otherwise, start playing (assuming audio I/O isn't busy) //Otherwise, start playing (assuming audio I/O isn't busy)
// Will automatically set mLastPlayMode // Will automatically set mLastPlayMode
@@ -172,10 +178,10 @@ void DoMoveToLabel(AudacityProject &project, bool next)
const LabelStruct* label = lt->GetLabel(i); const LabelStruct* label = lt->GetLabel(i);
bool looping = projectAudioManager.Looping(); bool looping = projectAudioManager.Looping();
if (ProjectAudioIO::Get( project ).IsAudioActive()) { if (ProjectAudioIO::Get( project ).IsAudioActive()) {
DoPlayStop(project); // stop DoStopPlaying(project);
selectedRegion = label->selectedRegion; selectedRegion = label->selectedRegion;
window.RedrawProject(); window.RedrawProject();
DoPlayStop(project, looping); // play DoStartPlaying(project, looping);
} }
else { else {
selectedRegion = label->selectedRegion; selectedRegion = label->selectedRegion;
@@ -200,9 +206,13 @@ namespace TransportActions {
struct Handler : CommandHandlerObject { struct Handler : CommandHandlerObject {
// This Plays OR Stops audio. It's a toggle.
// It is usually bound to the SPACE key.
void OnPlayStop(const CommandContext &context) void OnPlayStop(const CommandContext &context)
{ {
DoPlayStop( context.project ); if (DoStopPlaying(context.project))
return;
DoStartPlaying(context.project);
} }
void OnPlayStopSelect(const CommandContext &context) void OnPlayStopSelect(const CommandContext &context)