Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-24 23:33:50 +02:00
Code Issues Releases Wiki Activity

Remove naked new[] in: mixer

Browse Source
This commit is contained in:
Paul Licameli
2016-04-14 11:54:59 -04:00
parent 0113e6f44f
commit ea05fac870
3 changed files with 76 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Mix.h
View File

@@ -51,10 +51,9 @@ class AUDACITY_DLL_API MixerSpec
unsigned mNumTracks, mNumChannels, mMaxNumChannels;
void Alloc();
void Free();
public:
bool **mMap;
public:
ArraysOf<bool> mMap;
MixerSpec( unsigned numTracks, unsigned maxNumChannels );
MixerSpec( const MixerSpec &mixerSpec );
@@ -150,38 +149,37 @@ class AUDACITY_DLL_API Mixer {
Resample * pResample);
private:
// Input
int mNumInputTracks;
WaveTrackCache *mInputTrack;
// Input
size_t mNumInputTracks;
ArrayOf<WaveTrackCache> mInputTrack;
bool mbVariableRates;
const TimeTrack *mTimeTrack;
sampleCount *mSamplePos;
ArrayOf<sampleCount> mSamplePos;
bool mApplyTrackGains;
float *mGains;
double *mEnvValues;
Doubles mEnvValues;
double mT0; // Start time
double mT1; // Stop time (none if mT0==mT1)
double mTime; // Current time (renamed from mT to mTime for consistency with AudioIO - mT represented warped time there)
Resample **mResample;
float **mSampleQueue;
int *mQueueStart;
int *mQueueLen;
ArrayOf<std::unique_ptr<Resample>> mResample;
size_t mQueueMaxLen;
FloatBuffers mSampleQueue;
ArrayOf<int> mQueueStart;
ArrayOf<int> mQueueLen;
size_t mProcessLen;
MixerSpec *mMixerSpec;
// Output
size_t mMaxOut;
unsigned mNumChannels;
Floats mGains;
unsigned mNumBuffers;
size_t mBufferSize;
size_t mInterleavedBufferSize;
sampleFormat mFormat;
bool mInterleaved;
SampleBuffer *mBuffer;
SampleBuffer *mTemp;
float *mFloatBuffer;
ArrayOf<SampleBuffer> mBuffer, mTemp;
Floats mFloatBuffer;
double mRate;
double mSpeed;
bool mHighQuality;