Triggerbox Processors are not visible and have no UI
Previously A ProcessorWindowProxy was created for each Route's triggerbox, and the state was saved with the session file.
This commit is contained in:
parent
4b582e877e
commit
311f55dba2
@ -3075,8 +3075,6 @@ ProcessorBox::maybe_add_processor_to_ui_list (std::weak_ptr<Processor> w)
|
|||||||
if (!std::dynamic_pointer_cast<InternalReturn> (p)) {
|
if (!std::dynamic_pointer_cast<InternalReturn> (p)) {
|
||||||
have_ui = true;
|
have_ui = true;
|
||||||
}
|
}
|
||||||
} else if (std::dynamic_pointer_cast<TriggerBox> (p)) {
|
|
||||||
have_ui = true;
|
|
||||||
}
|
}
|
||||||
#ifdef HAVE_BEATBOX
|
#ifdef HAVE_BEATBOX
|
||||||
else if (std::dynamic_pointer_cast<BeatBox> (p)) {
|
else if (std::dynamic_pointer_cast<BeatBox> (p)) {
|
||||||
@ -3152,7 +3150,6 @@ ProcessorBox::add_processor_to_display (std::weak_ptr<Processor> p)
|
|||||||
|
|
||||||
std::shared_ptr<Send> send = std::dynamic_pointer_cast<Send> (processor);
|
std::shared_ptr<Send> send = std::dynamic_pointer_cast<Send> (processor);
|
||||||
std::shared_ptr<PortInsert> ext = std::dynamic_pointer_cast<PortInsert> (processor);
|
std::shared_ptr<PortInsert> ext = std::dynamic_pointer_cast<PortInsert> (processor);
|
||||||
std::shared_ptr<TriggerBox> tb = std::dynamic_pointer_cast<TriggerBox> (processor);
|
|
||||||
#ifdef HAVE_BEATBOX
|
#ifdef HAVE_BEATBOX
|
||||||
std::shared_ptr<BeatBox> bb = std::dynamic_pointer_cast<BeatBox> (processor);
|
std::shared_ptr<BeatBox> bb = std::dynamic_pointer_cast<BeatBox> (processor);
|
||||||
#endif
|
#endif
|
||||||
@ -3162,9 +3159,9 @@ ProcessorBox::add_processor_to_display (std::weak_ptr<Processor> p)
|
|||||||
//faders and meters are not deletable, copy/paste-able, so they shouldn't be selectable
|
//faders and meters are not deletable, copy/paste-able, so they shouldn't be selectable
|
||||||
|
|
||||||
#ifdef HAVE_BEATBOX
|
#ifdef HAVE_BEATBOX
|
||||||
if (!send && !plugin_insert && !ext && !stub && !bb && !tb && !sursend) {
|
if (!send && !plugin_insert && !ext && !stub && !bb && !sursend) {
|
||||||
#else
|
#else
|
||||||
if (!send && !plugin_insert && !ext && !stub && !tb && !sursend) {
|
if (!send && !plugin_insert && !ext && !stub && !sursend) {
|
||||||
#endif
|
#endif
|
||||||
e->set_selectable(false);
|
e->set_selectable(false);
|
||||||
}
|
}
|
||||||
@ -3953,8 +3950,7 @@ ProcessorBox::processor_can_be_edited (std::shared_ptr<Processor> processor)
|
|||||||
if (std::dynamic_pointer_cast<Send> (processor) ||
|
if (std::dynamic_pointer_cast<Send> (processor) ||
|
||||||
std::dynamic_pointer_cast<Return> (processor) ||
|
std::dynamic_pointer_cast<Return> (processor) ||
|
||||||
std::dynamic_pointer_cast<PluginInsert> (processor) ||
|
std::dynamic_pointer_cast<PluginInsert> (processor) ||
|
||||||
std::dynamic_pointer_cast<PortInsert> (processor) ||
|
std::dynamic_pointer_cast<PortInsert> (processor)
|
||||||
std::dynamic_pointer_cast<TriggerBox> (processor)
|
|
||||||
#ifdef HAVE_BEATBOX
|
#ifdef HAVE_BEATBOX
|
||||||
|| std::dynamic_pointer_cast<BeatBox> (processor)
|
|| std::dynamic_pointer_cast<BeatBox> (processor)
|
||||||
#endif
|
#endif
|
||||||
@ -4478,20 +4474,6 @@ ProcessorBox::edit_aux_send (std::shared_ptr<Processor> processor)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
|
||||||
ProcessorBox::edit_triggerbox (std::shared_ptr<Processor> processor)
|
|
||||||
{
|
|
||||||
std::shared_ptr<TriggerBox> tb;
|
|
||||||
|
|
||||||
if ((tb = std::dynamic_pointer_cast<TriggerBox> (processor)) == 0) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
UIConfiguration::instance().set_show_triggers_inline (!UIConfiguration::instance().get_show_triggers_inline());
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
void
|
||||||
ProcessorBox::edit_processor (std::shared_ptr<Processor> processor)
|
ProcessorBox::edit_processor (std::shared_ptr<Processor> processor)
|
||||||
{
|
{
|
||||||
@ -4501,9 +4483,6 @@ ProcessorBox::edit_processor (std::shared_ptr<Processor> processor)
|
|||||||
if (edit_aux_send (processor)) {
|
if (edit_aux_send (processor)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (edit_triggerbox (processor)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!ARDOUR_UI_UTILS::engine_is_running ()) {
|
if (!ARDOUR_UI_UTILS::engine_is_running ()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -450,7 +450,6 @@ public:
|
|||||||
void hide_things ();
|
void hide_things ();
|
||||||
|
|
||||||
bool edit_aux_send (std::shared_ptr<ARDOUR::Processor>);
|
bool edit_aux_send (std::shared_ptr<ARDOUR::Processor>);
|
||||||
bool edit_triggerbox (std::shared_ptr<ARDOUR::Processor>);
|
|
||||||
|
|
||||||
/* Everything except a WindowProxy object should use this to get the window */
|
/* Everything except a WindowProxy object should use this to get the window */
|
||||||
Gtk::Window* get_processor_ui (std::shared_ptr<ARDOUR::Processor>) const;
|
Gtk::Window* get_processor_ui (std::shared_ptr<ARDOUR::Processor>) const;
|
||||||
|
@ -147,7 +147,6 @@ UI_CONFIG_VARIABLE (bool, rulers_follow_grid, "rulers-follow-grid", false)
|
|||||||
UI_CONFIG_VARIABLE (bool, grid_follows_internal, "grid-follows-internal", false) //this feature is deprecated, default it FALSE for now; remove it in v6
|
UI_CONFIG_VARIABLE (bool, grid_follows_internal, "grid-follows-internal", false) //this feature is deprecated, default it FALSE for now; remove it in v6
|
||||||
UI_CONFIG_VARIABLE (bool, show_region_name, "show-region-name", true)
|
UI_CONFIG_VARIABLE (bool, show_region_name, "show-region-name", true)
|
||||||
UI_CONFIG_VARIABLE (int, time_axis_name_ellipsize_mode, "time-axis-name-ellipsize-mode", 0)
|
UI_CONFIG_VARIABLE (int, time_axis_name_ellipsize_mode, "time-axis-name-ellipsize-mode", 0)
|
||||||
UI_CONFIG_VARIABLE (bool, show_triggers_inline, "show-triggers-inline", false)
|
|
||||||
UI_CONFIG_VARIABLE (bool, one_plugin_window_only, "one-plugin-window-only", false)
|
UI_CONFIG_VARIABLE (bool, one_plugin_window_only, "one-plugin-window-only", false)
|
||||||
UI_CONFIG_VARIABLE (int, default_lower_midi_note, "default-lower-midi-note", 60)
|
UI_CONFIG_VARIABLE (int, default_lower_midi_note, "default-lower-midi-note", 60)
|
||||||
UI_CONFIG_VARIABLE (int, default_upper_midi_note, "default-upper-midi-note", 71)
|
UI_CONFIG_VARIABLE (int, default_upper_midi_note, "default-upper-midi-note", 71)
|
||||||
|
Loading…
Reference in New Issue
Block a user