Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-25 07:43:54 +02:00
Code Issues Releases Wiki Activity

Dir manager uses std::shared_ptr

Browse Source
This commit is contained in:
Paul Licameli
2016-08-13 00:38:31 -04:00
parent 13e5788a6b
commit 46f38708ed
21 changed files with 40 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Sequence.cpp
View File

@@ -51,26 +51,23 @@
int Sequence::sMaxDiskBlockSize = 1048576;
// Sequence methods
Sequence::Sequence(DirManager * projDirManager, sampleFormat format)
Sequence::Sequence(const std::shared_ptr<DirManager> &projDirManager, sampleFormat format)
: mDirManager(projDirManager)
, mSampleFormat(format)
, mMinSamples(sMaxDiskBlockSize / SAMPLE_SIZE(mSampleFormat) / 2)
, mMaxSamples(mMinSamples * 2)
{
mDirManager->Ref();
}
// essentially a copy constructor - but you must pass in the
// current project's DirManager, because we might be copying
// from one project to another
Sequence::Sequence(const Sequence &orig, DirManager *projDirManager)
Sequence::Sequence(const Sequence &orig, const std::shared_ptr<DirManager> &projDirManager)
: mDirManager(projDirManager)
, mSampleFormat(orig.mSampleFormat)
, mMinSamples(orig.mMinSamples)
, mMaxSamples(orig.mMaxSamples)
{
mDirManager->Ref();
bool bResult = Paste(0, &orig);
wxASSERT(bResult); // TO DO: Actually handle this.
(void)bResult;
@@ -79,7 +76,6 @@ Sequence::Sequence(const Sequence &orig, DirManager *projDirManager)
Sequence::~Sequence()
{
DerefAllFiles();
mDirManager->Deref();
}
void Sequence::DerefAllFiles()
@@ -1022,7 +1018,7 @@ XMLTagHandler *Sequence::HandleXMLChild(const wxChar *tag)
return this;
else {
mDirManager->SetLoadingFormat(mSampleFormat);
return mDirManager;
return mDirManager.get();
}
}