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

Rewrite GetLink(ed) in vamp effects

Browse Source
This commit is contained in:
Paul Licameli 2018-09-13 10:17:59 -04:00
parent 70f7b0f6ef
commit 518df314eb
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/effects/vamp/VampEffect.cpp
View File

@ -299,25 +299,25 @@ bool VampEffect::Init()
{ {
mRate = 0.0; mRate = 0.0;
for (auto left : inputTracks()->Leaders< const WaveTrack >() ) // PRL: this loop checked that channels of a track have the same rate,
{ // but there was no check that all tracks have one rate, and only the first
if (mRate == 0.0) // is remembered in mRate. Is that correct?
{
mRate = left->GetRate();
}
if (left->GetLinked())
{
auto right = static_cast<const WaveTrack*>( left->GetLink() );
for (auto leader : inputTracks()->Leaders<const WaveTrack>()) {
auto channelGroup = TrackList::Channels( leader );
auto rate = (*channelGroup.first++) -> GetRate();
for(auto channel : channelGroup) {
if (rate != channel->GetRate())
// PRL: Track rate might not match individual clip rates. // PRL: Track rate might not match individual clip rates.
// So is this check not adequate? // So is this check not adequate?
if (left->GetRate() != right->GetRate()) {
{ // TODO: more-than-two-channels-message
Effect::MessageBox(_("Sorry, Vamp Plug-ins cannot be run on stereo tracks where the individual channels of the track do not match.")); Effect::MessageBox(_("Sorry, Vamp Plug-ins cannot be run on stereo tracks where the individual channels of the track do not match."));
return false; return false;
} }
} }
if (mRate == 0.0)
mRate = rate;
} }
if (mRate <= 0.0) if (mRate <= 0.0)
@ -361,22 +361,26 @@ bool VampEffect::Process()
std::vector<std::shared_ptr<Effect::AddedAnalysisTrack>> addedTracks; std::vector<std::shared_ptr<Effect::AddedAnalysisTrack>> addedTracks;
for (auto left : inputTracks()->Leaders< const WaveTrack >() ) for (auto leader : inputTracks()->Leaders<const WaveTrack>())
{ {
auto channelGroup = TrackList::Channels(leader);
auto left = *channelGroup.first++;
sampleCount lstart, rstart = 0; sampleCount lstart, rstart = 0;
sampleCount len; sampleCount len;
GetSamples(left, &lstart, &len); GetSamples(left, &lstart, &len);
unsigned channels = 1; unsigned channels = 1;
const WaveTrack *right{}; const WaveTrack *right = *channelGroup.first++;
if (left->GetLinked()) if (right)
{ {
right = static_cast< const WaveTrack* >( left->GetLink() );
channels = 2; channels = 2;
GetSamples(right, &rstart, &len); GetSamples(right, &rstart, &len);
} }
// TODO: more-than-two-channels
size_t step = mPlugin->getPreferredStepSize(); size_t step = mPlugin->getPreferredStepSize();
size_t block = mPlugin->getPreferredBlockSize(); size_t block = mPlugin->getPreferredBlockSize();