X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fprocessor_box.cc;h=c70dc9078a96b1b015f25612e5b4e1b75d3e3fa3;hb=167b9dda37135d6172e751ba89302bbd66ea882e;hp=f3997203fde6a3fc77effd9c0e461390d20adb67;hpb=a725fde23de327085992985eb12afa74d9ad312b;p=ardour.git diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index f3997203fd..c70dc9078a 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -86,7 +86,7 @@ #include "tooltips.h" #include "new_plugin_preset_dialog.h" -#include "i18n.h" +#include "pbd/i18n.h" #ifdef AUDIOUNIT_SUPPORT class AUPluginUI; @@ -109,6 +109,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; @@ -181,11 +182,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 +198,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); @@ -439,11 +440,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 +452,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 +466,7 @@ void ProcessorEntry::processor_active_changed () { if (_processor) { - _button.set_active (_processor->active()); + _button.set_active (_processor->enabled ()); } } @@ -657,7 +658,7 @@ 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; + XMLProperty const * p = n ? n->property (X_("visible")) : NULL; if (p) { if (string_is_affirmative (p->value ())) { _plugin_display->show(); @@ -947,7 +948,7 @@ ProcessorEntry::Control::set_state (XMLNode const * node) { XMLNode* n = GUIObjectState::get_node (node, state_id ()); if (n) { - XMLProperty* p = n->property (X_("visible")); + XMLProperty const * p = n->property (X_("visible")); set_visible (p && string_is_affirmative (p->value ())); } else { set_visible (false); @@ -1124,6 +1125,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; } @@ -1504,16 +1508,27 @@ 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->QueueDraw.connect (_qdraw_connection, invalidator (*this), boost::bind (&Gtk::Widget::queue_draw, this), gui_context ()); + + std::string postfix = ""; + 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 () @@ -1523,8 +1538,33 @@ ProcessorEntry::PluginDisplay::~PluginDisplay () } } +bool +ProcessorEntry::PluginDisplay::on_button_press_event (GdkEventButton *ev) +{ + assert (_entry.processor ()); + + // 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 (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; @@ -1598,6 +1638,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); @@ -1657,8 +1698,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) { @@ -1687,7 +1728,9 @@ ProcessorEntry::LuaPluginDisplay::render_inline (cairo_t *cr, uint32_t width) return h; } } catch (luabridge::LuaException const& e) { - ; +#ifndef NDEBUG + cerr << "LuaException:" << e.what () << endl; +#endif } return 0; } @@ -1698,7 +1741,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; } @@ -1868,7 +1911,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); } @@ -1891,7 +1934,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); } @@ -1910,7 +1953,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 { @@ -2117,6 +2160,7 @@ ProcessorBox::show_processor_menu (int arg) 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 ()); @@ -2239,11 +2283,7 @@ 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 (); - } + (*i)->enable (!(*i)->enabled ()); } break; @@ -2335,12 +2375,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; @@ -2666,12 +2701,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); } @@ -2885,9 +2914,9 @@ 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(); @@ -3639,10 +3668,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)); @@ -3900,6 +3932,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); @@ -3918,6 +3953,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); @@ -4160,7 +4198,7 @@ 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")); + XMLProperty const * prop = (*i)->property (X_("name")); if ((*i)->name() == X_("Window") && prop && prop->value() == _name) { break; } @@ -4168,7 +4206,7 @@ ProcessorWindowProxy::set_state (const XMLNode& node, int /*version*/) } if (i != children.end()) { - XMLProperty* prop; + XMLProperty const * prop; if ((prop = (*i)->property (X_("custom-ui"))) != 0) { want_custom = PBD::string_is_affirmative (prop->value ()); } @@ -4212,12 +4250,7 @@ ProcessorWindowProxy::show_the_right_window () if (_window && (is_custom != want_custom)) { /* drop existing window - wrong type */ drop_window (); - get (true); - setup (); - assert (_window); - is_custom = want_custom; } - toggle (); }