Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-26 00:03:52 +02:00
Code Issues Releases Wiki Activity

Sequence::Copy is a factory returning smart pointer. WaveClip stores it.

Browse Source
This commit is contained in:
Paul Licameli
2016-04-10 20:24:30 -04:00
parent 0d6daab602
commit daf92c43f8
4 changed files with 29 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Sequence.cpp
View File

@@ -29,6 +29,7 @@
#include "Audacity.h"
#include "Sequence.h"
#include <algorithm>
#include <float.h>
@@ -40,8 +41,6 @@
#include <wx/ffile.h>
#include <wx/log.h>
#include "Sequence.h"
#include "BlockFile.h"
#include "blockfile/ODDecodeBlockFile.h"
#include "DirManager.h"
@@ -406,9 +405,9 @@ bool Sequence::GetRMS(sampleCount start, sampleCount len,
return true;
}
bool Sequence::Copy(sampleCount s0, sampleCount s1, Sequence **dest)
bool Sequence::Copy(sampleCount s0, sampleCount s1, std::unique_ptr<Sequence> &dest) const
{
*dest = 0;
dest.reset();
if (s0 >= s1 || s0 >= mNumSamples || s1 < 0)
return false;
@@ -423,8 +422,8 @@ bool Sequence::Copy(sampleCount s0, sampleCount s1, Sequence **dest)
wxUnusedVar(numBlocks);
wxASSERT(b0 <= b1);
*dest = new Sequence(mDirManager, mSampleFormat);
(*dest)->mBlock.reserve(b1 - b0 + 1);
dest = std::make_unique<Sequence>(mDirManager, mSampleFormat);
dest->mBlock.reserve(b1 - b0 + 1);
SampleBuffer buffer(mMaxSamples, mSampleFormat);
@@ -439,14 +438,14 @@ bool Sequence::Copy(sampleCount s0, sampleCount s1, Sequence **dest)
wxASSERT(file->IsAlias() || (blocklen <= mMaxSamples)); // Vaughan, 2012-02-29
Get(b0, buffer.ptr(), mSampleFormat, s0, blocklen);
(*dest)->Append(buffer.ptr(), mSampleFormat, blocklen);
dest->Append(buffer.ptr(), mSampleFormat, blocklen);
}
else
--b0;
// If there are blocks in the middle, copy the blockfiles directly
for (int bb = b0 + 1; bb < b1; ++bb)
(*dest)->AppendBlock(mBlock[bb]); // Increase ref count or duplicate file
dest->AppendBlock(mBlock[bb]); // Increase ref count or duplicate file
// Do the last block
if (b1 > b0) {
@@ -456,11 +455,11 @@ bool Sequence::Copy(sampleCount s0, sampleCount s1, Sequence **dest)
wxASSERT(file->IsAlias() || (blocklen <= mMaxSamples)); // Vaughan, 2012-02-29
if (blocklen < file->GetLength()) {
Get(b1, buffer.ptr(), mSampleFormat, block.start, blocklen);
(*dest)->Append(buffer.ptr(), mSampleFormat, blocklen);
dest->Append(buffer.ptr(), mSampleFormat, blocklen);
}
else
// Special case, copy exactly
(*dest)->AppendBlock(block); // Increase ref count or duplicate file
dest->AppendBlock(block); // Increase ref count or duplicate file
}
return ConsistencyCheck(wxT("Sequence::Copy()"));