ardour/livetrax
13
0
Fork 0
Code

correctly hide/show/position triggerbox in route processors

Browse Source
This commit is contained in:
Paul Davis 2021-12-13 16:24:13 -07:00
parent 2a9ab18f7b
commit 0fcc873ec5
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libs/ardour/route.cc
View File

@ -2734,6 +2734,9 @@ Route::set_state (const XMLNode& node, int version)
if (_disk_reader) {
_disk_reader->set_display_to_user (diop == DiskIOCustom);
}
if (_triggerbox) {
_triggerbox->set_display_to_user (diop == DiskIOCustom);
}
set_disk_io_point (diop);
}
@ -5056,8 +5059,6 @@ Route::setup_invisible_processors ()
ProcessorList new_processors;
ProcessorList foldback_sends;
ProcessorList::iterator dr;
ProcessorList::iterator dw;
/* find visible processors */
@ -5201,13 +5202,15 @@ Route::setup_invisible_processors ()
/* DISK READER & WRITER (for Track objects) */
ProcessorList::iterator dw = new_processors.end();
if (_disk_reader || _disk_writer) {
switch (_disk_io_point) {
case DiskIOPreFader:
if (trim != new_processors.end()) {
/* insert BEFORE TRIM */
if (_disk_writer) {
new_processors.insert (trim, _disk_writer);
dw = new_processors.insert (trim, _disk_writer);
}
if (_disk_reader) {
new_processors.insert (trim, _disk_reader);
@ -5215,6 +5218,7 @@ Route::setup_invisible_processors ()
} else {
if (_disk_writer) {
new_processors.push_front (_disk_writer);
dw = new_processors.begin();
}
if (_disk_reader) {
new_processors.push_front (_disk_reader);
@ -5224,7 +5228,7 @@ Route::setup_invisible_processors ()
case DiskIOPostFader:
/* insert BEFORE main outs */
if (_disk_writer) {
new_processors.insert (main, _disk_writer);
dw = new_processors.insert (main, _disk_writer);
}
if (_disk_reader) {
new_processors.insert (main, _disk_reader);
@ -5238,6 +5242,11 @@ Route::setup_invisible_processors ()
}
}
if (_triggerbox && _disk_writer) {
/* BEFORE the disk recorder */
new_processors.insert (dw, _triggerbox);
}
/* ensure dist-writer is before disk-reader */
if (_disk_reader && _disk_writer) {
ProcessorList::iterator reader_pos = find (new_processors.begin(), new_processors.end(), _disk_reader);
@ -6262,6 +6271,10 @@ Route::set_disk_io_point (DiskIOPoint diop)
_disk_reader->set_display_to_user (display);
}
if (_triggerbox) {
_triggerbox->set_display_to_user (display);
}
const bool changed = (diop != _disk_io_point);
_disk_io_point = diop;

2
libs/ardour/triggerbox.cc
View File

@ -1547,7 +1547,7 @@ TriggerBox::TriggerBox (Session& s, DataType dt)
, _pass_thru (false)
, requests (1024)
{
_display_to_user = false;
set_display_to_user (false);
/* default number of possible triggers. call ::add_trigger() to increase */