Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-21 08:27:13 +01:00
Code Issues Releases Wiki Activity

static TrackFactory::Get()...

Browse Source 
... not member functions of AudacityProject
This commit is contained in:
Paul Licameli
2019-01-22 10:59:44 -05:00
parent 4ba4d0978b
commit 116ff70756
18 changed files with 99 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/menus/TrackMenus.cpp
View File

@@ -39,7 +39,7 @@ void DoMixAndRender
(AudacityProject &project, bool toNewTrack)
{
auto &tracks = TrackList::Get( project );
auto trackFactory = project.GetTrackFactory();
auto &trackFactory = TrackFactory::Get( project );
auto rate = project.GetRate();
auto defaultFormat = project.GetDefaultFormat();
auto trackPanel = project.GetTrackPanel();
@@ -48,7 +48,7 @@ void DoMixAndRender
WaveTrack::Holder uNewLeft, uNewRight;
::MixAndRender(
&tracks, trackFactory, rate, defaultFormat, 0.0, 0.0, uNewLeft, uNewRight);
&tracks, &trackFactory, rate, defaultFormat, 0.0, 0.0, uNewLeft, uNewRight);
if (uNewLeft) {
// Remove originals, get stats on what tracks were mixed
@@ -796,12 +796,12 @@ void OnNewWaveTrack(const CommandContext &context)
{
auto &project = context.project;
auto &tracks = TrackList::Get( project );
auto trackFactory = project.GetTrackFactory();
auto &trackFactory = TrackFactory::Get( project );
auto trackPanel = project.GetTrackPanel();
auto defaultFormat = project.GetDefaultFormat();
auto rate = project.GetRate();
auto t = tracks.Add(trackFactory->NewWaveTrack(defaultFormat, rate));
auto t = tracks.Add( trackFactory.NewWaveTrack( defaultFormat, rate ) );
SelectActions::SelectNone( project );
t->SetSelected(true);
@@ -816,17 +816,17 @@ void OnNewStereoTrack(const CommandContext &context)
{
auto &project = context.project;
auto &tracks = TrackList::Get( project );
auto trackFactory = project.GetTrackFactory();
auto &trackFactory = TrackFactory::Get( project );
auto trackPanel = project.GetTrackPanel();
auto defaultFormat = project.GetDefaultFormat();
auto rate = project.GetRate();
SelectActions::SelectNone( project );
auto left = tracks.Add(trackFactory->NewWaveTrack(defaultFormat, rate));
auto left = tracks.Add( trackFactory.NewWaveTrack( defaultFormat, rate ) );
left->SetSelected(true);
auto right = tracks.Add(trackFactory->NewWaveTrack(defaultFormat, rate));
auto right = tracks.Add( trackFactory.NewWaveTrack( defaultFormat, rate ) );
right->SetSelected(true);
tracks.GroupChannels(*left, 2);
@@ -841,10 +841,10 @@ void OnNewLabelTrack(const CommandContext &context)
{
auto &project = context.project;
auto &tracks = TrackList::Get( project );
auto trackFactory = project.GetTrackFactory();
auto &trackFactory = TrackFactory::Get( project );
auto trackPanel = project.GetTrackPanel();
auto t = tracks.Add(trackFactory->NewLabelTrack());
auto t = tracks.Add( trackFactory.NewLabelTrack() );
SelectActions::SelectNone( project );
@@ -860,7 +860,7 @@ void OnNewTimeTrack(const CommandContext &context)
{
auto &project = context.project;
auto &tracks = TrackList::Get( project );
auto trackFactory = project.GetTrackFactory();
auto &trackFactory = TrackFactory::Get( project );
auto trackPanel = project.GetTrackPanel();
if (tracks.GetTimeTrack()) {
@@ -868,7 +868,7 @@ void OnNewTimeTrack(const CommandContext &context)
return;
}
auto t = tracks.AddToHead(trackFactory->NewTimeTrack());
auto t = tracks.AddToHead( trackFactory.NewTimeTrack() );
SelectActions::SelectNone( project );