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

New attached structure ProjectAudioIO handles tokens and meters

Browse Source
This commit is contained in:
Paul Licameli
2019-06-02 13:30:56 -04:00
parent 20ed57082f
commit 1f4202c878
27 changed files with 169 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/TrackPanel.cpp
View File

@@ -467,8 +467,10 @@ void TrackPanel::OnTimer(wxTimerEvent& )
AudacityProject *const p = GetProject();
auto &window = ProjectWindow::Get( *p );
auto &projectAudioIO = ProjectAudioIO::Get( *p );
// Check whether we were playing or recording, but the stream has stopped.
if (p->GetAudioIOToken()>0 && !IsAudioActive())
if (projectAudioIO.GetAudioIOToken()>0 && !IsAudioActive())
{
//the stream may have been started up after this one finished (by some other project)
//in that case reset the buttons don't stop the stream
@@ -478,11 +480,11 @@ void TrackPanel::OnTimer(wxTimerEvent& )
// Next, check to see if we were playing or recording
// audio, but now Audio I/O is completely finished.
if (p->GetAudioIOToken()>0 &&
!gAudioIO->IsAudioTokenActive(p->GetAudioIOToken()))
if (projectAudioIO.GetAudioIOToken()>0 &&
!gAudioIO->IsAudioTokenActive(projectAudioIO.GetAudioIOToken()))
{
window.FixScrollbars();
p->SetAudioIOToken(0);
projectAudioIO.SetAudioIOToken(0);
window.RedrawProject();
mRedrawAfterStop = false;
@@ -718,7 +720,7 @@ void TrackPanel::HandlePageDownKey()
bool TrackPanel::IsAudioActive()
{
AudacityProject *p = GetProject();
return p->IsAudioActive();
return ProjectAudioIO::Get( *p ).IsAudioActive();
}
void TrackPanel::UpdateStatusMessage( const wxString &st )