smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-11 09:06:33 +01:00
Code Issues Projects Releases Wiki Activity

Stretch gain envelope and region-FX automation with region

Browse source
This commit is contained in:
Robin Gareus 2025-05-08 22:01:05 +02:00
parent a3fb3abcc5
commit 1e3100efbc
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 35 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

27
libs/ardour/rb_effect.cc
View file

@ -32,6 +32,7 @@
#include "ardour/audioregion.h" #include "ardour/audioregion.h"
#include "ardour/audiosource.h" #include "ardour/audiosource.h"
#include "ardour/pitch.h" #include "ardour/pitch.h"
#include "ardour/region_fx_plugin.h"
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/stretch.h" #include "ardour/stretch.h"
#include "ardour/types.h" #include "ardour/types.h"
@ -345,6 +346,23 @@ RBEffect::run (std::shared_ptr<Region> r, Progress* progress)
ret = finish (region, nsrcs, new_name); ret = finish (region, nsrcs, new_name);
} }
/* apply automation scaling before calling set_length, which trims automation */
if (ret == 0 && !tsr.time_fraction.is_unity()) {
for (auto& r : results) {
std::shared_ptr<AudioRegion> ar = std::dynamic_pointer_cast<AudioRegion> (r);
assert (ar);
ar->envelope ()->x_scale (tsr.time_fraction);
ar->foreach_plugin ([&](std::weak_ptr<RegionFxPlugin> wfx)
{
shared_ptr<RegionFxPlugin> rfx = wfx.lock ();
if (rfx) {
rfx->x_scale_automation (tsr.time_fraction);
}
});
}
}
/* now reset ancestral data for each new region */ /* now reset ancestral data for each new region */
for (vector<std::shared_ptr<Region> >::iterator x = results.begin (); x != results.end (); ++x) { for (vector<std::shared_ptr<Region> >::iterator x = results.begin (); x != results.end (); ++x) {
@ -360,15 +378,6 @@ RBEffect::run (std::shared_ptr<Region> r, Progress* progress)
(*x)->set_whole_file (true); (*x)->set_whole_file (true);
} }
/* stretch region gain envelope */
/* XXX: assuming we've only processed one input region into one result here */
if (ret == 0 && !tsr.time_fraction.is_unity()) {
std::shared_ptr<AudioRegion> result = std::dynamic_pointer_cast<AudioRegion> (results.front ());
assert (result);
result->envelope ()->x_scale (tsr.time_fraction);
}
out: out:
if (buffers) { if (buffers) {

26
libs/ardour/st_stretch.cc
View file

@ -27,6 +27,7 @@
#include "ardour/types.h" #include "ardour/types.h"
#include "ardour/stretch.h" #include "ardour/stretch.h"
#include "ardour/audiofilesource.h" #include "ardour/audiofilesource.h"
#include "ardour/region_fx_plugin.h"
#include "ardour/session.h" #include "ardour/session.h"
#include "ardour/audioregion.h" #include "ardour/audioregion.h"
@ -289,6 +290,22 @@ STStretch::run (std::shared_ptr<Region> r, Progress* progress)
ret = finish (region, nsrcs, new_name); ret = finish (region, nsrcs, new_name);
} }
/* apply automation scaling before calling set_length, which trims automation */
if (ret == 0 && !tsr.time_fraction.is_unity()) {
for (auto& r : results) {
std::shared_ptr<AudioRegion> ar = std::dynamic_pointer_cast<AudioRegion> (r);
assert (ar);
ar->envelope ()->x_scale (tsr.time_fraction);
ar->foreach_plugin ([&](std::weak_ptr<RegionFxPlugin> wfx)
{
shared_ptr<RegionFxPlugin> rfx = wfx.lock ();
if (rfx) {
rfx->x_scale_automation (tsr.time_fraction);
}
});
}
}
/* now reset ancestral data for each new region */ /* now reset ancestral data for each new region */
for (vector<std::shared_ptr<Region> >::iterator x = results.begin (); x != results.end (); ++x) { for (vector<std::shared_ptr<Region> >::iterator x = results.begin (); x != results.end (); ++x) {
@ -304,15 +321,6 @@ STStretch::run (std::shared_ptr<Region> r, Progress* progress)
(*x)->set_whole_file (true); (*x)->set_whole_file (true);
} }
/* stretch region gain envelope */
/* XXX: assuming we've only processed one input region into one result here */
if (ret == 0 && tsr.time_fraction != 1) {
std::shared_ptr<AudioRegion> result = std::dynamic_pointer_cast<AudioRegion> (results.front ());
assert (result);
result->envelope ()->x_scale (tsr.time_fraction);
}
out: out:
if (buffers) { if (buffers) {