1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-27 06:07:59 +02:00

CommitRecording out of ControlToolBar

This commit is contained in:
Paul Licameli 2019-06-19 21:11:40 -04:00
parent 1d6ff11fec
commit ed5c92450d
6 changed files with 13 additions and 11 deletions

View File

@ -2363,8 +2363,8 @@ void AudioIO::StopStream()
} }
} }
ControlToolBar &bar = ControlToolBar::Get( *mOwningProject ); if (mListener)
bar.CommitRecording(); mListener->OnCommitRecording();
} }
} }

View File

@ -28,6 +28,10 @@ public:
virtual void OnAudioIOStartRecording() = 0; virtual void OnAudioIOStartRecording() = 0;
virtual void OnAudioIOStopRecording() = 0; virtual void OnAudioIOStopRecording() = 0;
virtual void OnAudioIONewBlockFiles(const AutoSaveFile & blockFileLog) = 0; virtual void OnAudioIONewBlockFiles(const AutoSaveFile & blockFileLog) = 0;
// Commit the addition of temporary recording tracks into the project
virtual void OnCommitRecording() = 0;
}; };
#endif #endif

View File

@ -175,6 +175,12 @@ void ProjectAudioManager::OnAudioIONewBlockFiles(
} }
} }
void ProjectAudioManager::OnCommitRecording()
{
const auto project = &mProject;
TrackList::Get( *project ).ApplyPendingTracks();
}
AudioIOStartStreamOptions AudioIOStartStreamOptions
DefaultPlayOptions( AudacityProject &project ) DefaultPlayOptions( AudacityProject &project )
{ {

View File

@ -40,6 +40,7 @@ private:
void OnAudioIOStartRecording() override; void OnAudioIOStartRecording() override;
void OnAudioIOStopRecording() override; void OnAudioIOStopRecording() override;
void OnAudioIONewBlockFiles(const AutoSaveFile & blockFileLog) override; void OnAudioIONewBlockFiles(const AutoSaveFile & blockFileLog) override;
void OnCommitRecording() override;
AudacityProject &mProject; AudacityProject &mProject;

View File

@ -1521,12 +1521,6 @@ void ControlToolBar::StopScrolling()
(ProjectWindow::PlaybackScroller::Mode::Off); (ProjectWindow::PlaybackScroller::Mode::Off);
} }
void ControlToolBar::CommitRecording()
{
const auto project = &mProject;
TrackList::Get( *project ).ApplyPendingTracks();
}
void ControlToolBar::CancelRecording() void ControlToolBar::CancelRecording()
{ {
const auto project = &mProject; const auto project = &mProject;

View File

@ -135,9 +135,6 @@ class ControlToolBar final : public ToolBar {
void StartScrolling(); void StartScrolling();
void StopScrolling(); void StopScrolling();
// Commit the addition of temporary recording tracks into the project
void CommitRecording();
// Cancel the addition of temporary recording tracks into the project // Cancel the addition of temporary recording tracks into the project
void CancelRecording(); void CancelRecording();