ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Vaporgate: special case content creation 

This allows to change behavior to match some other notable DAW
which can only send automation events at cycle boundaries.
This commit is contained in:
Robin Gareus 2024-03-12 17:43:38 +01:00
parent 0fff58f905
commit 16fb29d576
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/ardour/ardour/surround_return.h
View File

@ -194,6 +194,7 @@ private:
bool _with_bed; bool _with_bed;
bool _sync_and_align; bool _sync_and_align;
bool _with_all_metadata; bool _with_all_metadata;
bool _content_creation;
float _ffoa; float _ffoa;
std::string _export_reference; std::string _export_reference;
FixedDelay _delaybuffers; FixedDelay _delaybuffers;

13
libs/ardour/surround_return.cc
View File

@ -93,6 +93,7 @@ SurroundReturn::SurroundReturn (Session& s, Route* r)
, _with_bed (false) , _with_bed (false)
, _sync_and_align (false) , _sync_and_align (false)
, _with_all_metadata (false) , _with_all_metadata (false)
, _content_creation (false)
, _ffoa (0) , _ffoa (0)
{ {
#if !(defined(LV2_EXTENDED) && defined(HAVE_LV2_1_10_0)) #if !(defined(LV2_EXTENDED) && defined(HAVE_LV2_1_10_0))
@ -358,8 +359,9 @@ SurroundReturn::reset_object_map ()
void void
SurroundReturn::set_bed_mix (bool on, std::string const& ref, int* cmap) SurroundReturn::set_bed_mix (bool on, std::string const& ref, int* cmap)
{ {
_with_bed = on; _with_bed = on;
_with_all_metadata = on; _with_all_metadata = on;
_content_creation = on;
if (!_with_bed) { if (!_with_bed) {
_export_reference.clear (); _export_reference.clear ();
@ -442,6 +444,7 @@ SurroundReturn::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_
bool with_bed = _with_bed; bool with_bed = _with_bed;
bool with_all_metadata = _with_all_metadata; bool with_all_metadata = _with_all_metadata;
bool content_creation = _content_creation && _exporting;
samplecnt_t latency = effective_latency (); samplecnt_t latency = effective_latency ();
@ -511,7 +514,7 @@ SurroundReturn::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_
timepos_t end (end_sample + latency); timepos_t end (end_sample + latency);
timepos_t next (start_sample + latency - 1); timepos_t next (start_sample + latency - 1);
while (true) { while (!content_creation) {
Evoral::ControlEvent next_event (timepos_t (Temporal::AudioTime), 0.0f); Evoral::ControlEvent next_event (timepos_t (Temporal::AudioTime), 0.0f);
if (!p->find_next_event (next, end, next_event)) { if (!p->find_next_event (next, end, next_event)) {
break; break;
@ -522,8 +525,10 @@ SurroundReturn::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_
} }
/* inform live renderer */ /* inform live renderer */
if (!found_event) { if (!found_event) {
if (p->pan_pos_x->list ()->interpolation () != Evoral::ControlList::Discrete || !_exporting) { if (p->pan_pos_x->list ()->interpolation () != Evoral::ControlList::Discrete || !_exporting || content_creation) {
evaluate (id, p, start, 0, with_all_metadata); if (!content_creation || 0 == ((start_sample + latency) & 0x1ff)) {
evaluate (id, p, start, 0, with_all_metadata);
}
/* send event at export end */ /* send event at export end */
if (_exporting && _export_end - 1 >= start_sample && _export_end - 1 < end_sample) { if (_exporting && _export_end - 1 >= start_sample && _export_end - 1 < end_sample) {
evaluate (id, p, timepos_t (_export_end + latency - 1), _export_end - start_sample - 1, with_all_metadata); evaluate (id, p, timepos_t (_export_end + latency - 1), _export_end - start_sample - 1, with_all_metadata);