diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index 26977fb2fb..dbd5dae94b 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -3075,8 +3075,6 @@ ProcessorBox::maybe_add_processor_to_ui_list (std::weak_ptr w) if (!std::dynamic_pointer_cast (p)) { have_ui = true; } - } else if (std::dynamic_pointer_cast (p)) { - have_ui = true; } #ifdef HAVE_BEATBOX else if (std::dynamic_pointer_cast (p)) { @@ -3152,7 +3150,6 @@ ProcessorBox::add_processor_to_display (std::weak_ptr p) std::shared_ptr send = std::dynamic_pointer_cast (processor); std::shared_ptr ext = std::dynamic_pointer_cast (processor); - std::shared_ptr tb = std::dynamic_pointer_cast (processor); #ifdef HAVE_BEATBOX std::shared_ptr bb = std::dynamic_pointer_cast (processor); #endif @@ -3162,9 +3159,9 @@ ProcessorBox::add_processor_to_display (std::weak_ptr p) //faders and meters are not deletable, copy/paste-able, so they shouldn't be selectable #ifdef HAVE_BEATBOX - if (!send && !plugin_insert && !ext && !stub && !bb && !tb && !sursend) { + if (!send && !plugin_insert && !ext && !stub && !bb && !sursend) { #else - if (!send && !plugin_insert && !ext && !stub && !tb && !sursend) { + if (!send && !plugin_insert && !ext && !stub && !sursend) { #endif e->set_selectable(false); } @@ -3953,8 +3950,7 @@ ProcessorBox::processor_can_be_edited (std::shared_ptr processor) if (std::dynamic_pointer_cast (processor) || std::dynamic_pointer_cast (processor) || std::dynamic_pointer_cast (processor) || - std::dynamic_pointer_cast (processor) || - std::dynamic_pointer_cast (processor) + std::dynamic_pointer_cast (processor) #ifdef HAVE_BEATBOX || std::dynamic_pointer_cast (processor) #endif @@ -4478,20 +4474,6 @@ ProcessorBox::edit_aux_send (std::shared_ptr processor) return true; } -bool -ProcessorBox::edit_triggerbox (std::shared_ptr processor) -{ - std::shared_ptr tb; - - if ((tb = std::dynamic_pointer_cast (processor)) == 0) { - return false; - } - - UIConfiguration::instance().set_show_triggers_inline (!UIConfiguration::instance().get_show_triggers_inline()); - - return true; -} - void ProcessorBox::edit_processor (std::shared_ptr processor) { @@ -4501,9 +4483,6 @@ ProcessorBox::edit_processor (std::shared_ptr processor) if (edit_aux_send (processor)) { return; } - if (edit_triggerbox (processor)) { - return; - } if (!ARDOUR_UI_UTILS::engine_is_running ()) { return; } diff --git a/gtk2_ardour/processor_box.h b/gtk2_ardour/processor_box.h index e5d0020bb3..5eea5d40f3 100644 --- a/gtk2_ardour/processor_box.h +++ b/gtk2_ardour/processor_box.h @@ -450,7 +450,6 @@ public: void hide_things (); bool edit_aux_send (std::shared_ptr); - bool edit_triggerbox (std::shared_ptr); /* Everything except a WindowProxy object should use this to get the window */ Gtk::Window* get_processor_ui (std::shared_ptr) const; diff --git a/gtk2_ardour/ui_config_vars.h b/gtk2_ardour/ui_config_vars.h index d922f6bb0e..3a1cd67ade 100644 --- a/gtk2_ardour/ui_config_vars.h +++ b/gtk2_ardour/ui_config_vars.h @@ -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, 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 (bool, show_triggers_inline, "show-triggers-inline", 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_upper_midi_note, "default-upper-midi-note", 71)