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

Track.cpp does not depend directly on AudioIO

Browse Source
This commit is contained in:
Paul Licameli 2019-06-04 13:35:23 -04:00
parent d85b297ca5
commit 98960c4fc3
4 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Track.cpp
View File

@ -1394,20 +1394,6 @@ bool TrackList::HasPendingTracks() const
return false; return false;
} }
#include "AudioIO.h"
TransportTracks GetAllPlaybackTracks(TrackList &trackList, bool selectedOnly, bool useMidi)
{
TransportTracks result;
result.playbackTracks = trackList.GetWaveTrackArray(selectedOnly);
#ifdef EXPERIMENTAL_MIDI_OUT
if (useMidi)
result.midiTracks = trackList.GetNoteTrackConstArray(selectedOnly);
#else
WXUNUSED(useMidi);
#endif
return result;
}
#include "ViewInfo.h" #include "ViewInfo.h"
static auto TrackFactoryFactory = []( AudacityProject &project ) { static auto TrackFactoryFactory = []( AudacityProject &project ) {
auto &dirManager = DirManager::Get( project ); auto &dirManager = DirManager::Get( project );

4
src/Track.h
View File

@ -1654,8 +1654,4 @@ class AUDACITY_DLL_API TrackFactory final
#endif #endif
}; };
// global functions
struct TransportTracks;
TransportTracks GetAllPlaybackTracks(TrackList &trackList, bool selectedOnly, bool useMidi = false);
#endif #endif

13
src/toolbars/ControlToolBar.cpp
View File

@ -1544,3 +1544,16 @@ void ControlToolBar::CancelRecording()
const auto project = GetActiveProject(); const auto project = GetActiveProject();
TrackList::Get( *project ).ClearPendingTracks(); TrackList::Get( *project ).ClearPendingTracks();
} }
TransportTracks GetAllPlaybackTracks(TrackList &trackList, bool selectedOnly, bool useMidi)
{
TransportTracks result;
result.playbackTracks = trackList.GetWaveTrackArray(selectedOnly);
#ifdef EXPERIMENTAL_MIDI_OUT
if (useMidi)
result.midiTracks = trackList.GetNoteTrackConstArray(selectedOnly);
#else
WXUNUSED(useMidi);
#endif
return result;
}

2
src/toolbars/ControlToolBar.h
View File

@ -43,6 +43,8 @@ class WaveTrack;
using WaveTrackArray = std::vector < std::shared_ptr < WaveTrack > >; using WaveTrackArray = std::vector < std::shared_ptr < WaveTrack > >;
struct TransportTracks; struct TransportTracks;
TransportTracks GetAllPlaybackTracks(
TrackList &trackList, bool selectedOnly, bool useMidi = false);
// In the GUI, ControlToolBar appears as the "Transport Toolbar". "Control Toolbar" is historic. // In the GUI, ControlToolBar appears as the "Transport Toolbar". "Control Toolbar" is historic.
class ControlToolBar final : public ToolBar { class ControlToolBar final : public ToolBar {