X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fprocessor_box.cc;h=34bcbf28b5fe550b38f72da8e3d4c4d52b58e915;hb=24d5f1a6249b08a8b21854ecf001be7e07e5bf23;hp=97c9024766e77716c6db6d0714cb3535168f442a;hpb=ccbf56827dbba83d1364c4b888945059aaa7b1c0;p=ardour.git diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index 97c9024766..34bcbf28b5 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -27,7 +27,6 @@ #include -#include "pbd/convert.h" #include "canvas/utils.h" #include @@ -77,16 +76,16 @@ #include "plugin_ui.h" #include "port_insert_ui.h" #include "processor_box.h" +#include "processor_selection.h" #include "public_editor.h" #include "return_ui.h" -#include "route_processor_selection.h" #include "script_selector.h" #include "send_ui.h" #include "timers.h" #include "tooltips.h" #include "new_plugin_preset_dialog.h" -#include "i18n.h" +#include "pbd/i18n.h" #ifdef AUDIOUNIT_SUPPORT class AUPluginUI; @@ -109,6 +108,7 @@ RefPtr ProcessorBox::cut_action; RefPtr ProcessorBox::copy_action; RefPtr ProcessorBox::rename_action; RefPtr ProcessorBox::delete_action; +RefPtr ProcessorBox::backspace_action; RefPtr ProcessorBox::manage_pins_action; RefPtr ProcessorBox::edit_action; RefPtr ProcessorBox::edit_generic_action; @@ -168,7 +168,7 @@ ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr pi = boost::dynamic_pointer_cast (_processor); - if (pi && pi->plugin() && pi->plugin()->get_info()->type != ARDOUR::Lua) { + if (pi && pi->plugin()) { _plugin_preset_pointer = PluginPresetPtr (new PluginPreset (pi->plugin()->get_info())); } } @@ -181,11 +181,11 @@ 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 (pi->plugin(), + _plugin_display = new PluginDisplay (*this, pi->plugin(), std::max (60.f, rintf(112.f * UIConfiguration::instance().get_ui_scale()))); } else { assert (boost::dynamic_pointer_cast(pi->plugin())); - _plugin_display = new LuaPluginDisplay (boost::dynamic_pointer_cast(pi->plugin()), + _plugin_display = new LuaPluginDisplay (*this, boost::dynamic_pointer_cast(pi->plugin()), std::max (60.f, rintf(112.f * UIConfiguration::instance().get_ui_scale()))); } _vbox.pack_start (*_plugin_display); @@ -197,7 +197,7 @@ ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptractive()); + _button.set_active (_processor->enabled ()); input_icon.set_no_show_all(true); routing_icon.set_no_show_all(true); @@ -389,6 +389,14 @@ ProcessorEntry::setup_visuals () } } + boost::shared_ptr aux; + if ((aux = boost::dynamic_pointer_cast (_processor))) { + if (aux->allow_feedback ()) { + _button.set_name ("processor auxfeedback"); + return; + } + } + switch (_position) { case PreFader: if (_plugin_display) { _plugin_display->set_name ("processor prefader"); } @@ -439,11 +447,11 @@ ProcessorEntry::led_clicked(GdkEventButton *ev) _parent->all_visible_processors_active(false); if (_position == Fader) { - _processor->deactivate (); + _processor->enable (false); } } else { - _processor->deactivate (); + _processor->enable (false); } } else { @@ -451,11 +459,11 @@ ProcessorEntry::led_clicked(GdkEventButton *ev) _parent->all_visible_processors_active(true); if (_position == Fader) { - _processor->activate (); + _processor->enable (true); } } else { - _processor->activate (); + _processor->enable (true); } } } @@ -465,7 +473,7 @@ void ProcessorEntry::processor_active_changed () { if (_processor) { - _button.set_active (_processor->active()); + _button.set_active (_processor->enabled ()); } } @@ -496,12 +504,18 @@ ProcessorEntry::setup_tooltip () if (pi) { std::string postfix = ""; uint32_t replicated; + + if (pi->plugin()->has_inline_display()) { + postfix += string_compose(_("\n%1+double-click to toggle inline-display"), Keyboard::tertiary_modifier_name ()); + } + if ((replicated = pi->get_count()) > 1) { - postfix = string_compose(_("\nThis mono plugin has been replicated %1 times."), replicated); + postfix += string_compose(_("\nThis mono plugin has been replicated %1 times."), replicated); } + if (pi->plugin()->has_editor()) { ARDOUR_UI_UTILS::set_tooltip (_button, - string_compose (_("%1\nDouble-click to show GUI.\n%2+double-click to show generic GUI.%3"), name (Wide), Keyboard::primary_modifier_name (), postfix)); + 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, string_compose (_("%1\nDouble-click to show generic GUI.%2"), name (Wide), postfix)); @@ -513,8 +527,14 @@ ProcessorEntry::setup_tooltip () string_compose (_("%1\nThe Plugin is not available on this system\nand has been replaced by a stub."), name (Wide))); return; } - if (boost::dynamic_pointer_cast (_processor) && !boost::dynamic_pointer_cast(_processor)) { - ARDOUR_UI_UTILS::set_tooltip (_button, string_compose ("> %1", _processor->name())); + boost::shared_ptr send; + 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())); + } else { + ARDOUR_UI_UTILS::set_tooltip (_button, string_compose ("> %1", _processor->name())); + } return; } } @@ -636,8 +656,8 @@ ProcessorEntry::add_control_state (XMLNode* node) const if (_plugin_display) { XMLNode* c = new XMLNode (X_("Object")); - c->add_property (X_("id"), X_("InlineDisplay")); - c->add_property (X_("visible"), _plugin_display->is_visible ()); + c->set_property (X_("id"), X_("InlineDisplay")); + c->set_property (X_("visible"), _plugin_display->is_visible ()); node->add_child_nocopy (*c); } } @@ -651,12 +671,14 @@ ProcessorEntry::set_control_state (XMLNode const * node) if (_plugin_display) { XMLNode* n = GUIObjectState::get_node (node, X_("InlineDisplay")); - XMLProperty* p = n ? n->property (X_("visible")) : NULL; - if (p) { - if (string_is_affirmative (p->value ())) { - _plugin_display->show(); + if (!n) return; + + bool visible; + if (n->get_property (X_("visible"), visible)) { + if (visible) { + _plugin_display->show (); } else { - _plugin_display->hide(); + _plugin_display->hide (); } } } @@ -739,14 +761,22 @@ ProcessorEntry::build_send_options_menu () Menu* menu = manage (new Menu); MenuList& items = menu->items (); - boost::shared_ptr send = boost::dynamic_pointer_cast (_processor); - if (send) { + if (!ARDOUR::Profile->get_mixbus()) { + boost::shared_ptr send = boost::dynamic_pointer_cast (_processor); + if (send) { + items.push_back (CheckMenuElem (_("Link panner controls"))); + Gtk::CheckMenuItem* c = dynamic_cast (&items.back ()); + c->set_active (send->panner_shell()->is_linked_to_route()); + c->signal_toggled().connect (sigc::mem_fun (*this, &ProcessorEntry::toggle_panner_link)); + } + } - items.push_back (CheckMenuElem (_("Link panner controls"))); + boost::shared_ptr aux = boost::dynamic_pointer_cast (_processor); + if (aux) { + items.push_back (CheckMenuElem (_("Allow Feedback Loop"))); Gtk::CheckMenuItem* c = dynamic_cast (&items.back ()); - c->set_active (send->panner_shell()->is_linked_to_route()); - c->signal_toggled().connect (sigc::mem_fun (*this, &ProcessorEntry::toggle_panner_link)); - + c->set_active (aux->allow_feedback()); + c->signal_toggled().connect (sigc::mem_fun (*this, &ProcessorEntry::toggle_allow_feedback)); } return menu; } @@ -760,6 +790,15 @@ ProcessorEntry::toggle_panner_link () } } +void +ProcessorEntry::toggle_allow_feedback () +{ + boost::shared_ptr aux = boost::dynamic_pointer_cast (_processor); + if (aux) { + aux->set_allow_feedback (!aux->allow_feedback ()); + } +} + ProcessorEntry::Control::Control (boost::shared_ptr c, string const & n) : _control (c) , _adjustment (gain_to_slider_position_with_max (1.0, Config->get_max_gain()), 0, 1, 0.01, 0.1) @@ -931,8 +970,8 @@ void ProcessorEntry::Control::add_state (XMLNode* node) const { XMLNode* c = new XMLNode (X_("Object")); - c->add_property (X_("id"), state_id ()); - c->add_property (X_("visible"), _visible); + c->set_property (X_("id"), state_id ()); + c->set_property (X_("visible"), _visible); node->add_child_nocopy (*c); } @@ -941,8 +980,10 @@ ProcessorEntry::Control::set_state (XMLNode const * node) { XMLNode* n = GUIObjectState::get_node (node, state_id ()); if (n) { - XMLProperty* p = n->property (X_("visible")); - set_visible (p && string_is_affirmative (p->value ())); + bool visible; + if (n->get_property (X_("visible"), visible)) { + set_visible (visible); + } } else { set_visible (false); } @@ -1034,17 +1075,10 @@ ProcessorEntry::PortIcon::on_expose_event (GdkEventExpose* ev) cairo_fill (cr); const double dx = rint(max(2., 2. * UIConfiguration::instance().get_ui_scale())); - if (_ports.n_total() > 1) { - for (uint32_t i = 0; i < _ports.n_total(); ++i) { - set_routing_color (cr, i < _ports.n_midi()); - const float x = rintf(width * (.2f + .6f * i / (_ports.n_total() - 1.f))); - cairo_rectangle (cr, x-dx * .5, 0, 1+dx, height); - cairo_fill(cr); - } - } else if (_ports.n_total() == 1) { - set_routing_color (cr, _ports.n_midi() == 1); - const float x = rintf(width * .5); - cairo_rectangle (cr, x-dx * .5, 0, 1+dx, height); + for (uint32_t i = 0; i < _ports.n_total(); ++i) { + set_routing_color (cr, i < _ports.n_midi()); + const double x = ProcessorEntry::RoutingIcon::pin_x_pos (i, width, _ports.n_total(), 0 , false); + cairo_rectangle (cr, x - .5 - dx * .5, 0, 1 + dx, height); cairo_fill(cr); } @@ -1125,6 +1159,9 @@ ProcessorEntry::RoutingIcon::can_coalesce () const { if (_fed_by && _f_out != _f_sources) { return false; } + if (_fed_by && !_f_out_map.is_identity () && !_in_map.is_identity ()) { + return false; + } if (_input && _sinks == _in && (!_fed_by || _f_out == _in)) { return true; } @@ -1167,7 +1204,7 @@ ProcessorEntry::RoutingIcon::pin_x_pos (uint32_t i, double width, uint32_t n_tot assert (i == 0); return rint (width * .5) +.5; } - return rint (width * (.2 + .6 * i / (n_total - 1))) + .5; + return rint (width * (.15 + .7 * i / (n_total - 1))) + .5; } void @@ -1210,47 +1247,29 @@ ProcessorEntry::RoutingIcon::draw_sidechain (cairo_t* cr, double x0, double y0, void ProcessorEntry::RoutingIcon::draw_thru_src (cairo_t* cr, double x0, double y0, double height, bool midi) { - const double dx = 1 + rint (max(2., 2. * UIConfiguration::instance().get_ui_scale())); - const double y1 = rint (height * .5) + .5; - - cairo_save (cr); - cairo_translate (cr, x0, y0); - cairo_move_to (cr, 0 - dx - .5, y1); - cairo_line_to (cr, 0 + dx + .5, y1 - 2); - - cairo_move_to (cr, 0 - dx - .5, y1 + 2); - cairo_line_to (cr, 0 + dx + .5, y1); - - cairo_move_to (cr, 0, y1 + 1); - cairo_line_to (cr, 0, height); + const double rad = 1; + const double y1 = height - rad - 1.5; + cairo_arc (cr, x0, y0 + y1, rad, 0, 2. * M_PI); + cairo_move_to (cr, x0, y0 + height - 1.5); + cairo_line_to (cr, x0, y0 + height); set_routing_color (cr, midi); cairo_set_line_width (cr, 1.0); cairo_stroke (cr); - cairo_restore (cr); } void ProcessorEntry::RoutingIcon::draw_thru_sink (cairo_t* cr, double x0, double y0, double height, bool midi) { - const double dx = 1 + rint (max(2., 2. * UIConfiguration::instance().get_ui_scale())); - const double y1 = rint (height * .5) - .5; - - cairo_save (cr); - cairo_translate (cr, x0, y0); - cairo_move_to (cr, 0 - dx - .5, y1); - cairo_line_to (cr, 0 + dx + .5, y1 - 2); - - cairo_move_to (cr, 0 - dx - .5, y1 + 2); - cairo_line_to (cr, 0 + dx + .5, y1); - - cairo_move_to (cr, 0, y1 - 1); - cairo_line_to (cr, 0, 0); + const double rad = 1; + const double y1 = rad + 1; + cairo_arc (cr, x0, y0 + y1, rad, 0, 2. * M_PI); + cairo_move_to (cr, x0, y0); + cairo_line_to (cr, x0, y0 + 1); set_routing_color (cr, midi); cairo_set_line_width (cr, 1.0); cairo_stroke (cr); - cairo_restore (cr); } void @@ -1440,7 +1459,9 @@ ProcessorEntry::RoutingIcon::expose_output_map (cairo_t* cr, const double width, _i_in_map.get_src (dt, idx, &valid_sink); _i_thru_map.get_src (dt, idx, &valid_thru); if (!valid_thru && !valid_sink) { - continue; + if (!is_midi || i != 0) { // special case midi-bypass + continue; + } } } double c_x0 = pin_x_pos (i, width, pc_out, 0, false); @@ -1455,29 +1476,36 @@ ProcessorEntry::RoutingIcon::expose_output_map (cairo_t* cr, const double width, double x = pin_x_pos (i, width, n_out, 0, is_midi); if (!_terminal) { - // only check thru (gnd is part of input) - bool valid_thru; - uint32_t idx = _thru_map.get (dt, pn, &valid_thru); - if (!valid_thru) { - continue; - } - - // skip connections that are not used in the next's input :( + bool valid_thru_f = false; + // skip connections that are not used in the next's input if (_feeding) { bool valid_sink; _i_in_map.get_src (dt, pn, &valid_sink); - _i_thru_map.get_src (dt, pn, &valid_thru); - if (!valid_thru && !valid_sink) { - continue; + _i_thru_map.get_src (dt, pn, &valid_thru_f); + if (!valid_thru_f && !valid_sink) { + if (!is_midi || i != 0) { // special case midi-bypass + continue; + } } } - if (idx >= _in.get (dt)) { - draw_sidechain (cr, x, 0, ht, is_midi); - } else { - draw_thru_src (cr, x, 0, ht, is_midi); + bool valid_src; + _out_map.get_src (dt, pn, &valid_src); + if (!valid_src) { + bool valid_thru; + uint32_t idx = _thru_map.get (dt, pn, &valid_thru); + if (valid_thru) { + if (idx >= _in.get (dt)) { + draw_sidechain (cr, x, 0, height, is_midi); + } else { + draw_thru_src (cr, x, 0, height, is_midi); + } + } else if (valid_thru_f){ + // gnd is part of input, unless it's a thru input + // (also only true if !coalesced into one small display) + draw_gnd (cr, x, 0, height, is_midi); + } } - } else { // terminal node, add arrows bool valid_src; @@ -1514,16 +1542,29 @@ ProcessorEntry::RoutingIcon::expose_output_map (cairo_t* cr, const double width, } } -ProcessorEntry::PluginDisplay::PluginDisplay (boost::shared_ptr p, uint32_t max_height) - : _plug (p) +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) , _scroll (false) { 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, + 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, + string_compose (_("%1\nDouble-click to show generic GUI.%2"), e.name (Wide), postfix)); + } } ProcessorEntry::PluginDisplay::~PluginDisplay () @@ -1533,8 +1574,42 @@ ProcessorEntry::PluginDisplay::~PluginDisplay () } } +bool +ProcessorEntry::PluginDisplay::on_button_press_event (GdkEventButton *ev) +{ + assert (_entry.processor ()); + + boost::shared_ptr pi = boost::dynamic_pointer_cast (_entry.processor()); + // duplicated code :( + // consider some tweaks to pass this up to the DnDVBox somehow: + // select processor, then call (private) + //_entry._parent->processor_button_press_event (ev, &_entry); + if (pi && pi->plugin() && pi->plugin()->has_inline_display() + && Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier) + && ev->button == 1 + && ev->type == GDK_2BUTTON_PRESS) { + _entry.toggle_inline_display_visibility (); + return true; + } + else if (Keyboard::is_edit_event (ev) || (ev->button == 1 && ev->type == GDK_2BUTTON_PRESS)) { + if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) { + _entry._parent->generic_edit_processor (_entry.processor ()); + } else { + _entry._parent->edit_processor (_entry.processor ()); + } + return true; + } + return false; +} + +bool +ProcessorEntry::PluginDisplay::on_button_release_event (GdkEventButton *ev) +{ + return false; +} + void -ProcessorEntry::PluginDisplay::on_size_request (Gtk::Requisition* req) +ProcessorEntry::PluginDisplay::on_size_request (Requisition* req) { req->width = 56; req->height = _cur_height; @@ -1608,6 +1683,7 @@ ProcessorEntry::PluginDisplay::render_inline (cairo_t* cr, uint32_t width) } } + 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); @@ -1667,8 +1743,8 @@ ProcessorEntry::PluginDisplay::on_expose_event (GdkEventExpose* ev) return true; } -ProcessorEntry::LuaPluginDisplay::LuaPluginDisplay (boost::shared_ptr p, uint32_t max_height) - : PluginDisplay (p, max_height) +ProcessorEntry::LuaPluginDisplay::LuaPluginDisplay (ProcessorEntry& e, boost::shared_ptr p, uint32_t max_height) + : PluginDisplay (e, p, max_height) , _luaproc (p) , _lua_render_inline (0) { @@ -1692,12 +1768,15 @@ ProcessorEntry::LuaPluginDisplay::render_inline (cairo_t *cr, uint32_t width) Cairo::Context ctx (cr); try { luabridge::LuaRef rv = (*_lua_render_inline)((Cairo::Context *)&ctx, width, _max_height); + lua_gui.collect_garbage_step (); if (rv.isTable ()) { uint32_t h = rv[2]; return h; } } catch (luabridge::LuaException const& e) { - ; +#ifndef NDEBUG + cerr << "LuaException:" << e.what () << endl; +#endif } return 0; } @@ -1708,7 +1787,7 @@ static std::list drop_targets() std::list tmp; tmp.push_back (Gtk::TargetEntry ("processor")); // from processor-box to processor-box tmp.push_back (Gtk::TargetEntry ("PluginInfoPtr")); // from plugin-manager - tmp.push_back (Gtk::TargetEntry ("PluginPresetPtr")); // from sidebar + tmp.push_back (Gtk::TargetEntry ("PluginFavoritePtr")); // from sidebar return tmp; } @@ -1728,14 +1807,14 @@ static std::list drag_targets_noplugin() } ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::function get_plugin_selector, - RouteProcessorSelection& rsel, MixerStrip* parent, bool owner_is_mixer) + ProcessorSelection& psel, MixerStrip* parent, bool owner_is_mixer) : _parent_strip (parent) , _owner_is_mixer (owner_is_mixer) , ab_direction (true) , _get_plugin_selector (get_plugin_selector) , _placement (-1) , _visible_prefader_processors (0) - , _rr_selection(rsel) + , _p_selection(psel) , processor_display (drop_targets()) , _redisplay_pending (false) { @@ -1878,7 +1957,7 @@ ProcessorBox::_drop_plugin_preset (Gtk::SelectionData const &data, Route::Proces boost::shared_ptr processor (new PluginInsert (*_session, p)); if (Config->get_new_plugins_active ()) { - processor->activate (); + processor->enable (true); } pl.push_back (processor); } @@ -1901,7 +1980,7 @@ ProcessorBox::_drop_plugin (Gtk::SelectionData const &data, Route::ProcessorList } boost::shared_ptr processor (new PluginInsert (*_session, p)); if (Config->get_new_plugins_active ()) { - processor->activate (); + processor->enable (true); } pl.push_back (processor); } @@ -1920,7 +1999,7 @@ ProcessorBox::plugin_drop (Gtk::SelectionData const &data, ProcessorEntry* posit if (data.get_target() == "PluginInfoPtr") { _drop_plugin (data, pl); } - else if (data.get_target() == "PluginPresetPtr") { + else if (data.get_target() == "PluginFavoritePtr") { _drop_plugin_preset (data, pl); } else { @@ -2099,6 +2178,7 @@ ProcessorBox::show_processor_menu (int arg) } } + Gtk::MenuItem* send_menu_item = dynamic_cast(ActionManager::get_widget("/ProcessorMenu/send_options")); if (send_menu_item) { if (single_selection && !_route->is_monitor()) { @@ -2120,10 +2200,11 @@ ProcessorBox::show_processor_menu (int arg) const bool sensitive = !processor_display.selection().empty() && ! stub_processor_selected (); - paste_action->set_sensitive (!_rr_selection.processors.empty()); + paste_action->set_sensitive (!_p_selection.processors.empty()); cut_action->set_sensitive (sensitive && can_cut ()); copy_action->set_sensitive (sensitive); delete_action->set_sensitive (sensitive || stub_processor_selected ()); + backspace_action->set_sensitive (sensitive || stub_processor_selected ()); edit_action->set_sensitive (one_processor_can_be_edited ()); edit_generic_action->set_sensitive (one_processor_can_be_edited ()); @@ -2246,11 +2327,19 @@ ProcessorBox::processor_operation (ProcessorOperation op) case ProcessorsToggleActive: for (ProcSelection::iterator i = targets.begin(); i != targets.end(); ++i) { - if ((*i)->active()) { - (*i)->deactivate (); - } else { - (*i)->activate (); + if (!(*i)->display_to_user ()) { + assert (0); // these should not be selectable to begin with. + continue; + } + if (!boost::dynamic_pointer_cast (*i)) { + continue; + } +#ifdef MIXBUS + if (boost::dynamic_pointer_cast (*i)->is_channelstrip()) { + continue; } +#endif + (*i)->enable (!(*i)->enabled ()); } break; @@ -2283,6 +2372,15 @@ ProcessorBox::processor_button_press_event (GdkEventButton *ev, ProcessorEntry* int ret = false; bool selected = processor_display.selected (child); + boost::shared_ptr pi = boost::dynamic_pointer_cast (processor); + if (pi && pi->plugin() && pi->plugin()->has_inline_display() + && Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier) + && ev->button == 1 + && ev->type == GDK_2BUTTON_PRESS) { + child->toggle_inline_display_visibility (); + return true; + } + if (processor && (Keyboard::is_edit_event (ev) || (ev->button == 1 && ev->type == GDK_2BUTTON_PRESS))) { if (_session->engine().connected()) { @@ -2342,12 +2440,7 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry ) { /* button2-click with no/appropriate modifiers */ - - if (processor->active()) { - processor->deactivate (); - } else { - processor->activate (); - } + processor->enable (!processor->enabled ()); } return false; @@ -2379,49 +2472,6 @@ ProcessorBox::choose_plugin () _get_plugin_selector()->set_interested_object (*this); } -/** @return true if an error occurred, otherwise false */ -bool -ProcessorBox::choose_lua () -{ - LuaScriptInfoPtr spi; - - ScriptSelector ss (_("Add Lua DSP Processor"), LuaScriptInfo::DSP); - switch (ss.run ()) { - case Gtk::RESPONSE_ACCEPT: - spi = ss.script(); - break; - default: - return true; - } - ss.hide (); - - PluginPtr p; - try { - LuaPluginInfoPtr lpi (new LuaPluginInfo(spi)); - p = (lpi->load (*_session)); - } catch (...) { - string msg = _( - "Failed to instantiate Lua DSP Processor,\n" - "probably because the script is invalid (no dsp function)."); - MessageDialog am (msg); - am.run (); - return true; - } - - boost::shared_ptr processor (new PluginInsert (*_session, p)); - - Route::ProcessorStreams err_streams; - if (_route->add_processor_by_index (processor, _placement, &err_streams, Config->get_new_plugins_active ())) { - string msg = _( - "Failed to add Lua DSP Processor at the given position,\n" - "probably because the I/O configuration of the plugins\n" - "could not match the configuration of this track."); - MessageDialog am (msg); - am.run (); - } - return false; -} - /** @return true if an error occurred, otherwise false */ bool ProcessorBox::use_plugins (const SelectedPlugins& plugins) @@ -2442,7 +2492,7 @@ ProcessorBox::use_plugins (const SelectedPlugins& plugins) } else if (_session->engine().connected () && processor_can_be_edited (processor)) { if ((*p)->has_editor ()) { edit_processor (processor); - } else { + } else if (boost::dynamic_pointer_cast(processor)->plugin()->parameter_count() > 0) { generic_edit_processor (processor); } } @@ -2455,6 +2505,16 @@ ProcessorBox::use_plugins (const SelectedPlugins& plugins) void ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams) { + /* XXX this needs to be re-worked! + * + * With new pin-management "streams" is no longer correct. + * p.get_info () is also incorrect for variable i/o plugins (always -1,-1). + * + * Since pin-management was added, this dialog will only show in a very rare + * condition (non-replicated variable i/o configuration failed). + * + * TODO: simplify the message after the string-freeze is lifted. + */ ArdourDialog dialog (_("Plugin Incompatibility")); Label label; @@ -2508,11 +2568,10 @@ ProcessorBox::choose_insert () void ProcessorBox::choose_send () { - boost::shared_ptr sendpan(new Pannable (*_session)); - boost::shared_ptr send (new Send (*_session, sendpan, _route->mute_master())); + boost::shared_ptr send (new Send (*_session, _route->pannable (), _route->mute_master())); /* make an educated guess at the initial number of outputs for the send */ - ChanCount outs = (_session->master_out()) + ChanCount outs = (_route->n_outputs().n_audio() && _session->master_out()) ? _session->master_out()->n_outputs() : _route->n_outputs(); @@ -2717,12 +2776,6 @@ ProcessorBox::maybe_add_processor_pin_mgr (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_pingmgr_proxy (wp); WM::Manager::instance().register_window (wp); } @@ -2878,7 +2931,7 @@ ProcessorBox::setup_routing_feeds () (*i)->input_icon.set_ports (p->input_streams()); (*i)->output_icon.set_ports (p->output_streams()); ChanMapping inmap (p->input_streams ()); - ChanMapping outmap (p->input_streams ()); + ChanMapping outmap (p->output_streams ()); ChanMapping thrumap; (*i)->routing_icon.set ( p->input_streams(), @@ -2905,6 +2958,7 @@ ProcessorBox::setup_routing_feeds () (*i)->routing_icon.unset_fed_by (); } prev = i; + (*i)->input_icon.hide(); } /* now set which icons need to be displayed */ @@ -2915,8 +2969,6 @@ ProcessorBox::setup_routing_feeds () (*i)->routing_icon.hide(); if (i == children.begin()) { (*i)->input_icon.show(); - } else { - (*i)->input_icon.hide(); } } else { (*i)->routing_icon.show(); @@ -2937,13 +2989,14 @@ ProcessorBox::setup_routing_feeds () } } else { (*i)->output_routing_icon.set_terminal(false); - if (!(*i)->routing_icon.out_identity () - && !(*i)->routing_icon.in_identity () - && (*i)->routing_icon.can_coalesce ()) { + if ( !(*i)->routing_icon.out_identity () + && !(*next)->routing_icon.in_identity () + && (*next)->routing_icon.can_coalesce ()) { (*i)->output_routing_icon.hide(); } else if (!(*i)->routing_icon.out_identity ()) { (*i)->output_routing_icon.show(); (*i)->output_routing_icon.queue_draw(); + (*next)->input_icon.show(); } else { (*i)->output_routing_icon.hide(); } @@ -3112,7 +3165,7 @@ ProcessorBox::cut_processors (const ProcSelection& to_be_removed) return; } - _rr_selection.set (node); + _p_selection.set (node); no_processor_redisplay = false; redisplay_processors (); @@ -3136,7 +3189,7 @@ ProcessorBox::copy_processors (const ProcSelection& to_be_copied) } } - _rr_selection.set (node); + _p_selection.set (node); } void @@ -3251,22 +3304,22 @@ ProcessorBox::rename_processor (boost::shared_ptr processor) void ProcessorBox::paste_processors () { - if (_rr_selection.processors.empty()) { + if (_p_selection.processors.empty()) { return; } - paste_processor_state (_rr_selection.processors.get_node().children(), boost::shared_ptr()); + paste_processor_state (_p_selection.processors.get_node().children(), boost::shared_ptr()); } void ProcessorBox::paste_processors (boost::shared_ptr before) { - if (_rr_selection.processors.empty()) { + if (_p_selection.processors.empty()) { return; } - paste_processor_state (_rr_selection.processors.get_node().children(), before); + paste_processor_state (_p_selection.processors.get_node().children(), before); } void @@ -3663,8 +3716,6 @@ ProcessorBox::register_actions () myactions.register_action (processor_box_actions, X_("newplugin"), _("New Plugin"), sigc::ptr_fun (ProcessorBox::rb_choose_plugin)); - act = myactions.register_action (processor_box_actions, X_("newlua"), _("New Lua DSP"), - sigc::ptr_fun (ProcessorBox::rb_choose_lua)); act = myactions.register_action (processor_box_actions, X_("newinsert"), _("New Insert"), sigc::ptr_fun (ProcessorBox::rb_choose_insert)); ActionManager::engine_sensitive_actions.push_back (act); @@ -3692,10 +3743,13 @@ ProcessorBox::register_actions () sigc::ptr_fun (ProcessorBox::rb_copy)); delete_action = myactions.register_action (processor_box_actions, X_("delete"), _("Delete"), sigc::ptr_fun (ProcessorBox::rb_delete)); + backspace_action = myactions.register_action (processor_box_actions, X_("backspace"), _("Delete"), + sigc::ptr_fun (ProcessorBox::rb_delete)); ActionManager::plugin_selection_sensitive_actions.push_back (cut_action); ActionManager::plugin_selection_sensitive_actions.push_back (copy_action); ActionManager::plugin_selection_sensitive_actions.push_back (delete_action); + ActionManager::plugin_selection_sensitive_actions.push_back (backspace_action); paste_action = myactions.register_action (processor_box_actions, X_("paste"), _("Paste"), sigc::ptr_fun (ProcessorBox::rb_paste)); @@ -3769,15 +3823,6 @@ ProcessorBox::rb_choose_plugin () _current_processor_box->choose_plugin (); } -void -ProcessorBox::rb_choose_lua () -{ - if (_current_processor_box == 0) { - return; - } - _current_processor_box->choose_lua (); -} - void ProcessorBox::rb_choose_insert () { @@ -3962,6 +4007,9 @@ ProcessorBox::edit_processor (boost::shared_ptr processor) if (edit_aux_send (processor)) { return; } + if (!_session->engine().connected()) { + return; + } ProcessorWindowProxy* proxy = find_window_proxy (processor); @@ -3980,6 +4028,9 @@ ProcessorBox::generic_edit_processor (boost::shared_ptr processor) if (edit_aux_send (processor)) { return; } + if (!_session->engine().connected()) { + return; + } ProcessorWindowProxy* proxy = find_window_proxy (processor); @@ -4198,6 +4249,7 @@ ProcessorWindowProxy::processor_going_away () send DropReferences is about to be deleted, but lets do it anyway. */ going_away_connection.disconnect(); + delete this; } ARDOUR::SessionHandlePtr* @@ -4212,7 +4264,7 @@ ProcessorWindowProxy::get_state () { XMLNode *node; node = &ProxyBase::get_state(); - node->add_property (X_("custom-ui"), is_custom? X_("yes") : X_("no")); + node->set_property (X_("custom-ui"), is_custom); return *node; } @@ -4222,18 +4274,15 @@ ProcessorWindowProxy::set_state (const XMLNode& node, int /*version*/) XMLNodeList children = node.children (); XMLNodeList::const_iterator i = children.begin (); while (i != children.end()) { - XMLProperty* prop = (*i)->property (X_("name")); - if ((*i)->name() == X_("Window") && prop && prop->value() == _name) { + std::string name; + if ((*i)->name() == X_("Window") && (*i)->get_property (X_("name"), name) && name == _name) { break; } ++i; } if (i != children.end()) { - XMLProperty* prop; - if ((prop = (*i)->property (X_("custom-ui"))) != 0) { - want_custom = PBD::string_is_affirmative (prop->value ()); - } + (*i)->get_property (X_("custom-ui"), want_custom); } return ProxyBase::set_state (node, 0); @@ -4249,6 +4298,7 @@ ProcessorWindowProxy::get (bool create) } if (_window && (is_custom != want_custom)) { /* drop existing window - wrong type */ + set_state_mask (Gtkmm2ext::WindowProxy::StateMask (state_mask () & ~WindowProxy::Size)); drop_window (); } @@ -4263,8 +4313,8 @@ ProcessorWindowProxy::get (bool create) if (_window) { setup (); } + _window->show_all (); } - _window->show_all (); return _window; } @@ -4273,13 +4323,9 @@ ProcessorWindowProxy::show_the_right_window () { if (_window && (is_custom != want_custom)) { /* drop existing window - wrong type */ + set_state_mask (Gtkmm2ext::WindowProxy::StateMask (state_mask () & ~WindowProxy::Size)); drop_window (); - get (true); - setup (); - assert (_window); - is_custom = want_custom; } - toggle (); } @@ -4326,9 +4372,8 @@ PluginPinWindowProxy::get (bool create) if (aw) { aw->set_session (_session); } + _window->show_all (); } - - _window->show_all (); return _window; } @@ -4339,6 +4384,7 @@ PluginPinWindowProxy::processor_going_away () _window = 0; WM::Manager::instance().remove (this); going_away_connection.disconnect(); + delete this; } void