diff --git a/src/Track.cpp b/src/Track.cpp index 6a74a5d18..f37a00983 100644 --- a/src/Track.cpp +++ b/src/Track.cpp @@ -1394,20 +1394,6 @@ bool TrackList::HasPendingTracks() const 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" static auto TrackFactoryFactory = []( AudacityProject &project ) { auto &dirManager = DirManager::Get( project ); diff --git a/src/Track.h b/src/Track.h index c7fc7def5..ddbecc4c4 100644 --- a/src/Track.h +++ b/src/Track.h @@ -1654,8 +1654,4 @@ class AUDACITY_DLL_API TrackFactory final #endif }; -// global functions -struct TransportTracks; -TransportTracks GetAllPlaybackTracks(TrackList &trackList, bool selectedOnly, bool useMidi = false); - #endif diff --git a/src/toolbars/ControlToolBar.cpp b/src/toolbars/ControlToolBar.cpp index 069d0bdcc..56010d960 100644 --- a/src/toolbars/ControlToolBar.cpp +++ b/src/toolbars/ControlToolBar.cpp @@ -1544,3 +1544,16 @@ void ControlToolBar::CancelRecording() const auto project = GetActiveProject(); 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; +} diff --git a/src/toolbars/ControlToolBar.h b/src/toolbars/ControlToolBar.h index 8ff74e7ae..81cb20e07 100644 --- a/src/toolbars/ControlToolBar.h +++ b/src/toolbars/ControlToolBar.h @@ -43,6 +43,8 @@ class WaveTrack; using WaveTrackArray = std::vector < std::shared_ptr < WaveTrack > >; struct TransportTracks; +TransportTracks GetAllPlaybackTracks( + TrackList &trackList, bool selectedOnly, bool useMidi = false); // In the GUI, ControlToolBar appears as the "Transport Toolbar". "Control Toolbar" is historic. class ControlToolBar final : public ToolBar {