X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fprocessor_box.cc;h=4448443136a1bf7d4499ff192fbfafdaecacf2a7;hb=d314a510f67c2b072f856914d2a94b9748fb7e4e;hp=f1dd84a84dac4f754ed6dc8eff9655d5a7ea9113;hpb=c3c4efaa09875bafddb2180c7f0312fad848193e;p=ardour.git diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index f1dd84a84d..4448443136 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -27,20 +27,21 @@ #include -#include "canvas/utils.h" - #include #include #include -#include +#include "gtkmm2ext/colors.h" +#include "gtkmm2ext/gtk_ui.h" #include "gtkmm2ext/menu_elems.h" -#include -#include -#include -#include -#include +#include "gtkmm2ext/utils.h" +#include "gtkmm2ext/doi.h" +#include "gtkmm2ext/rgb_macros.h" + +#include "widgets/choice.h" +#include "widgets/prompter.h" +#include "widgets/tooltips.h" #include "ardour/amp.h" #include "ardour/audio_track.h" @@ -84,7 +85,6 @@ #include "script_selector.h" #include "send_ui.h" #include "timers.h" -#include "tooltips.h" #include "new_plugin_preset_dialog.h" #include "pbd/i18n.h" @@ -103,6 +103,7 @@ using namespace PBD; using namespace Gtk; using namespace Glib; using namespace Gtkmm2ext; +using namespace ArdourWidgets; ProcessorBox* ProcessorBox::_current_processor_box = 0; RefPtr ProcessorBox::paste_action; @@ -112,6 +113,7 @@ RefPtr ProcessorBox::rename_action; RefPtr ProcessorBox::delete_action; RefPtr ProcessorBox::backspace_action; RefPtr ProcessorBox::manage_pins_action; +RefPtr ProcessorBox::disk_io_action; RefPtr ProcessorBox::edit_action; RefPtr ProcessorBox::edit_generic_action; RefPtr ProcessorBox::processor_box_actions; @@ -183,7 +185,7 @@ ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr pi = boost::dynamic_pointer_cast (_processor); if (pi && pi->plugin() && pi->plugin()->has_inline_display()) { if (pi->plugin()->get_info()->type != ARDOUR::Lua) { - _plugin_display = new PluginDisplay (*this, pi->plugin(), + _plugin_display = new PluginInlineDisplay (*this, pi->plugin(), std::max (60.f, rintf(112.f * UIConfiguration::instance().get_ui_scale()))); } else { assert (boost::dynamic_pointer_cast(pi->plugin())); @@ -216,11 +218,17 @@ ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptrPropertyChanged.connect (name_connection, invalidator (*this), boost::bind (&ProcessorEntry::processor_property_changed, this, _1), gui_context()); _processor->ConfigurationChanged.connect (config_connection, invalidator (*this), boost::bind (&ProcessorEntry::processor_configuration_changed, this, _1, _2), gui_context()); + const uint32_t limit_inline_controls = UIConfiguration::instance().get_max_inline_controls (); + set p = _processor->what_can_be_automated (); for (set::iterator i = p.begin(); i != p.end(); ++i) { std::string label = _processor->describe_parameter (*i); + if (label == X_("hidden")) { + continue; + } + if (boost::dynamic_pointer_cast (_processor)) { label = _("Send"); } else if (boost::dynamic_pointer_cast (_processor)) { @@ -235,6 +243,10 @@ ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptrbox); } + + if (limit_inline_controls > 0 && _controls.size() >= limit_inline_controls) { + break; + } } setup_tooltip (); @@ -516,10 +528,10 @@ ProcessorEntry::setup_tooltip () } if (pi->plugin()->has_editor()) { - ARDOUR_UI_UTILS::set_tooltip (_button, + set_tooltip (_button, string_compose (_("%1\nDouble-click to show GUI.\n%2+double-click to show generic GUI.%3"), name (Wide), Keyboard::secondary_modifier_name (), postfix)); } else { - ARDOUR_UI_UTILS::set_tooltip (_button, + set_tooltip (_button, string_compose (_("%1\nDouble-click to show generic GUI.%2"), name (Wide), postfix)); } return; @@ -533,14 +545,14 @@ ProcessorEntry::setup_tooltip () if ((send = boost::dynamic_pointer_cast (_processor)) != 0 && !boost::dynamic_pointer_cast(_processor)) { if (send->remove_on_disconnect ()) { - ARDOUR_UI_UTILS::set_tooltip (_button, string_compose ("> %1\nThis (sidechain) send will be removed when disconnected.", _processor->name())); + set_tooltip (_button, string_compose ("> %1\nThis (sidechain) send will be removed when disconnected.", _processor->name())); } else { - ARDOUR_UI_UTILS::set_tooltip (_button, string_compose ("> %1", _processor->name())); + set_tooltip (_button, string_compose ("> %1", _processor->name())); } return; } } - ARDOUR_UI_UTILS::set_tooltip (_button, string_compose ("%1", name (Wide))); + set_tooltip (_button, string_compose ("%1", name (Wide))); } string @@ -705,6 +717,11 @@ Menu * ProcessorEntry::build_controls_menu () { using namespace Menu_Helpers; + + if (!_plugin_display && _controls.empty ()) { + return NULL; + } + Menu* menu = manage (new Menu); MenuList& items = menu->items (); @@ -713,6 +730,11 @@ ProcessorEntry::build_controls_menu () Gtk::CheckMenuItem* c = dynamic_cast (&items.back ()); c->set_active (_plugin_display->is_visible ()); c->signal_toggled().connect (sigc::mem_fun (*this, &ProcessorEntry::toggle_inline_display_visibility)); + } + + if (_controls.empty ()) { + return menu; + } else { items.push_back (SeparatorElem ()); } @@ -724,9 +746,7 @@ ProcessorEntry::build_controls_menu () MenuElem (_("Hide All Controls"), sigc::mem_fun (*this, &ProcessorEntry::hide_all_controls)) ); - if (!_controls.empty ()) { - items.push_back (SeparatorElem ()); - } + items.push_back (SeparatorElem ()); for (list::iterator i = _controls.begin(); i != _controls.end(); ++i) { items.push_back (CheckMenuElemNoMnemonic ((*i)->name ())); @@ -823,8 +843,11 @@ ProcessorEntry::Control::Control (boost::shared_ptr c, string _button.signal_clicked.connect (sigc::mem_fun (*this, &Control::button_clicked)); _button.signal_led_clicked.connect (sigc::mem_fun (*this, &Control::button_clicked_event)); - // dup. currently timers are used :( - //c->Changed.connect (_connection, MISSING_INVALIDATOR, boost::bind (&Control::control_changed, this), gui_context ()); + c->Changed.connect (_connections, invalidator (*this), boost::bind (&Control::control_changed, this), gui_context ()); + if (c->alist ()) { + c->alist()->automation_state_changed.connect (_connections, invalidator (*this), boost::bind (&Control::control_automation_state_changed, this), gui_context()); + control_automation_state_changed (); + } } else { @@ -835,23 +858,11 @@ ProcessorEntry::Control::Control (boost::shared_ptr c, string _slider.show (); const ARDOUR::ParameterDescriptor& desc = c->desc(); - double const lo = c->internal_to_interface(desc.lower); - double const up = c->internal_to_interface(desc.upper); - double const normal = c->internal_to_interface(desc.normal); - double smallstep = desc.smallstep; - double largestep = desc.largestep; - - if (smallstep == 0.0) { - smallstep = up / 1000.; - } else { - smallstep = c->internal_to_interface(desc.lower + smallstep); - } - - if (largestep == 0.0) { - largestep = up / 40.; - } else { - largestep = c->internal_to_interface(desc.lower + largestep); - } + double const lo = c->internal_to_interface (desc.lower); + double const up = c->internal_to_interface (desc.upper); + double const normal = c->internal_to_interface (desc.normal); + double const smallstep = c->internal_to_interface (desc.lower + desc.smallstep); + double const largestep = c->internal_to_interface (desc.lower + desc.largestep); _adjustment.set_lower (lo); _adjustment.set_upper (up); @@ -859,15 +870,17 @@ ProcessorEntry::Control::Control (boost::shared_ptr c, string _adjustment.set_page_increment (largestep); _slider.set_default_value (normal); + _slider.StartGesture.connect(sigc::mem_fun(*this, &Control::start_touch)); + _slider.StopGesture.connect(sigc::mem_fun(*this, &Control::end_touch)); + _adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &Control::slider_adjusted)); - // dup. currently timers are used :( - //c->Changed.connect (_connection, MISSING_INVALIDATOR, boost::bind (&Control::control_changed, this), gui_context ()); + c->Changed.connect (_connections, invalidator (*this), boost::bind (&Control::control_changed, this), gui_context ()); + if (c->alist ()) { + c->alist()->automation_state_changed.connect (_connections, invalidator (*this), boost::bind (&Control::control_automation_state_changed, this), gui_context()); + control_automation_state_changed (); + } } - // yuck, do we really need to do this? - // according to c404374 this is only needed for send automation - timer_connection = Timers::rapid_connect (sigc::mem_fun (*this, &Control::control_changed)); - control_changed (); set_tooltip (); @@ -877,7 +890,6 @@ ProcessorEntry::Control::Control (boost::shared_ptr c, string ProcessorEntry::Control::~Control () { - timer_connection.disconnect (); } void @@ -891,7 +903,7 @@ ProcessorEntry::Control::set_tooltip () std::string tt = _name + ": " + ARDOUR::value_as_string (c->desc(), c->get_value ()); string sm = Gtkmm2ext::markup_escape_text (tt); _slider_persistant_tooltip.set_tip (sm); - ARDOUR_UI_UTILS::set_tooltip (_button, sm); + ArdourWidgets::set_tooltip (_button, Gtkmm2ext::markup_escape_text (sm)); } void @@ -911,6 +923,26 @@ ProcessorEntry::Control::slider_adjusted () set_tooltip (); } +void +ProcessorEntry::Control::start_touch () +{ + boost::shared_ptr c = _control.lock (); + if (!c) { + return; + } + c->start_touch (c->session().transport_sample()); +} + +void +ProcessorEntry::Control::end_touch () +{ + boost::shared_ptr c = _control.lock (); + if (!c) { + return; + } + c->stop_touch (c->session().transport_sample()); +} + void ProcessorEntry::Control::button_clicked () { @@ -935,6 +967,21 @@ ProcessorEntry::Control::button_clicked_event (GdkEventButton *ev) button_clicked (); } +void +ProcessorEntry::Control::control_automation_state_changed () +{ + boost::shared_ptr c = _control.lock (); + if (!c) { + return; + } + bool x = c->alist()->automation_state() & Play; + if (c->toggled ()) { + _button.set_sensitive (!x); + } else { + _slider.set_sensitive (!x); + } +} + void ProcessorEntry::Control::control_changed () { @@ -946,12 +993,9 @@ ProcessorEntry::Control::control_changed () _ignore_ui_adjustment = true; if (c->toggled ()) { - _button.set_active (c->get_value() > 0.5); - } else { - // as long as rapid timers are used, only update the tooltip - // if the value has changed. + // Note: the _slider watches the controllable by itself const double nval = c->internal_to_interface (c->get_value ()); if (_adjustment.get_value() != nval) { _adjustment.set_value (nval); @@ -1538,40 +1582,26 @@ ProcessorEntry::RoutingIcon::expose_output_map (cairo_t* cr, const double width, } } -ProcessorEntry::PluginDisplay::PluginDisplay (ProcessorEntry& e, boost::shared_ptr p, uint32_t max_height) - : _entry (e) - , _plug (p) - , _surf (0) - , _max_height (max_height) - , _cur_height (1) +ProcessorEntry::PluginInlineDisplay::PluginInlineDisplay (ProcessorEntry& e, boost::shared_ptr p, uint32_t max_height) + : PluginDisplay (p, max_height) + , _entry (e) , _scroll (false) + , _given_max_height (max_height) { - set_name ("processor prefader"); - add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); - _plug->DropReferences.connect (_death_connection, invalidator (*this), boost::bind (&PluginDisplay::plugin_going_away, this), gui_context()); - _plug->QueueDraw.connect (_qdraw_connection, invalidator (*this), - boost::bind (&Gtk::Widget::queue_draw, this), gui_context ()); - std::string postfix = string_compose(_("\n%1+double-click to toggle inline-display"), Keyboard::tertiary_modifier_name ()); if (_plug->has_editor()) { - ARDOUR_UI_UTILS::set_tooltip (*this, + set_tooltip (*this, string_compose (_("%1\nDouble-click to show GUI.\n%2+double-click to show generic GUI.%3"), e.name (Wide), Keyboard::primary_modifier_name (), postfix)); } else { - ARDOUR_UI_UTILS::set_tooltip (*this, + set_tooltip (*this, string_compose (_("%1\nDouble-click to show generic GUI.%2"), e.name (Wide), postfix)); } } -ProcessorEntry::PluginDisplay::~PluginDisplay () -{ - if (_surf) { - cairo_surface_destroy (_surf); - } -} bool -ProcessorEntry::PluginDisplay::on_button_press_event (GdkEventButton *ev) +ProcessorEntry::PluginInlineDisplay::on_button_press_event (GdkEventButton *ev) { assert (_entry.processor ()); @@ -1598,14 +1628,8 @@ ProcessorEntry::PluginDisplay::on_button_press_event (GdkEventButton *ev) return false; } -bool -ProcessorEntry::PluginDisplay::on_button_release_event (GdkEventButton *ev) -{ - return false; -} - void -ProcessorEntry::PluginDisplay::on_size_request (Requisition* req) +ProcessorEntry::PluginInlineDisplay::on_size_request (Requisition* req) { req->width = 56; req->height = _cur_height; @@ -1613,7 +1637,7 @@ ProcessorEntry::PluginDisplay::on_size_request (Requisition* req) void -ProcessorEntry::PluginDisplay::update_height_alloc (uint32_t inline_height) +ProcessorEntry::PluginInlineDisplay::update_height_alloc (uint32_t inline_height) { /* work-around scroll-bar + aspect ratio * show inline-view -> height changes -> scrollbar gets added @@ -1634,113 +1658,26 @@ ProcessorEntry::PluginDisplay::update_height_alloc (uint32_t inline_height) } if (shm != _cur_height) { - if (_scroll == sc || _cur_height < shm) { - queue_resize (); + queue_resize (); + if (!_scroll && sc) { + _max_height = shm; + } else { + _max_height = _given_max_height; } _cur_height = shm; } - _scroll = sc; -} - -uint32_t -ProcessorEntry::PluginDisplay::render_inline (cairo_t* cr, uint32_t width) -{ - Plugin::Display_Image_Surface* dis = _plug->render_inline_display (width, _max_height); - if (!dis) { - return 0; - } - - /* allocate a local image-surface, - * We cannot re-use the data via cairo_image_surface_create_for_data(), - * since pixman keeps a reference to it. - * we'd need to hand over the data and ha cairo_surface_destroy to free it. - * it might be possible to work around via cairo_surface_set_user_data(). - */ - if (!_surf - || dis->width != cairo_image_surface_get_width (_surf) - || dis->height != cairo_image_surface_get_height (_surf) - ) { - if (_surf) { - cairo_surface_destroy (_surf); - } - _surf = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, dis->width, dis->height); - } - - if (cairo_image_surface_get_stride (_surf) == dis->stride) { - memcpy (cairo_image_surface_get_data (_surf), dis->data, dis->stride * dis->height); - } else { - unsigned char *src = dis->data; - unsigned char *dst = cairo_image_surface_get_data (_surf); - const int dst_stride = cairo_image_surface_get_stride (_surf); - for (int y = 0; y < dis->height; ++y) { - memcpy (dst, src, dis->width * 4 /*ARGB32*/); - src += dis->stride; - dst += dst_stride; - } - } - - cairo_surface_flush(_surf); - cairo_surface_mark_dirty(_surf); - const double xc = floor ((width - dis->width) * .5); - cairo_set_source_surface(cr, _surf, xc, 0); - cairo_paint (cr); - return dis->height; + _scroll = sc; } -bool -ProcessorEntry::PluginDisplay::on_expose_event (GdkEventExpose* ev) +void +ProcessorEntry::PluginInlineDisplay::display_sample (cairo_t* cr, double w, double h) { - Gtk::Allocation a = get_allocation(); - double const width = a.get_width(); - double const height = a.get_height(); - - cairo_t* cr = gdk_cairo_create (get_window()->gobj()); - cairo_rectangle (cr, ev->area.x, ev->area.y, ev->area.width, ev->area.height); - cairo_clip (cr); - - Gdk::Color const bg = get_style()->get_bg (STATE_NORMAL); - cairo_set_source_rgb (cr, bg.get_red_p (), bg.get_green_p (), bg.get_blue_p ()); - cairo_rectangle (cr, 0, 0, width, height); - cairo_fill (cr); - - cairo_save (cr); - cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); - Gtkmm2ext::rounded_rectangle (cr, .5, -1.5, width - 1, height + 1, 7); - cairo_clip (cr); - cairo_set_operator (cr, CAIRO_OPERATOR_OVER); - - uint32_t ht = render_inline (cr, width); - cairo_restore (cr); - - if (ht == 0) { - hide (); - if (_cur_height != 1) { - _cur_height = 1; - queue_resize (); - } - cairo_destroy (cr); - return true; - } else { - update_height_alloc (ht); - } - - bool failed = false; - std::string name = get_name(); - ArdourCanvas::Color fill_color = UIConfiguration::instance().color (string_compose ("%1: fill active", name), &failed); - - Gtkmm2ext::rounded_rectangle (cr, .5, -1.5, width - 1, height + 1, 7); - cairo_set_operator (cr, CAIRO_OPERATOR_OVER); - cairo_set_line_width(cr, 1.0); - ArdourCanvas::set_source_rgb_a (cr, fill_color, 1.0); - cairo_stroke (cr); - - cairo_destroy(cr); - return true; + Gtkmm2ext::rounded_rectangle (cr, .5, -1.5, w - 1, h + 1, 7); } ProcessorEntry::LuaPluginDisplay::LuaPluginDisplay (ProcessorEntry& e, boost::shared_ptr p, uint32_t max_height) - : PluginDisplay (e, p, max_height) + : PluginInlineDisplay (e, p, max_height) , _luaproc (p) , _lua_render_inline (0) { @@ -1773,7 +1710,7 @@ ProcessorEntry::LuaPluginDisplay::render_inline (cairo_t *cr, uint32_t width) #ifndef NDEBUG cerr << "LuaException:" << e.what () << endl; #endif - } + } catch (...) { } return 0; } @@ -1809,7 +1746,6 @@ ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::function* source, ProcessorEntry* posi * otherwise we'll end up with duplicate ports-names. * (this needs a better solution which retains connections) */ - state.remove_nodes ("Processor"); + state.remove_nodes_and_delete ("Processor"); proc->set_state (state, Stateful::loading_state_version); boost::dynamic_pointer_cast(proc)->update_id (id); return; @@ -2040,7 +1976,7 @@ ProcessorBox::object_drop (DnDVBox* source, ProcessorEntry* posi boost::shared_ptr p = find_drop_position (position); - list children = source->selection (); + list children = source->selection (true); list > procs; for (list::const_iterator i = children.begin(); i != children.end(); ++i) { if ((*i)->processor ()) { @@ -2098,7 +2034,43 @@ ProcessorBox::build_possible_aux_menu () return 0; } - if (_route->is_monitor ()) { + if (_route->is_monitor () || _route->is_foldbackbus ()) { + return 0; + } + + using namespace Menu_Helpers; + Menu* menu = manage (new Menu); + MenuList& items = menu->items(); + + for (RouteList::iterator r = rl->begin(); r != rl->end(); ++r) { + if ((*r)->is_master() || (*r)->is_monitor () || *r == _route) { + /* don't allow sending to master or monitor or to self */ + continue; + } + if ((*r)->is_foldbackbus ()) { + continue; + } + if (_route->internal_send_for (*r)) { + /* aux-send to target already exists */ + continue; + } + items.push_back (MenuElemNoMnemonic ((*r)->name(), sigc::bind (sigc::ptr_fun (ProcessorBox::rb_choose_aux), boost::weak_ptr(*r)))); + } + + return menu; +} + +Gtk::Menu* +ProcessorBox::build_possible_listener_menu () +{ + boost::shared_ptr rl = _session->get_routes_with_internal_returns(); + + if (rl->empty()) { + /* No aux sends if there are no busses */ + return 0; + } + + if (_route->is_monitor () || _route->is_foldbackbus ()) { return 0; } @@ -2107,9 +2079,54 @@ ProcessorBox::build_possible_aux_menu () MenuList& items = menu->items(); for (RouteList::iterator r = rl->begin(); r != rl->end(); ++r) { - if (!_route->internal_send_for (*r) && *r != _route) { - items.push_back (MenuElemNoMnemonic ((*r)->name(), sigc::bind (sigc::ptr_fun (ProcessorBox::rb_choose_aux), boost::weak_ptr(*r)))); + if ((*r)->is_master() || (*r)->is_monitor () || *r == _route) { + /* don't allow sending to master or monitor or to self */ + continue; + } + if (!(*r)->is_foldbackbus ()) { + continue; + } + if (_route->internal_send_for (*r)) { + /* aux-send to target already exists */ + continue; } + items.push_back (MenuElemNoMnemonic ((*r)->name(), sigc::bind (sigc::ptr_fun (ProcessorBox::rb_choose_aux), boost::weak_ptr(*r)))); + } + + return menu; +} + +Gtk::Menu* +ProcessorBox::build_possible_remove_listener_menu () +{ + boost::shared_ptr rl = _session->get_routes_with_internal_returns(); + + if (rl->empty()) { + /* No aux sends if there are no busses */ + return 0; + } + + if (_route->is_monitor () || _route->is_foldbackbus ()) { + return 0; + } + + using namespace Menu_Helpers; + Menu* menu = manage (new Menu); + MenuList& items = menu->items(); + + for (RouteList::iterator r = rl->begin(); r != rl->end(); ++r) { + if ((*r)->is_master() || (*r)->is_monitor () || *r == _route) { + /* don't allow sending to master or monitor or to self */ + continue; + } + if (!(*r)->is_foldbackbus ()) { + continue; + } + if (!_route->internal_send_for (*r)) { + /* aux-send to target already exists */ + continue; + } + items.push_back (MenuElemNoMnemonic ((*r)->name(), sigc::bind (sigc::ptr_fun (ProcessorBox::rb_remove_aux), boost::weak_ptr(*r)))); } return menu; @@ -2147,8 +2164,36 @@ ProcessorBox::show_processor_menu (int arg) } } - ActionManager::get_action (X_("ProcessorMenu"), "newinsert")->set_sensitive (!_route->is_monitor ()); - ActionManager::get_action (X_("ProcessorMenu"), "newsend")->set_sensitive (!_route->is_monitor ()); + Gtk::MenuItem* listen_menu_item = dynamic_cast(ActionManager::get_widget("/ProcessorMenu/newlisten")); + + if (listen_menu_item) { + Menu* m = build_possible_listener_menu(); + if (m && !m->items().empty()) { + listen_menu_item->set_submenu (*m); + listen_menu_item->set_sensitive (true); + } else { + /* stupid gtkmm: we need to pass a null reference here */ + gtk_menu_item_set_submenu (listen_menu_item->gobj(), 0); + listen_menu_item->set_sensitive (false); + } + } + + Gtk::MenuItem* remove_listen_menu_item = dynamic_cast(ActionManager::get_widget("/ProcessorMenu/removelisten")); + + if (remove_listen_menu_item) { + Menu* m = build_possible_remove_listener_menu(); + if (m && !m->items().empty()) { + remove_listen_menu_item->set_submenu (*m); + remove_listen_menu_item->set_sensitive (true); + } else { + /* stupid gtkmm: we need to pass a null reference here */ + gtk_menu_item_set_submenu (remove_listen_menu_item->gobj(), 0); + remove_listen_menu_item->set_sensitive (false); + } + } + + ActionManager::get_action (X_("ProcessorMenu"), "newinsert")->set_sensitive (!_route->is_monitor () && !_route->is_foldbackbus ()); + ActionManager::get_action (X_("ProcessorMenu"), "newsend")->set_sensitive (!_route->is_monitor () && !_route->is_foldbackbus ()); ProcessorEntry* single_selection = 0; if (processor_display.selection().size() == 1) { @@ -2193,7 +2238,6 @@ ProcessorBox::show_processor_menu (int arg) /* Sensitise actions as approprioate */ - const bool sensitive = !processor_display.selection().empty() && ! stub_processor_selected (); paste_action->set_sensitive (!_p_selection.processors.empty()); @@ -2211,6 +2255,11 @@ ProcessorBox::show_processor_menu (int arg) } manage_pins_action->set_sensitive (pi != 0); + if (boost::dynamic_pointer_cast(_route)) { + disk_io_action->set_sensitive (true); + } else { + disk_io_action->set_sensitive (false); + } /* allow editing with an Ardour-generated UI for plugin inserts with editors */ edit_action->set_sensitive (pi && pi->plugin()->has_editor ()); @@ -2229,10 +2278,6 @@ ProcessorBox::show_processor_menu (int arg) int x, y; processor_display.get_pointer (x, y); _placement = processor_display.add_placeholder (y); - - if (_visible_prefader_processors == 0 && _placement > 0) { - --_placement; - } } bool @@ -2379,18 +2424,17 @@ ProcessorBox::processor_button_press_event (GdkEventButton *ev, ProcessorEntry* if (processor && (Keyboard::is_edit_event (ev) || (ev->button == 1 && ev->type == GDK_2BUTTON_PRESS))) { - if (_session->engine().connected()) { - /* XXX giving an error message here is hard, because we may be in the midst of a button press */ - - if (!one_processor_can_be_edited ()) { - return true; - } + if (!one_processor_can_be_edited ()) { + return true; + } + if (!ARDOUR_UI_UTILS::engine_is_running ()) { + return true; + } - if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) { - generic_edit_processor (processor); - } else { - edit_processor (processor); - } + if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) { + generic_edit_processor (processor); + } else { + edit_processor (processor); } ret = true; @@ -2483,16 +2527,27 @@ ProcessorBox::use_plugins (const SelectedPlugins& plugins) return true; // XXX SHAREDPTR delete plugin here .. do we even need to care? } else if (plugins.size() == 1 && UIConfiguration::instance().get_open_gui_after_adding_plugin()) { - if (boost::dynamic_pointer_cast(processor)->plugin()->has_inline_display() && UIConfiguration::instance().get_prefer_inline_over_gui()) { - ; - } else if (_session->engine().connected () && processor_can_be_edited (processor)) { - if ((*p)->has_editor ()) { + if (processor->what_can_be_automated ().size () == 0) { + ; /* plugin without controls, don't show ui */ + } + else if (boost::dynamic_pointer_cast(processor)->plugin()->has_inline_display() && UIConfiguration::instance().get_prefer_inline_over_gui()) { + ; /* only show inline display */ + } + else if (processor_can_be_edited (processor)) { + if (!ARDOUR_UI_UTILS::engine_is_running()) { + return true; + } else if ((*p)->has_editor ()) { edit_processor (processor); } else if (boost::dynamic_pointer_cast(processor)->plugin()->parameter_count() > 0) { generic_edit_processor (processor); } } } + /* add next processor below the currently added. + * Note: placement < 0: add the bottom */ + if (_placement >= 0) { + ++_placement; + } } return false; @@ -2664,7 +2719,29 @@ ProcessorBox::choose_aux (boost::weak_ptr wr) return; } - _session->add_internal_send (target, _placement, _route); + if (target->is_foldbackbus ()) { + _route->add_foldback_send (target); + } else { + _session->add_internal_send (target, _placement, _route); + } +} + +void +ProcessorBox::remove_aux (boost::weak_ptr wr) +{ + if (!_route) { + return; + } + + boost::shared_ptr target = wr.lock(); + + if (!target) { + return; + } + boost::shared_ptr send = _route->internal_send_for (target); + boost::shared_ptr proc = boost::dynamic_pointer_cast (send); + _route->remove_processor (proc); + } void @@ -2682,7 +2759,6 @@ void ProcessorBox::redisplay_processors () { ENSURE_GUI_THREAD (*this, &ProcessorBox::redisplay_processors); - bool fader_seen; if (no_processor_redisplay) { return; @@ -2690,12 +2766,6 @@ ProcessorBox::redisplay_processors () processor_display.clear (); - _visible_prefader_processors = 0; - fader_seen = false; - - _route->foreach_processor (sigc::bind (sigc::mem_fun (*this, &ProcessorBox::help_count_visible_prefader_processors), - &_visible_prefader_processors, &fader_seen)); - _route->foreach_processor (sigc::mem_fun (*this, &ProcessorBox::add_processor_to_display)); _route->foreach_processor (sigc::mem_fun (*this, &ProcessorBox::maybe_add_processor_to_ui_list)); _route->foreach_processor (sigc::mem_fun (*this, &ProcessorBox::maybe_add_processor_pin_mgr)); @@ -2717,27 +2787,34 @@ ProcessorBox::maybe_add_processor_to_ui_list (boost::weak_ptr w) return; } - /* not on the list; add it */ + /* see also ProcessorBox::get_editor_window */ + bool have_ui = false; - string loc; -#if 0 // is this still needed? Why? - if (_parent_strip) { - if (_parent_strip->mixer_owned()) { - loc = X_("M"); - } else { - loc = X_("R"); + if (boost::dynamic_pointer_cast (p)) { + have_ui = true; + } + else if (boost::dynamic_pointer_cast (p)) { + have_ui = true; + } + else if (boost::dynamic_pointer_cast (p)) { + if (!boost::dynamic_pointer_cast (p)) { + have_ui = true; + } + } + else if (boost::dynamic_pointer_cast (p)) { + if (!boost::dynamic_pointer_cast (p)) { + have_ui = true; } - } else { - loc = X_("P"); } -#else - loc = X_("P"); -#endif + + if (!have_ui) { + return; + } ProcessorWindowProxy* wp = new ProcessorWindowProxy ( - string_compose ("%1-%2-%3", loc, _route->id(), p->id()), - this, - w); + string_compose ("P-%1-%2", _route->id(), p->id()), + this, + w); const XMLNode* ui_xml = _session->extra_xml (X_("UI")); @@ -2745,12 +2822,6 @@ ProcessorBox::maybe_add_processor_to_ui_list (boost::weak_ptr w) wp->set_state (*ui_xml, 0); } - void* existing_ui = p->get_ui (); - - if (existing_ui) { - wp->use_window (*(reinterpret_cast(existing_ui))); - } - p->set_window_proxy (wp); WM::Manager::instance().register_window (wp); } @@ -2762,9 +2833,12 @@ ProcessorBox::maybe_add_processor_pin_mgr (boost::weak_ptr w) if (!p || p->pinmgr_proxy ()) { return; } + if (!boost::dynamic_pointer_cast (p)) { + return; + } PluginPinWindowProxy* wp = new PluginPinWindowProxy ( - string_compose ("PM-%2-%3", _route->id(), p->id()), w); + string_compose ("PM-%1-%2", _route->id(), p->id()), w); wp->set_session (_session); const XMLNode* ui_xml = _session->extra_xml (X_("UI")); @@ -2775,28 +2849,6 @@ ProcessorBox::maybe_add_processor_pin_mgr (boost::weak_ptr w) p->set_pingmgr_proxy (wp); WM::Manager::instance().register_window (wp); } -void -ProcessorBox::help_count_visible_prefader_processors (boost::weak_ptr p, uint32_t* cnt, bool* amp_seen) -{ - boost::shared_ptr processor (p.lock ()); - - if (processor && ( processor->display_to_user() -#ifndef NDEBUG - || show_all_processors -#endif - ) - ) { - - if (boost::dynamic_pointer_cast(processor) && - boost::dynamic_pointer_cast(processor)->gain_control()->parameter().type() == GainAutomation) { - *amp_seen = true; - } else { - if (!*amp_seen) { - (*cnt)++; - } - } - } -} void ProcessorBox::add_processor_to_display (boost::weak_ptr p) @@ -3255,7 +3307,7 @@ ProcessorBox::idle_delete_processor (boost::weak_ptr weak_processor) void ProcessorBox::rename_processor (boost::shared_ptr processor) { - ArdourPrompter name_prompter (true); + Prompter name_prompter (true); string result; name_prompter.set_title (_("Rename Processor")); name_prompter.set_prompt (_("New name:")); @@ -3270,26 +3322,26 @@ ProcessorBox::rename_processor (boost::shared_ptr processor) name_prompter.get_result (result); if (result.length()) { - int tries = 0; - string test = result; - - while (tries < 100) { - if (_session->io_name_is_legal (test)) { - result = test; - break; - } - tries++; - - test = string_compose ("%1-%2", result, tries); - } - - if (tries < 100) { - processor->set_name (result); - } else { - /* unlikely! */ - ARDOUR_UI::instance()->popup_error - (string_compose (_("At least 100 IO objects exist with a name like %1 - name not changed"), result)); - } + int tries = 0; + string test = result; + + while (tries < 100) { + if (_session->io_name_is_legal (test)) { + result = test; + break; + } + tries++; + + test = string_compose ("%1-%2", result, tries); + } + + if (tries < 100) { + processor->set_name (result); + } else { + /* unlikely! */ + ARDOUR_UI::instance()->popup_error + (string_compose (_("At least 100 IO objects exist with a name like %1 - name not changed"), result)); + } } break; } @@ -3362,10 +3414,10 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr IOProcessor::prepare_for_reset (n, s->name()); - if (s->set_state (n, Stateful::loading_state_version)) { - delete s; - return; - } + if (s->set_state (n, Stateful::loading_state_version)) { + delete s; + return; + } p.reset (s); @@ -3378,24 +3430,24 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr IOProcessor::prepare_for_reset (n, s->name()); - if (s->set_state (n, Stateful::loading_state_version)) { - delete s; - return; - } + if (s->set_state (n, Stateful::loading_state_version)) { + delete s; + return; + } p.reset (s); } else if (type->value() == "return") { XMLNode n (**niter); - Return* r = new Return (*_session); + Return* r = new Return (*_session); IOProcessor::prepare_for_reset (n, r->name()); - if (r->set_state (n, Stateful::loading_state_version)) { - delete r; - return; - } + if (r->set_state (n, Stateful::loading_state_version)) { + delete r; + return; + } p.reset (r); @@ -3429,7 +3481,7 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr * We really would want Stateful::ForceIDRegeneration here :( */ XMLNode state (**niter); - state.remove_nodes ("Processor"); + state.remove_nodes_and_delete ("Processor"); p->set_state (state, Stateful::current_state_version); boost::dynamic_pointer_cast(p)->update_id (id); @@ -3461,7 +3513,7 @@ could not match the configuration of this track."); void ProcessorBox::get_selected_processors (ProcSelection& processors) const { - const list selection = processor_display.selection (); + const list selection = processor_display.selection (true); for (list::const_iterator i = selection.begin(); i != selection.end(); ++i) { processors.push_back ((*i)->processor ()); } @@ -3489,6 +3541,14 @@ ProcessorBox::ab_plugins () ab_direction = !ab_direction; } +void +ProcessorBox::set_disk_io_position (DiskIOPoint diop) +{ + boost::shared_ptr t = boost::dynamic_pointer_cast (_route); + if (t) { + t->set_disk_io_point (diop); + } +} void ProcessorBox::clear_processors () @@ -3502,7 +3562,7 @@ ProcessorBox::clear_processors () choices.push_back (_("Cancel")); choices.push_back (_("Yes, remove them all")); - Gtkmm2ext::Choice prompter (_("Remove processors"), prompt, choices); + ArdourWidgets::Choice prompter (_("Remove processors"), prompt, choices); if (prompter.run () == 1) { _route->clear_processors (PreFader); @@ -3527,7 +3587,7 @@ ProcessorBox::clear_processors (Placement p) choices.push_back (_("Cancel")); choices.push_back (_("Yes, remove them all")); - Gtkmm2ext::Choice prompter (_("Remove processors"), prompt, choices); + ArdourWidgets::Choice prompter (_("Remove processors"), prompt, choices); if (prompter.run () == 1) { _route->clear_processors (p); @@ -3603,7 +3663,7 @@ ProcessorBox::get_editor_window (boost::shared_ptr processor, bool us } else if ((send = boost::dynamic_pointer_cast (processor)) != 0) { - if (!_session->engine().connected()) { + if (!ARDOUR_UI_UTILS::engine_is_running ()) { return 0; } @@ -3619,7 +3679,7 @@ ProcessorBox::get_editor_window (boost::shared_ptr processor, bool us return 0; } - if (!_session->engine().connected()) { + if (!ARDOUR_UI_UTILS::engine_is_running ()) { return 0; } @@ -3661,9 +3721,7 @@ ProcessorBox::get_editor_window (boost::shared_ptr processor, bool us } else if ((port_insert = boost::dynamic_pointer_cast (processor)) != 0) { - if (!_session->engine().connected()) { - MessageDialog msg ( _("Not connected to audio engine - no I/O changes are possible")); - msg.run (); + if (!ARDOUR_UI_UTILS::engine_is_running ()) { return 0; } @@ -3720,6 +3778,8 @@ ProcessorBox::register_actions () ActionManager::engine_sensitive_actions.push_back (act); myactions.register_action (processor_box_actions, X_("newaux"), _("New Aux Send ...")); + myactions.register_action (processor_box_actions, X_("newlisten"), _("New Monitor Send ...")); + myactions.register_action (processor_box_actions, X_("removelisten"), _("Remove Monitor Send ...")); myactions.register_action (processor_box_actions, X_("controls"), _("Controls")); myactions.register_action (processor_box_actions, X_("send_options"), _("Send Options")); @@ -3769,6 +3829,12 @@ ProcessorBox::register_actions () processor_box_actions, X_("manage-pins"), _("Pin Connections..."), sigc::ptr_fun (ProcessorBox::rb_manage_pins)); + /* Disk IO stuff */ + disk_io_action = myactions.register_action (processor_box_actions, X_("disk-io-menu"), _("Disk I/O ...")); + myactions.register_action (processor_box_actions, X_("disk-io-prefader"), _("Pre-Fader."), sigc::bind (sigc::ptr_fun (ProcessorBox::rb_set_disk_io_position), DiskIOPreFader)); + myactions.register_action (processor_box_actions, X_("disk-io-postfader"), _("Post-Fader."), sigc::bind (sigc::ptr_fun (ProcessorBox::rb_set_disk_io_position), DiskIOPostFader)); + myactions.register_action (processor_box_actions, X_("disk-io-custom"), _("Custom."), sigc::bind (sigc::ptr_fun (ProcessorBox::rb_set_disk_io_position), DiskIOCustom)); + /* show editors */ edit_action = myactions.register_action ( processor_box_actions, X_("edit"), _("Edit..."), @@ -3801,6 +3867,16 @@ ProcessorBox::rb_ab_plugins () _current_processor_box->ab_plugins (); } +void +ProcessorBox::rb_set_disk_io_position (DiskIOPoint diop) +{ + if (_current_processor_box == 0) { + return; + } + + _current_processor_box->set_disk_io_position (diop); +} + void ProcessorBox::rb_manage_pins () { @@ -3847,6 +3923,16 @@ ProcessorBox::rb_choose_aux (boost::weak_ptr wr) _current_processor_box->choose_aux (wr); } +void +ProcessorBox::rb_remove_aux (boost::weak_ptr wr) +{ + if (_current_processor_box == 0) { + return; + } + + _current_processor_box->remove_aux (wr); +} + void ProcessorBox::rb_clear () { @@ -4003,7 +4089,7 @@ ProcessorBox::edit_processor (boost::shared_ptr processor) if (edit_aux_send (processor)) { return; } - if (!_session->engine().connected()) { + if (!ARDOUR_UI_UTILS::engine_is_running ()) { return; } @@ -4024,7 +4110,7 @@ ProcessorBox::generic_edit_processor (boost::shared_ptr processor) if (edit_aux_send (processor)) { return; } - if (!_session->engine().connected()) { + if (!ARDOUR_UI_UTILS::engine_is_running ()) { return; } @@ -4134,7 +4220,6 @@ void ProcessorBox::set_processor_ui (boost::shared_ptr p, Gtk::Window* w) { assert (p->window_proxy()); - p->set_ui (w); p->window_proxy()->use_window (*w); } @@ -4216,14 +4301,18 @@ ProcessorWindowProxy::ProcessorWindowProxy (string const & name, ProcessorBox* b : WM::ProxyBase (name, string()) , _processor_box (box) , _processor (processor) - , is_custom (false) - , want_custom (false) + , is_custom (true) + , want_custom (true) { boost::shared_ptr p = _processor.lock (); if (!p) { return; } p->DropReferences.connect (going_away_connection, MISSING_INVALIDATOR, boost::bind (&ProcessorWindowProxy::processor_going_away, this), gui_context()); + + p->ToggleUI.connect (gui_connections, invalidator (*this), boost::bind (&ProcessorWindowProxy::show_the_right_window, this, false), gui_context()); + p->ShowUI.connect (gui_connections, invalidator (*this), boost::bind (&ProcessorWindowProxy::show_the_right_window, this, true), gui_context()); + p->HideUI.connect (gui_connections, invalidator (*this), boost::bind (&ProcessorWindowProxy::hide, this), gui_context()); } ProcessorWindowProxy::~ProcessorWindowProxy() @@ -4238,6 +4327,7 @@ ProcessorWindowProxy::~ProcessorWindowProxy() void ProcessorWindowProxy::processor_going_away () { + gui_connections.drop_connections (); delete _window; _window = 0; WM::Manager::instance().remove (this); @@ -4315,13 +4405,16 @@ ProcessorWindowProxy::get (bool create) } void -ProcessorWindowProxy::show_the_right_window () +ProcessorWindowProxy::show_the_right_window (bool show_not_toggle) { if (_window && (is_custom != want_custom)) { /* drop existing window - wrong type */ set_state_mask (Gtkmm2ext::WindowProxy::StateMask (state_mask () & ~WindowProxy::Size)); drop_window (); } + if (_window && fully_visible () && show_not_toggle) { + return; + } toggle (); }