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

All tracks allocated with make_shared, no more make_unique...

Browse Source 
... so that we can use Track::SharedPointer without undefined behavior even on
tracks that don't yet belong to any TrackList.

Also fix the return type of function template TrackList::Add and remove some
casts.
This commit is contained in:
Paul Licameli
2018-11-18 23:07:05 -05:00
parent 6f89c48873
commit a0aa69a248
18 changed files with 60 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/TimeTrack.cpp
View File

@@ -33,9 +33,9 @@
#define TIMETRACK_MIN 0.01
#define TIMETRACK_MAX 10.0
std::unique_ptr<TimeTrack> TrackFactory::NewTimeTrack()
std::shared_ptr<TimeTrack> TrackFactory::NewTimeTrack()
{
return std::make_unique<TimeTrack>(mDirManager, mZoomInfo);
return std::make_shared<TimeTrack>(mDirManager, mZoomInfo);
}
TimeTrack::TimeTrack(const std::shared_ptr<DirManager> &projDirManager, const ZoomInfo *zoomInfo):
@@ -108,8 +108,7 @@ Track::Holder TimeTrack::Cut( double t0, double t1 )
Track::Holder TimeTrack::Copy( double t0, double t1, bool ) const
{
auto result = std::make_unique<TimeTrack>( *this, &t0, &t1 );
return Track::Holder{ std::move( result ) };
return std::make_shared<TimeTrack>( *this, &t0, &t1 );
}
void TimeTrack::Clear(double t0, double t1)
@@ -143,7 +142,7 @@ void TimeTrack::InsertSilence(double t, double len)
Track::Holder TimeTrack::Duplicate() const
{
return std::make_unique<TimeTrack>(*this);
return std::make_shared<TimeTrack>(*this);
}
bool TimeTrack::GetInterpolateLog() const