1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-23 09:20:16 +01:00

Move members from ControlToolBar into class ProjectAudioManager...

... and ControlToolBar is included in fewer places
This commit is contained in:
Paul Licameli
2019-07-01 12:35:53 -04:00
parent 977b46cda2
commit 13c2e4de0f
14 changed files with 191 additions and 204 deletions

View File

@@ -54,6 +54,7 @@ is time to refresh some aspect of the screen.
#include "KeyboardCapture.h"
#include "Project.h"
#include "ProjectAudioIO.h"
#include "ProjectAudioManager.h"
#include "ProjectHistory.h"
#include "ProjectSettings.h"
#include "ProjectStatus.h"
@@ -80,8 +81,6 @@ is time to refresh some aspect of the screen.
#include "ondemand/ODManager.h"
#include "ondemand/ODTask.h"
#include "toolbars/ControlToolBar.h"
#include "tracks/ui/TrackControls.h"
#include "tracks/ui/TrackView.h"
#include "tracks/ui/TrackVRulerControls.h"
@@ -422,8 +421,8 @@ void TrackPanel::OnTimer(wxTimerEvent& )
{
//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
auto &bar = ControlToolBar::Get( *p );
bar.StopPlaying(!gAudioIO->IsStreamActive());
auto &projectAudioManager = ProjectAudioManager::Get( *p );
projectAudioManager.Stop(!gAudioIO->IsStreamActive());
}
// Next, check to see if we were playing or recording