X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fprocessor_box.cc;h=c69aeeeed97a25b3b97666fadc0ec09afb31422f;hb=83b5bdbe95b2e3d236769d04f5ac2fac7401a9af;hp=1fdad0801dc86deac9ee60d311cc7e59e98d2b3b;hpb=52f44dc4dad15a70b9dff6284abc07e67ee65941;p=ardour.git diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index 1fdad0801d..c69aeeeed9 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -21,10 +21,6 @@ #include "gtk2ardour-config.h" #endif -#ifdef COMPILER_MSVC -#define rintf(x) round((x) + 0.5) -#endif - #include #include #include @@ -49,6 +45,7 @@ #include "ardour/audioengine.h" #include "ardour/internal_return.h" #include "ardour/internal_send.h" +#include "ardour/meter.h" #include "ardour/panner_shell.h" #include "ardour/plugin_insert.h" #include "ardour/pannable.h" @@ -76,6 +73,8 @@ #include "return_ui.h" #include "route_processor_selection.h" #include "send_ui.h" +#include "timers.h" +#include "tooltips.h" #include "i18n.h" @@ -83,6 +82,10 @@ class AUPluginUI; #endif +#ifndef NDEBUG +bool ProcessorBox::show_all_processors = false; +#endif + using namespace std; using namespace ARDOUR; using namespace PBD; @@ -93,7 +96,9 @@ using namespace Gtkmm2ext; ProcessorBox* ProcessorBox::_current_processor_box = 0; RefPtr ProcessorBox::paste_action; RefPtr ProcessorBox::cut_action; +RefPtr ProcessorBox::copy_action; RefPtr ProcessorBox::rename_action; +RefPtr ProcessorBox::delete_action; RefPtr ProcessorBox::edit_action; RefPtr ProcessorBox::edit_generic_action; @@ -105,21 +110,28 @@ ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr (_processor)) { + _button.set_elements(ArdourButton::Element(_button.elements() & ~ArdourButton::Indicator)); + } + if (boost::dynamic_pointer_cast (_processor)) { + _button.set_elements(ArdourButton::Element(_button.elements() & ~ArdourButton::Indicator)); + _unknown_processor = true; + } if (_processor) { _vbox.pack_start (_routing_icon); @@ -143,7 +155,7 @@ ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr p = _processor->what_can_be_automated (); for (set::iterator i = p.begin(); i != p.end(); ++i) { - + std::string label = _processor->describe_parameter (*i); if (boost::dynamic_pointer_cast (_processor)) { @@ -153,11 +165,11 @@ ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptrautomation_control (*i), label); - + _controls.push_back (c); if (boost::dynamic_pointer_cast (_processor) == 0) { - /* Add non-Amp controls to the processor box */ + /* Add non-Amp (Fader & Trim) controls to the processor box */ _vbox.pack_start (c->box); } } @@ -228,6 +240,11 @@ ProcessorEntry::set_visual_state (Gtkmm2ext::VisualState s, bool yn) void ProcessorEntry::setup_visuals () { + if (_unknown_processor) { + _button.set_name ("processor stub"); + return; + } + switch (_position) { case PreFader: _button.set_name ("processor prefader"); @@ -258,13 +275,39 @@ ProcessorEntry::set_enum_width (Width w) } void -ProcessorEntry::led_clicked() +ProcessorEntry::led_clicked(GdkEventButton *ev) { + bool ctrl_shift_pressed = false; + Keyboard::ModifierMask ctrl_shift_mask = Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier); + + if (Keyboard::modifier_state_equals (ev->state, ctrl_shift_mask)) { + ctrl_shift_pressed = true; + } + if (_processor) { if (_button.get_active ()) { - _processor->deactivate (); + if (ctrl_shift_pressed) { + _parent->all_visible_processors_active(false); + + if (_position == Fader) { + _processor->deactivate (); + } + } + else { + _processor->deactivate (); + } + } else { - _processor->activate (); + if (ctrl_shift_pressed) { + _parent->all_visible_processors_active(true); + + if (_position == Fader) { + _processor->activate (); + } + } + else { + _processor->activate (); + } } } } @@ -310,16 +353,21 @@ ProcessorEntry::setup_tooltip () postfix = string_compose(_("\nThis mono plugin has been replicated %1 times."), replicated); } if (pi->plugin()->has_editor()) { - ARDOUR_UI::instance()->set_tip (_button, + ARDOUR_UI_UTILS::set_tooltip (_button, string_compose (_("%1\nDouble-click to show GUI.\nAlt+double-click to show generic GUI.%2"), name (Wide), postfix)); } else { - ARDOUR_UI::instance()->set_tip (_button, + ARDOUR_UI_UTILS::set_tooltip (_button, string_compose (_("%1\nDouble-click to show generic GUI.%2"), name (Wide), postfix)); } return; } + if(boost::dynamic_pointer_cast (_processor)) { + ARDOUR_UI::instance()->set_tip (_button, + string_compose (_("%1\nThe Plugin is not available on this system\nand has been replaced by a stub."), name (Wide))); + return; + } } - ARDOUR_UI::instance()->set_tip (_button, string_compose ("%1", name (Wide))); + ARDOUR_UI_UTILS::set_tooltip (_button, string_compose ("%1", name (Wide))); } string @@ -436,7 +484,7 @@ ProcessorEntry::build_controls_menu () items.push_back ( MenuElem (_("Show All Controls"), sigc::mem_fun (*this, &ProcessorEntry::show_all_controls)) ); - + items.push_back ( MenuElem (_("Hide All Controls"), sigc::mem_fun (*this, &ProcessorEntry::hide_all_controls)) ); @@ -444,7 +492,7 @@ ProcessorEntry::build_controls_menu () if (!_controls.empty ()) { items.push_back (SeparatorElem ()); } - + for (list::iterator i = _controls.begin(); i != _controls.end(); ++i) { items.push_back (CheckMenuElem ((*i)->name ())); Gtk::CheckMenuItem* c = dynamic_cast (&items.back ()); @@ -493,7 +541,7 @@ ProcessorEntry::toggle_panner_link () 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) - , _slider (&_adjustment, 0, 13) + , _slider (&_adjustment, boost::shared_ptr(), 0, max(13.f, rintf(13.f * UIConfiguration::instance().get_ui_scale()))) , _slider_persistant_tooltip (&_slider) , _button (ArdourButton::led_default_elements) , _ignore_ui_adjustment (false) @@ -511,32 +559,52 @@ ProcessorEntry::Control::Control (boost::shared_ptr c, string _button.show (); _button.signal_clicked.connect (sigc::mem_fun (*this, &Control::button_clicked)); - _button.signal_led_clicked.connect (sigc::mem_fun (*this, &Control::button_clicked)); - c->Changed.connect (_connection, MISSING_INVALIDATOR, boost::bind (&Control::control_changed, this), gui_context ()); + _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 ()); } else { - + _slider.set_name ("ProcessorControlSlider"); _slider.set_text (_name); box.add (_slider); _slider.show (); - double const lo = c->internal_to_interface(c->lower ()); - double const up = c->internal_to_interface(c->upper ()); - + 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); + } + _adjustment.set_lower (lo); _adjustment.set_upper (up); - _adjustment.set_step_increment ((up - lo) / 100); - _adjustment.set_page_increment ((up - lo) / 10); - _slider.set_default_value (c->internal_to_interface(c->normal ())); - + _adjustment.set_step_increment (smallstep); + _adjustment.set_page_increment (largestep); + _slider.set_default_value (normal); + _adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &Control::slider_adjusted)); - c->Changed.connect (_connection, MISSING_INVALIDATOR, boost::bind (&Control::control_changed, this), gui_context ()); + // dup. currently timers are used :( + //c->Changed.connect (_connection, MISSING_INVALIDATOR, boost::bind (&Control::control_changed, this), gui_context ()); } - ARDOUR_UI::RapidScreenUpdate.connect (sigc::mem_fun (*this, &Control::control_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 (); @@ -544,6 +612,11 @@ ProcessorEntry::Control::Control (boost::shared_ptr c, string set_no_tooltip_whatsoever (_slider); } +ProcessorEntry::Control::~Control () +{ + timer_connection.disconnect (); +} + void ProcessorEntry::Control::set_tooltip () { @@ -552,20 +625,16 @@ ProcessorEntry::Control::set_tooltip () if (!c) { return; } - - stringstream s; - s << _name << ": "; + char tmp[256]; if (c->toggled ()) { - s << (c->get_value() > 0.5 ? _("on") : _("off")); + snprintf (tmp, sizeof(tmp), "%s: %s", _name.c_str(), c->get_value() > 0.5 ? _("on") : _("off")); } else { - s << setprecision(2) << fixed; - s << c->internal_to_user (c->get_value ()); + snprintf (tmp, sizeof(tmp), "%s: %.2f", _name.c_str(), c->internal_to_user (c->get_value ())); } - string sm = Glib::Markup::escape_text (s.str()); - + string sm = Gtkmm2ext::markup_escape_text (tmp); _slider_persistant_tooltip.set_tip (sm); - ARDOUR_UI::instance()->set_tip (_button, sm); + ARDOUR_UI_UTILS::set_tooltip (_button, sm); } void @@ -574,7 +643,7 @@ ProcessorEntry::Control::slider_adjusted () if (_ignore_ui_adjustment) { return; } - + boost::shared_ptr c = _control.lock (); if (!c) { @@ -601,6 +670,14 @@ ProcessorEntry::Control::button_clicked () set_tooltip (); } +void +ProcessorEntry::Control::button_clicked_event (GdkEventButton *ev) +{ + (void) ev; + + button_clicked (); +} + void ProcessorEntry::Control::control_changed () { @@ -614,17 +691,17 @@ ProcessorEntry::Control::control_changed () if (c->toggled ()) { _button.set_active (c->get_value() > 0.5); - - } else { - _adjustment.set_value (c->internal_to_interface(c->get_value ())); - - stringstream s; - s.precision (1); - s.setf (ios::fixed, ios::floatfield); - s << c->internal_to_user (c->get_value ()); + } else { + // as long as rapid timers are used, only update the tooltip + // if the value has changed. + const double nval = c->internal_to_interface (c->get_value ()); + if (_adjustment.get_value() != nval) { + _adjustment.set_value (nval); + set_tooltip (); + } } - + _ignore_ui_adjustment = false; } @@ -657,7 +734,7 @@ ProcessorEntry::Control::set_visible (bool v) } else { box.hide (); } - + _visible = v; } @@ -695,14 +772,13 @@ PluginInsertProcessorEntry::PluginInsertProcessorEntry (ProcessorBox* b, boost:: void PluginInsertProcessorEntry::plugin_insert_splitting_changed () { - _output_icon.set_ports(_plugin_insert->output_streams()); - _routing_icon.set_splitting(_plugin_insert->splitting ()); + ChanCount in, out; // actual configured i/o + _plugin_insert->configured_io (in, out); - ChanCount sources = _plugin_insert->input_streams(); + /* get number of input ports */ ChanCount sinks = _plugin_insert->natural_input_streams(); - - /* replicated instances */ if (!_plugin_insert->splitting () && _plugin_insert->get_count() > 1) { + /* replicated instances */ for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) { sinks.set(*t, sinks.get(*t) * _plugin_insert->get_count()); } @@ -710,19 +786,52 @@ PluginInsertProcessorEntry::plugin_insert_splitting_changed () /* MIDI bypass */ if (_plugin_insert->natural_output_streams().n_midi() == 0 && _plugin_insert->output_streams().n_midi() == 1) { + in.set(DataType::MIDI, 1); + out.set(DataType::MIDI, 1); sinks.set(DataType::MIDI, 1); - sources.set(DataType::MIDI, 1); } + /* the Input streams available (*valid* outputs from prev. plugin) + * this will be <= sinks. Some input-ports of this processor + * may be unconnected. + */ + _routing_icon.set_sources(in); + + /* the actual input ports of this processor */ _input_icon.set_ports(sinks); _routing_icon.set_sinks(sinks); - _routing_icon.set_sources(sources); - if (_plugin_insert->splitting () || - _plugin_insert->input_streams().n_audio() < _plugin_insert->natural_input_streams().n_audio() - ) + /* set/override plugin-output ports to actual outputs-streams. + * + * This plugin may have unconnected output-ports (currently only in Mixbus, + * e.g channelstrip-EQ at the top of a MIDI-channel before the synth). + * + * The *next* processor below this one will only see the + * actual available streams (it cannot know the real outputs + * of this plugin). + * + * There is currently no API to query the ports of the previous (or next) + * processor. + * + * (normally - iff configuration succeeds - this is set during + * ProcessorEntry::processor_configuration_changed() and should + * equal _plugin_insert->output_streams()) + */ + _output_icon.set_ports(out); +#ifndef NDEBUG + if (out != _plugin_insert->output_streams()) { + std::cerr << "Processor Wiring: " << processor()->name() + << " out-ports: " << _plugin_insert->output_streams() // NB. does not include midi-bypass + << " out-connections: " << out + << endmsg; + } +#endif + + _routing_icon.set_splitting(_plugin_insert->splitting ()); + + if (_plugin_insert->splitting () || in != sinks) { - _routing_icon.set_size_request (-1, 7); + _routing_icon.set_size_request (-1, std::max (7.f, rintf(7.f * UIConfiguration::instance().get_ui_scale()))); _routing_icon.set_visible(true); _input_icon.show(); } else { @@ -744,6 +853,11 @@ PluginInsertProcessorEntry::hide_things () plugin_insert_splitting_changed (); } +ProcessorEntry::PortIcon::PortIcon(bool input) { + _input = input; + _ports = ARDOUR::ChanCount(ARDOUR::DataType::AUDIO, 1); + set_size_request (-1, std::max (2.f, rintf(2.f * UIConfiguration::instance().get_ui_scale()))); +} bool ProcessorEntry::PortIcon::on_expose_event (GdkEventExpose* ev) @@ -763,6 +877,7 @@ ProcessorEntry::PortIcon::on_expose_event (GdkEventExpose* ev) cairo_rectangle (cr, 0, 0, width, height); 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) { if (i < _ports.n_midi()) { @@ -777,7 +892,7 @@ ProcessorEntry::PortIcon::on_expose_event (GdkEventExpose* ev) UINT_RGBA_B_FLT(audio_port_color)); } const float x = rintf(width * (.2f + .6f * i / (_ports.n_total() - 1.f))); - cairo_rectangle (cr, x-1, 0, 3, height); + cairo_rectangle (cr, x-dx * .5, 0, 1+dx, height); cairo_fill(cr); } } else if (_ports.n_total() == 1) { @@ -793,7 +908,7 @@ ProcessorEntry::PortIcon::on_expose_event (GdkEventExpose* ev) UINT_RGBA_B_FLT(audio_port_color)); } const float x = rintf(width * .5); - cairo_rectangle (cr, x-1, 0, 3, height); + cairo_rectangle (cr, x-dx * .5, 0, 1+dx, height); cairo_fill(cr); cairo_stroke(cr); } @@ -810,7 +925,7 @@ ProcessorEntry::RoutingIcon::on_expose_event (GdkEventExpose* ev) cairo_rectangle (cr, ev->area.x, ev->area.y, ev->area.width, ev->area.height); cairo_clip (cr); - cairo_set_line_width (cr, 1.0); + cairo_set_line_width (cr, max (1.f, UIConfiguration::instance().get_ui_scale())); cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND); Gtk::Allocation a = get_allocation(); @@ -829,10 +944,12 @@ ProcessorEntry::RoutingIcon::on_expose_event (GdkEventExpose* ev) const uint32_t sources = _sources.n_total(); const uint32_t sinks = _sinks.n_total(); - /* MIDI */ const uint32_t midi_sources = _sources.n_midi(); const uint32_t midi_sinks = _sinks.n_midi(); + const uint32_t audio_sources = _sources.n_audio(); + const uint32_t audio_sinks = _sinks.n_audio(); + /* MIDI */ cairo_set_source_rgb (cr, UINT_RGBA_R_FLT(midi_port_color), UINT_RGBA_G_FLT(midi_port_color), @@ -857,11 +974,24 @@ ProcessorEntry::RoutingIcon::on_expose_event (GdkEventExpose* ev) cairo_move_to (cr, si_x, height); cairo_curve_to (cr, si_x, 0, si_x0, height, si_x0, 0); cairo_stroke (cr); + } else if (midi_sources == 0 && midi_sinks == 1) { + const double dx = 1 + rint(max(2., 2. * UIConfiguration::instance().get_ui_scale())); + // draw "T" + // TODO connect back to track-input of last midi-out if any, otherwise draw "X" + const float si_x = rintf(width * .2f) + .5f; + cairo_move_to (cr, si_x, height); + cairo_line_to (cr, si_x, height * .66); + cairo_move_to (cr, si_x - dx, height * .66); + cairo_line_to (cr, si_x + dx, height * .66); + cairo_stroke (cr); +#ifndef NDEBUG + } else if (midi_sources != 0 && midi_sinks != 0) { + PBD::warning << string_compose("Programming error: midi routing display: A %1 -> %2 | M %3 -> %4 | T %5 -> %6", + audio_sources, audio_sinks, midi_sources, midi_sinks, sources, sinks) << endmsg; +#endif } /* AUDIO */ - const uint32_t audio_sources = _sources.n_audio(); - const uint32_t audio_sinks = _sinks.n_audio(); cairo_set_source_rgb (cr, UINT_RGBA_R_FLT(audio_port_color), UINT_RGBA_G_FLT(audio_port_color), @@ -878,7 +1008,7 @@ ProcessorEntry::RoutingIcon::on_expose_event (GdkEventExpose* ev) cairo_curve_to (cr, si_x, 0, si_x0, height, si_x0, 0); cairo_stroke (cr); } - } else if (audio_sources > 1) { + } else if (audio_sources > 1 && sinks > 1) { for (uint32_t i = 0 ; i < audio_sources; ++i) { const float si_x = rintf(width * (.2f + .6f * (i + midi_sinks) / (sinks - 1.f))) + .5f; const float si_x0 = rintf(width * (.2f + .6f * (i + midi_sources) / (sources - 1.f))) + .5f; @@ -886,11 +1016,26 @@ ProcessorEntry::RoutingIcon::on_expose_event (GdkEventExpose* ev) cairo_curve_to (cr, si_x, 0, si_x0, height, si_x0, 0); cairo_stroke (cr); } - } else if (audio_sources == 1 && audio_sinks == 1) { - const float si_x = rintf(width * .5f) + .5f; + } else if (audio_sources == 1 && audio_sinks > 0) { + float si_x, si_x0; + if (sinks == 1) { + si_x = rintf(width * .5f) + .5f; + } else { + si_x = rintf(width * (.2f + .6f * midi_sinks / (sinks - 1.f))) + .5f; + } + if (sources == 1) { + si_x0 = rintf(width * .5f) + .5f; + } else { + si_x0 = rintf(width * (.2f + .6f * midi_sources / (sources - 1.f))) + .5f; + } cairo_move_to (cr, si_x, height); - cairo_line_to (cr, si_x, 0); + cairo_curve_to (cr, si_x, 0, si_x0, height, si_x0, 0); cairo_stroke (cr); +#ifndef NDEBUG + } else if (audio_sources != 0 && audio_sinks != 0) { + PBD::warning << string_compose("Programming error: audio routing display: A %1 -> %2 | M %3 -> %4 | T %5 -> %6", + audio_sources, audio_sinks, midi_sources, midi_sinks, sources, sinks) << endmsg; +#endif } cairo_destroy(cr); return true; @@ -942,7 +1087,7 @@ ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::functionset_tip (processor_display, _("Right-click to add/remove/edit\nplugins,inserts,sends and more")); + ARDOUR_UI_UTILS::set_tooltip (processor_display, _("Right-click to add/remove/edit\nplugins,inserts,sends and more")); } ProcessorBox::~ProcessorBox () @@ -1017,6 +1162,9 @@ ProcessorBox::object_drop(DnDVBox* source, ProcessorEntry* posit list > procs; for (list::const_iterator i = children.begin(); i != children.end(); ++i) { if ((*i)->processor ()) { + if (boost::dynamic_pointer_cast ((*i)->processor())) { + continue; + } procs.push_back ((*i)->processor ()); } } @@ -1132,6 +1280,8 @@ ProcessorBox::show_processor_menu (int arg) gtk_menu_item_set_submenu (controls_menu_item->gobj(), 0); controls_menu_item->set_sensitive (false); } + } else { + controls_menu_item->set_sensitive (false); } } @@ -1146,16 +1296,21 @@ ProcessorBox::show_processor_menu (int arg) gtk_menu_item_set_submenu (send_menu_item->gobj(), 0); send_menu_item->set_sensitive (false); } + } else { + send_menu_item->set_sensitive (false); } } /* Sensitise actions as approprioate */ - cut_action->set_sensitive (can_cut()); + + const bool sensitive = !processor_display.selection().empty() && ! stub_processor_selected (); + paste_action->set_sensitive (!_rr_selection.processors.empty()); + cut_action->set_sensitive (sensitive && can_cut ()); + copy_action->set_sensitive (sensitive); + delete_action->set_sensitive (sensitive || stub_processor_selected ()); - const bool sensitive = !processor_display.selection().empty(); - ActionManager::set_sensitive (ActionManager::plugin_selection_sensitive_actions, sensitive); edit_action->set_sensitive (one_processor_can_be_edited ()); edit_generic_action->set_sensitive (one_processor_can_be_edited ()); @@ -1168,7 +1323,10 @@ ProcessorBox::show_processor_menu (int arg) edit_action->set_sensitive (pi && pi->plugin()->has_editor ()); /* disallow rename for multiple selections, for plugin inserts and for the fader */ - rename_action->set_sensitive (single_selection && !pi && !boost::dynamic_pointer_cast (single_selection->processor ())); + rename_action->set_sensitive (single_selection + && !pi + && !boost::dynamic_pointer_cast (single_selection->processor ()) + && !boost::dynamic_pointer_cast (single_selection->processor ())); processor_menu->popup (1, arg); @@ -1198,7 +1356,7 @@ ProcessorBox::leave_notify (GdkEventCrossing*) } bool -ProcessorBox::processor_operation (ProcessorOperation op) +ProcessorBox::processor_operation (ProcessorOperation op) { ProcSelection targets; @@ -1219,7 +1377,7 @@ ProcessorBox::processor_operation (ProcessorOperation op) if ( (op == ProcessorsDelete) && targets.empty() ) return false; //nothing to delete. return false so the editor-mixer, because the user was probably intending to delete something in the editor - + switch (op) { case ProcessorsSelectAll: processor_display.select_all (); @@ -1238,6 +1396,14 @@ ProcessorBox::processor_operation (ProcessorOperation op) break; case ProcessorsPaste: + // some processors are not selectable (e.g fader, meter), target is empty. + if (targets.empty() && _placement >= 0) { + assert (_route); + boost::shared_ptr proc = _route->before_processor_for_index (_placement); + if (proc) { + targets.push_back (proc); + } + } if (targets.empty()) { paste_processors (); } else { @@ -1266,26 +1432,17 @@ ProcessorBox::processor_operation (ProcessorOperation op) default: break; } - + return true; } -ProcessorWindowProxy* +ProcessorWindowProxy* ProcessorBox::find_window_proxy (boost::shared_ptr processor) const { - for (list::const_iterator i = _processor_window_info.begin(); i != _processor_window_info.end(); ++i) { - boost::shared_ptr p = (*i)->processor().lock(); - - if (p && p == processor) { - return (*i); - } - } - - return 0; + return processor->window_proxy(); } - bool ProcessorBox::processor_button_press_event (GdkEventButton *ev, ProcessorEntry* child) { @@ -1302,7 +1459,9 @@ ProcessorBox::processor_button_press_event (GdkEventButton *ev, ProcessorEntry* 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 (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) { generic_edit_processor (processor); @@ -1316,7 +1475,7 @@ ProcessorBox::processor_button_press_event (GdkEventButton *ev, ProcessorEntry* } else if (Keyboard::is_context_menu_event (ev)) { show_processor_menu (ev->time); - + ret = true; } else if (processor && ev->button == 1 && selected) { @@ -1608,60 +1767,11 @@ ProcessorBox::redisplay_processors () _visible_prefader_processors = 0; fader_seen = false; - _route->foreach_processor (sigc::bind (sigc::mem_fun (*this, &ProcessorBox::help_count_visible_prefader_processors), + _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)); - - for (ProcessorWindowProxies::iterator i = _processor_window_info.begin(); i != _processor_window_info.end(); ++i) { - (*i)->marked = false; - } - _route->foreach_processor (sigc::mem_fun (*this, &ProcessorBox::maybe_add_processor_to_ui_list)); - - /* trim dead wood from the processor window proxy list */ - - ProcessorWindowProxies::iterator i = _processor_window_info.begin(); - while (i != _processor_window_info.end()) { - ProcessorWindowProxies::iterator j = i; - ++j; - - if (!(*i)->valid()) { - - WM::Manager::instance().remove (*i); - delete *i; - _processor_window_info.erase (i); - - } else if (!(*i)->marked) { - - /* this processor is no longer part of this processor - * box. - * - * that could be because it was deleted or it could be - * because the route being displayed in the parent - * strip changed. - * - * The latter only happens with the editor mixer strip. - */ - - if (is_editor_mixer_strip()) { - - /* editor mixer strip .. DO NOTHING - * - * note: the processor window stays visible if - * it is already visible - */ - } else { - (*i)->hide (); - WM::Manager::instance().remove (*i); - delete *i; - _processor_window_info.erase (i); - } - } - - i = j; - } - setup_entry_positions (); } @@ -1675,24 +1785,14 @@ ProcessorBox::maybe_add_processor_to_ui_list (boost::weak_ptr w) if (!p) { return; } - - ProcessorWindowProxies::iterator i = _processor_window_info.begin (); - while (i != _processor_window_info.end()) { - - boost::shared_ptr t = (*i)->processor().lock (); - - if (p == t) { - /* this processor is already on the list; done */ - (*i)->marked = true; - return; - } - - ++i; + if (p->window_proxy()) { + return; } /* not on the list; add it */ string loc; +#if 0 // is this still needed? Why? if (_parent_strip) { if (_parent_strip->mixer_owned()) { loc = X_("M"); @@ -1702,6 +1802,9 @@ ProcessorBox::maybe_add_processor_to_ui_list (boost::weak_ptr w) } else { loc = X_("P"); } +#else + loc = X_("P"); +#endif ProcessorWindowProxy* wp = new ProcessorWindowProxy ( string_compose ("%1-%2-%3", loc, _route->id(), p->id()), @@ -1713,12 +1816,6 @@ ProcessorBox::maybe_add_processor_to_ui_list (boost::weak_ptr w) if (ui_xml) { wp->set_state (*ui_xml); } - - wp->marked = true; - - /* if the processor already has an existing UI, - note that so that we don't recreate it - */ void* existing_ui = p->get_ui (); @@ -1726,7 +1823,7 @@ ProcessorBox::maybe_add_processor_to_ui_list (boost::weak_ptr w) wp->use_window (*(reinterpret_cast(existing_ui))); } - _processor_window_info.push_back (wp); + p->set_window_proxy (wp); WM::Manager::instance().register_window (wp); } @@ -1735,9 +1832,14 @@ ProcessorBox::help_count_visible_prefader_processors (boost::weak_ptr { boost::shared_ptr processor (p.lock ()); - if (processor && processor->display_to_user()) { + if (processor && ( processor->display_to_user() +#ifndef NDEBUG + || show_all_processors +#endif + ) + ) { - if (boost::dynamic_pointer_cast(processor)) { + if (boost::dynamic_pointer_cast(processor) && boost::dynamic_pointer_cast(processor)->type() == X_("amp")) { *amp_seen = true; } else { if (!*amp_seen) { @@ -1752,12 +1854,17 @@ ProcessorBox::add_processor_to_display (boost::weak_ptr p) { boost::shared_ptr processor (p.lock ()); - if (!processor || !processor->display_to_user()) { + if (!processor || ( !processor->display_to_user() +#ifndef NDEBUG + && !show_all_processors +#endif + ) + ) { return; } boost::shared_ptr plugin_insert = boost::dynamic_pointer_cast (processor); - + ProcessorEntry* e = 0; if (plugin_insert) { e = new PluginInsertProcessorEntry (this, plugin_insert, _width); @@ -1767,19 +1874,31 @@ ProcessorBox::add_processor_to_display (boost::weak_ptr p) boost::shared_ptr send = boost::dynamic_pointer_cast (processor); boost::shared_ptr ext = boost::dynamic_pointer_cast (processor); - + boost::shared_ptr stub = boost::dynamic_pointer_cast (processor); + //faders and meters are not deletable, copy/paste-able, so they shouldn't be selectable - if (!send && !plugin_insert && !ext) + if (!send && !plugin_insert && !ext && !stub) e->set_selectable(false); + bool mark_send_visible = false; + if (send && _parent_strip) { + /* show controls of new sends by default */ + GUIObjectState& st = _parent_strip->gui_object_state (); + XMLNode* strip = st.get_or_add_node (_parent_strip->state_id ()); + assert (strip); + /* check if state exists, if not it must be a new send */ + if (!st.get_node(strip, e->state_id())) { + mark_send_visible = true; + } + } + /* Set up this entry's state from the GUIObjectState */ XMLNode* proc = entry_gui_object_state (e); if (proc) { e->set_control_state (proc); } - - if (boost::dynamic_pointer_cast (processor)) { - /* Always show send controls */ + + if (mark_send_visible) { e->show_all_controls (); } @@ -1801,7 +1920,7 @@ ProcessorBox::setup_entry_positions () uint32_t num = 0; for (list::iterator i = children.begin(); i != children.end(); ++i) { - if (boost::dynamic_pointer_cast((*i)->processor())) { + if (boost::dynamic_pointer_cast((*i)->processor()) && boost::dynamic_pointer_cast((*i)->processor())->type() == X_("amp")) { pre_fader = false; (*i)->set_position (ProcessorEntry::Fader, num++); } else { @@ -1883,22 +2002,38 @@ ProcessorBox::rename_processors () bool ProcessorBox::can_cut () const { - vector > sel; + vector > sel; - get_selected_processors (sel); + get_selected_processors (sel); - /* cut_processors () does not cut inserts */ + /* cut_processors () does not cut inserts */ - for (vector >::const_iterator i = sel.begin (); i != sel.end (); ++i) { + for (vector >::const_iterator i = sel.begin (); i != sel.end (); ++i) { if (boost::dynamic_pointer_cast((*i)) != 0 || (boost::dynamic_pointer_cast((*i)) != 0) || (boost::dynamic_pointer_cast((*i)) != 0)) { - return true; - } - } + return true; + } + } + + return false; +} + +bool +ProcessorBox::stub_processor_selected () const +{ + vector > sel; + + get_selected_processors (sel); + + for (vector >::const_iterator i = sel.begin (); i != sel.end (); ++i) { + if (boost::dynamic_pointer_cast((*i)) != 0) { + return true; + } + } - return false; + return false; } void @@ -2119,11 +2254,11 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr continue; } else if (type->value() == "intsend") { - + /* aux sends are OK, but those used for * other purposes, are not. */ - + assert (role); if (role->value() != "Aux") { @@ -2152,7 +2287,7 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr Send* s = new Send (*_session, _route->pannable(), _route->mute_master()); IOProcessor::prepare_for_reset (n, s->name()); - + if (s->set_state (n, Stateful::loading_state_version)) { delete s; return; @@ -2178,22 +2313,23 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr XMLNode n (**niter); PortInsert* pi = new PortInsert (*_session, _route->pannable (), _route->mute_master ()); - + IOProcessor::prepare_for_reset (n, pi->name()); - + if (pi->set_state (n, Stateful::loading_state_version)) { return; } - + p.reset (pi); } else { /* XXX its a bit limiting to assume that everything else is a plugin. */ - p.reset (new PluginInsert (*_session)); - p->set_state (**niter, Stateful::current_state_version); + PBD::ID id = p->id(); + p->set_state (**niter, Stateful::current_state_version); + boost::dynamic_pointer_cast(p)->update_id (id); } copies.push_back (p); @@ -2345,7 +2481,7 @@ ProcessorBox::get_editor_window (boost::shared_ptr processor, bool us * will be forced back into a model where the fader controls the main gain. * If the processor is a send, then we map the send controls onto the * strip. - * + * * Plugins and others will return a window for control. */ @@ -2356,7 +2492,7 @@ ProcessorBox::get_editor_window (boost::shared_ptr processor, bool us } } - if (boost::dynamic_pointer_cast (processor)) { + if (boost::dynamic_pointer_cast (processor) && boost::dynamic_pointer_cast (processor)->type() == X_("amp")) { if (_parent_strip) { _parent_strip->revert_to_default_display (); @@ -2494,14 +2630,10 @@ ProcessorBox::register_actions () /* standard editing stuff */ cut_action = ActionManager::register_action (popup_act_grp, X_("cut"), _("Cut"), sigc::ptr_fun (ProcessorBox::rb_cut)); - ActionManager::plugin_selection_sensitive_actions.push_back(cut_action); - act = ActionManager::register_action (popup_act_grp, X_("copy"), _("Copy"), + copy_action = ActionManager::register_action (popup_act_grp, X_("copy"), _("Copy"), sigc::ptr_fun (ProcessorBox::rb_copy)); - ActionManager::plugin_selection_sensitive_actions.push_back(act); - - act = ActionManager::register_action (popup_act_grp, X_("delete"), _("Delete"), + delete_action = ActionManager::register_action (popup_act_grp, X_("delete"), _("Delete"), sigc::ptr_fun (ProcessorBox::rb_delete)); - ActionManager::plugin_selection_sensitive_actions.push_back(act); // ?? paste_action = ActionManager::register_action (popup_act_grp, X_("paste"), _("Paste"), sigc::ptr_fun (ProcessorBox::rb_paste)); @@ -2842,16 +2974,10 @@ ProcessorBox::generate_processor_title (boost::shared_ptr pi) Window * ProcessorBox::get_processor_ui (boost::shared_ptr p) const { - list::const_iterator i = _processor_window_info.begin (); - while (i != _processor_window_info.end()) { - boost::shared_ptr t = (*i)->processor().lock (); - if (t && t == p) { - return (*i)->get (); - } - - ++i; + ProcessorWindowProxy* wp = p->window_proxy(); + if (wp) { + return wp->get (); } - return 0; } @@ -2862,24 +2988,9 @@ ProcessorBox::get_processor_ui (boost::shared_ptr p) const void ProcessorBox::set_processor_ui (boost::shared_ptr p, Gtk::Window* w) { - list::iterator i = _processor_window_info.begin (); - + assert (p->window_proxy()); p->set_ui (w); - - while (i != _processor_window_info.end()) { - boost::shared_ptr t = (*i)->processor().lock (); - if (t && t == p) { - (*i)->use_window (*w); - return; - } - - ++i; - } - - /* we shouldn't get here, because the ProcessorUIList should always contain - an entry for each processor. - */ - assert (false); + p->window_proxy()->use_window (*w); } void @@ -2927,7 +3038,7 @@ ProcessorBox::entry_gui_object_state (ProcessorEntry* entry) } GUIObjectState& st = _parent_strip->gui_object_state (); - + XMLNode* strip = st.get_or_add_node (_parent_strip->state_id ()); assert (strip); return st.get_or_add_node (strip, entry->state_id()); @@ -2954,12 +3065,10 @@ ProcessorBox::is_editor_mixer_strip() const ProcessorWindowProxy::ProcessorWindowProxy (string const & name, ProcessorBox* box, boost::weak_ptr processor) : WM::ProxyBase (name, string()) - , marked (false) , _processor_box (box) , _processor (processor) , is_custom (false) , want_custom (false) - , _valid (true) { boost::shared_ptr p = _processor.lock (); if (!p) { @@ -2982,7 +3091,7 @@ ProcessorWindowProxy::processor_going_away () { delete _window; _window = 0; - _valid = false; + WM::Manager::instance().remove (this); /* should be no real reason to do this, since the object that would send DropReferences is about to be deleted, but lets do it anyway. */ @@ -2990,18 +3099,12 @@ ProcessorWindowProxy::processor_going_away () } ARDOUR::SessionHandlePtr* -ProcessorWindowProxy::session_handle() +ProcessorWindowProxy::session_handle() { /* we don't care */ return 0; } -bool -ProcessorWindowProxy::valid() const -{ - return _valid; -} - XMLNode& ProcessorWindowProxy::get_state () const { @@ -3051,7 +3154,7 @@ ProcessorWindowProxy::get (bool create) if (!create) { return 0; } - + is_custom = want_custom; _window = _processor_box->get_editor_window (p, is_custom);