Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-25 08:38:39 +02:00
Code Issues Releases Wiki Activity

Fix OpenMP build

Browse Source
This commit is contained in:
Darrell Walisser 2018-01-30 14:13:57 -05:00 committed by James Crook
parent b4f7946e9b
commit 5dfff70f5b
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mix.cpp
View File

@ -387,7 +387,7 @@ size_t Mixer::MixVariableRates(int *channelFlags, WaveTrackCache &cache,
int *queueStart, int *queueLen, int *queueStart, int *queueLen,
Resample * pResample) Resample * pResample)
{ {
const WaveTrack *const track = cache.GetTrack(); const WaveTrack *const track = cache.GetTrack().get();
const double trackRate = track->GetRate(); const double trackRate = track->GetRate();
const double initialWarp = mRate / mSpeed / trackRate; const double initialWarp = mRate / mSpeed / trackRate;
const double tstep = 1.0 / trackRate; const double tstep = 1.0 / trackRate;
@ -532,7 +532,7 @@ size_t Mixer::MixVariableRates(int *channelFlags, WaveTrackCache &cache,
size_t Mixer::MixSameRate(int *channelFlags, WaveTrackCache &cache, size_t Mixer::MixSameRate(int *channelFlags, WaveTrackCache &cache,
sampleCount *pos) sampleCount *pos)
{ {
const WaveTrack *const track = cache.GetTrack(); const WaveTrack *const track = cache.GetTrack().get();
const double t = ( *pos ).as_double() / track->GetRate(); const double t = ( *pos ).as_double() / track->GetRate();
const double trackEndTime = track->GetEndTime(); const double trackEndTime = track->GetEndTime();
const double trackStartTime = track->GetStartTime(); const double trackStartTime = track->GetStartTime();
@ -605,7 +605,7 @@ size_t Mixer::Process(size_t maxToProcess)
Clear(); Clear();
for(size_t i=0; i<mNumInputTracks; i++) { for(size_t i=0; i<mNumInputTracks; i++) {
const WaveTrack *const track = mInputTrack[i].GetTrack(); const WaveTrack *const track = mInputTrack[i].GetTrack().get();
for(size_t j=0; j<mNumChannels; j++) for(size_t j=0; j<mNumChannels; j++)
channelFlags[j] = 0; channelFlags[j] = 0;

2
src/TrackArtist.cpp
View File

@ -2188,7 +2188,7 @@ void TrackArtist::DrawClipSpectrum(WaveTrackCache &waveTrackCache,
Profiler profiler; Profiler profiler;
#endif #endif
const WaveTrack *const track = waveTrackCache.GetTrack(); const WaveTrack *const track = waveTrackCache.GetTrack().get();
const SpectrogramSettings &settings = track->GetSpectrogramSettings(); const SpectrogramSettings &settings = track->GetSpectrogramSettings();
const bool autocorrelation = (settings.algorithm == SpectrogramSettings::algPitchEAC); const bool autocorrelation = (settings.algorithm == SpectrogramSettings::algPitchEAC);

2
src/WaveClip.cpp
View File

@ -1200,7 +1200,7 @@ bool WaveClip::GetSpectrogram(WaveTrackCache &waveTrackCache,
size_t numPixels, size_t numPixels,
double t0, double pixelsPerSecond) const double t0, double pixelsPerSecond) const
{ {
const WaveTrack *const track = waveTrackCache.GetTrack(); const WaveTrack *const track = waveTrackCache.GetTrack().get();
const SpectrogramSettings &settings = track->GetSpectrogramSettings(); const SpectrogramSettings &settings = track->GetSpectrogramSettings();
bool match = bool match =

2
src/WaveTrack.h
View File

@ -687,7 +687,7 @@ public:
} }
~WaveTrackCache(); ~WaveTrackCache();
const WaveTrack *GetTrack() const { return mPTrack.get(); } const std::shared_ptr<const WaveTrack>& GetTrack() const { return mPTrack; }
void SetTrack(const std::shared_ptr<const WaveTrack> &pTrack); void SetTrack(const std::shared_ptr<const WaveTrack> &pTrack);
// Uses fillZero always // Uses fillZero always