1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-24 23:33:50 +02:00

Less scrub lag: avoid redundant disk traffic in Mixer...

Also improves performance in bug 860, but not as much as the special case
patch for that bug in Bugzilla
This commit is contained in:
Paul-Licameli
2016-05-15 10:06:51 -05:00
committed by Paul Licameli
parent 52910f4f07
commit 6eaff838f2
2 changed files with 28 additions and 28 deletions

View File

@@ -14,16 +14,16 @@
#include "MemoryX.h"
#include <wx/string.h>
#include "SampleFormat.h"
#include "Resample.h"
class Resample;
class DirManager;
class TimeTrack;
class TrackFactory;
class TrackList;
class WaveTrack;
class WaveTrackConstArray;
class WaveTrackCache;
/** @brief Mixes together all input tracks, applying any envelopes, amplitude
* gain, panning, and real-time effects in the process.
@@ -141,10 +141,10 @@ class AUDACITY_DLL_API Mixer {
private:
void Clear();
sampleCount MixSameRate(int *channelFlags, const WaveTrack *src,
sampleCount MixSameRate(int *channelFlags, WaveTrackCache &cache,
sampleCount *pos);
sampleCount MixVariableRates(int *channelFlags, const WaveTrack *track,
sampleCount MixVariableRates(int *channelFlags, WaveTrackCache &cache,
sampleCount *pos, float *queue,
int *queueStart, int *queueLen,
Resample * pResample);
@@ -152,7 +152,8 @@ class AUDACITY_DLL_API Mixer {
private:
// Input
int mNumInputTracks;
const WaveTrack **mInputTrack;
WaveTrackCache *mInputTrack;
bool mbVariableRates;
const TimeTrack *mTimeTrack;
sampleCount *mSamplePos;