X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fprocessor_box.cc;h=70e479363e4d99c0901171c8e00b02766bd6c842;hb=7b57d47e2592641181d0e87b51ee93e89b4068f2;hp=02a0bfefc8212414cd6c805b21550ab19627877b;hpb=a1ecad4cfe80a9a0c39e3c6bb5dd3b47d2a5bfb3;p=ardour.git diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index 02a0bfefc8..70e479363e 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -40,13 +40,10 @@ #include #include "ardour/amp.h" -#include "ardour/ardour.h" #include "ardour/audio_track.h" #include "ardour/audioengine.h" -#include "ardour/internal_send.h" #include "ardour/internal_return.h" -#include "ardour/ladspa_plugin.h" -#include "ardour/meter.h" +#include "ardour/internal_send.h" #include "ardour/plugin_insert.h" #include "ardour/port_insert.h" #include "ardour/profile.h" @@ -54,7 +51,7 @@ #include "ardour/route.h" #include "ardour/send.h" #include "ardour/session.h" -#include "ardour/dB.h" +#include "ardour/types.h" #include "actions.h" #include "ardour_dialog.h" @@ -94,6 +91,7 @@ RefPtr ProcessorBox::rename_action; RefPtr ProcessorBox::edit_action; RefPtr ProcessorBox::edit_generic_action; Glib::RefPtr ProcessorEntry::_slider_pixbuf; +Glib::RefPtr ProcessorEntry::_slider_pixbuf_desensitised; ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr p, Width w) : _button (ArdourButton::led_default_elements) @@ -115,19 +113,22 @@ ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptractive()) { - _button.set_active_state (Gtkmm2ext::Active); - } - + _button.set_active (_processor->active()); _button.show (); _processor->ActiveChanged.connect (active_connection, invalidator (*this), boost::bind (&ProcessorEntry::processor_active_changed, this), gui_context()); - _processor->PropertyChanged.connect (name_connection, invalidator (*this), ui_bind (&ProcessorEntry::processor_property_changed, this, _1), gui_context()); + _processor->PropertyChanged.connect (name_connection, invalidator (*this), boost::bind (&ProcessorEntry::processor_property_changed, this, _1), gui_context()); set p = _processor->what_can_be_automated (); for (set::iterator i = p.begin(); i != p.end(); ++i) { - Control* c = new Control (_slider_pixbuf, _processor->automation_control (*i), _processor->describe_parameter (*i)); + Control* c = new Control ( + _slider_pixbuf, + _slider_pixbuf_desensitised, + _processor->automation_control (*i), + _processor->describe_parameter (*i) + ); + _controls.push_back (c); if (boost::dynamic_pointer_cast (_processor) == 0) { @@ -225,7 +226,7 @@ void ProcessorEntry::led_clicked() { if (_processor) { - if (_button.active_state() == Gtkmm2ext::Active) { + if (_button.get_active ()) { _processor->deactivate (); } else { _processor->activate (); @@ -237,11 +238,7 @@ void ProcessorEntry::processor_active_changed () { if (_processor) { - if (_processor->active()) { - _button.set_active_state (Gtkmm2ext::Active); - } else { - _button.unset_active_state (); - } + _button.set_active (_processor->active()); } } @@ -311,6 +308,8 @@ ProcessorEntry::setup_slider_pix () { _slider_pixbuf = ::get_icon ("fader_belt_h_thin"); assert (_slider_pixbuf); + _slider_pixbuf_desensitised = ::get_icon ("fader_belt_h_thin_desensitised"); + assert (_slider_pixbuf_desensitised); } void @@ -408,36 +407,80 @@ ProcessorEntry::toggle_control_visibility (Control* c) _parent->update_gui_object_state (this); } -ProcessorEntry::Control::Control (Glib::RefPtr s, boost::shared_ptr c, string const & n) +ProcessorEntry::Control::Control (Glib::RefPtr s, Glib::RefPtr sd, 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 (s, &_adjustment, 0, false) - , _ignore_slider_adjustment (false) + , _slider (s, sd, &_adjustment, 0, false) + , _slider_persistant_tooltip (&_slider) + , _button (ArdourButton::Element (ArdourButton::Text | ArdourButton::Indicator)) + , _ignore_ui_adjustment (false) , _visible (false) , _name (n) { _slider.set_controllable (c); - box.pack_start (_label); - _label.show (); - _label.set_text (_name); + if (c->toggled()) { + _button.set_text (_name); + _button.set_led_left (true); + _button.set_name ("processor control button"); + box.pack_start (_button); + _button.show (); - box.pack_start (_slider); - _slider.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 ()); - double const lo = c->internal_to_interface (c->lower ()); - double const up = c->internal_to_interface (c->upper ()); + } else { + + box.pack_start (_label); + _label.show (); + _label.set_text (_name); + box.pack_start (_slider); + _slider.show (); + + double const lo = c->internal_to_interface (c->lower ()); + double const up = c->internal_to_interface (c->upper ()); + + _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.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 ()); + } - _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 ())); + ARDOUR_UI::RapidScreenUpdate.connect (sigc::mem_fun (*this, &Control::control_changed)); + + control_changed (); + set_tooltip (); - _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 ()); + /* We're providing our own PersistentTooltip */ + set_no_tooltip_whatsoever (_slider); +} - control_changed (); +void +ProcessorEntry::Control::set_tooltip () +{ + boost::shared_ptr c = _control.lock (); + + if (!c) { + return; + } + + stringstream s; + s << _name << ": "; + if (c->toggled ()) { + s << (c->get_value() > 0.5 ? _("on") : _("off")); + } else { + s << setprecision(2) << fixed; + s << c->internal_to_user (c->get_value ()); + } + + ARDOUR_UI::instance()->set_tip (_label, s.str ()); + _slider_persistant_tooltip.set_tip (s.str ()); + ARDOUR_UI::instance()->set_tip (_button, s.str ()); } void @@ -449,7 +492,7 @@ ProcessorEntry::Control::set_pixel_width (int p) void ProcessorEntry::Control::slider_adjusted () { - if (_ignore_slider_adjustment) { + if (_ignore_ui_adjustment) { return; } @@ -460,6 +503,22 @@ ProcessorEntry::Control::slider_adjusted () } c->set_value (c->interface_to_internal (_adjustment.get_value ())); + set_tooltip (); +} + +void +ProcessorEntry::Control::button_clicked () +{ + boost::shared_ptr c = _control.lock (); + + if (!c) { + return; + } + + bool const n = _button.get_active (); + + c->set_value (n ? 0 : 1); + _button.set_active (!n); } void @@ -470,18 +529,23 @@ ProcessorEntry::Control::control_changed () return; } - _ignore_slider_adjustment = true; + _ignore_ui_adjustment = true; - _adjustment.set_value (c->internal_to_interface (c->get_value ())); + if (c->toggled ()) { - stringstream s; - s.precision (1); - s.setf (ios::fixed, ios::floatfield); - s << c->internal_to_user (c->get_value ()); - - _slider.set_tooltip_text (s.str ()); + _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 ()); + } - _ignore_slider_adjustment = false; + _ignore_ui_adjustment = false; } void @@ -553,7 +617,7 @@ PluginInsertProcessorEntry::PluginInsertProcessorEntry (ProcessorBox* b, boost:: , _plugin_insert (p) { p->SplittingChanged.connect ( - _splitting_connection, invalidator (*this), ui_bind (&PluginInsertProcessorEntry::plugin_insert_splitting_changed, this), gui_context() + _splitting_connection, invalidator (*this), boost::bind (&PluginInsertProcessorEntry::plugin_insert_splitting_changed, this), gui_context() ); _splitting_icon.set_size_request (-1, 12); @@ -671,7 +735,7 @@ ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::functionDeliveryChanged.connect ( - _mixer_strip_connections, invalidator (*this), ui_bind (&ProcessorBox::mixer_strip_delivery_changed, this, _1), gui_context () + _mixer_strip_connections, invalidator (*this), boost::bind (&ProcessorBox::mixer_strip_delivery_changed, this, _1), gui_context () ); } @@ -705,7 +769,7 @@ ProcessorBox::set_route (boost::shared_ptr r) _route = r; _route->processors_changed.connect ( - _route_connections, invalidator (*this), ui_bind (&ProcessorBox::route_processors_changed, this, _1), gui_context() + _route_connections, invalidator (*this), boost::bind (&ProcessorBox::route_processors_changed, this, _1), gui_context() ); _route->DropReferences.connect ( @@ -713,7 +777,7 @@ ProcessorBox::set_route (boost::shared_ptr r) ); _route->PropertyChanged.connect ( - _route_connections, invalidator (*this), ui_bind (&ProcessorBox::route_property_changed, this, _1), gui_context() + _route_connections, invalidator (*this), boost::bind (&ProcessorBox::route_property_changed, this, _1), gui_context() ); redisplay_processors (); @@ -733,6 +797,21 @@ ProcessorBox::object_drop(DnDVBox* source, ProcessorEntry* posit boost::shared_ptr p; if (position) { p = position->processor (); + if (!p) { + /* dropped on the blank entry (which will be before the + fader), so use the first non-blank child as our + `dropped on' processor */ + list c = processor_display.children (); + list::iterator i = c.begin (); + while (dynamic_cast (*i)) { + assert (i != c.end ()); + ++i; + } + + assert (i != c.end ()); + p = (*i)->processor (); + assert (p); + } } list children = source->selection (); @@ -763,12 +842,6 @@ ProcessorBox::object_drop(DnDVBox* source, ProcessorEntry* posit } } -void -ProcessorBox::update() -{ - redisplay_processors (); -} - void ProcessorBox::set_width (Width w) { @@ -792,6 +865,7 @@ ProcessorBox::build_possible_aux_menu () boost::shared_ptr rl = _session->get_routes_with_internal_returns(); if (rl->empty()) { + /* No aux sends if there are no busses */ return 0; } @@ -891,10 +965,8 @@ ProcessorBox::show_processor_menu (int arg) processor_display.get_pointer (x, y); _placement = processor_display.add_placeholder (y); - if (_visible_prefader_processors == 0) { - if (_placement == 1) { - _placement = 0; - } + if (_visible_prefader_processors == 0 && _placement > 0) { + --_placement; } } @@ -906,7 +978,7 @@ ProcessorBox::enter_notify (GdkEventCrossing*) } bool -ProcessorBox::leave_notify (GdkEventCrossing* ev) +ProcessorBox::leave_notify (GdkEventCrossing*) { return false; } @@ -989,7 +1061,11 @@ 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 */ - toggle_edit_processor (processor); + if (Config->get_use_plugin_own_gui ()) { + toggle_edit_processor (processor); + } else { + toggle_edit_generic_processor (processor); + } } ret = true; @@ -1160,7 +1236,7 @@ ProcessorBox::choose_send () /* XXX need processor lock on route */ try { - Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock()); + Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock()); send->output()->ensure_io (outs, false, this); } catch (AudioEngine::PortRegistrationFailure& err) { error << string_compose (_("Cannot set up new send: %1"), err.what()) << endmsg; @@ -1257,10 +1333,7 @@ ProcessorBox::choose_aux (boost::weak_ptr wr) return; } - boost::shared_ptr rlist (new RouteList); - rlist->push_back (_route); - - _session->add_internal_sends (target, PreFader, rlist); + _session->add_internal_send (target, _placement, _route); } void @@ -1612,19 +1685,6 @@ ProcessorBox::copy_processors (const ProcSelection& to_be_copied) _rr_selection.set (node); } -void -ProcessorBox::processors_up () -{ - /* unimplemented */ -} - -void -ProcessorBox::processors_down () -{ - /* unimplemented */ -} - - void ProcessorBox::delete_processors (const ProcSelection& targets) { @@ -1782,8 +1842,10 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr } else if (type->value() == "send") { XMLNode n (**niter); - Send::make_unique (n, *_session); 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; @@ -1791,13 +1853,13 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr p.reset (s); - } else if (type->value() == "return") { XMLNode n (**niter); - Return::make_unique (n, *_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; @@ -1808,10 +1870,15 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr } else if (type->value() == "port") { XMLNode n (**niter); - p.reset (new PortInsert (*_session, _route->pannable (), _route->mute_master ())); - if (p->set_state (n, Stateful::loading_state_version)) { + 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 @@ -1826,7 +1893,7 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr } catch (...) { - cerr << "plugin insert constructor failed\n"; + error << _("plugin insert constructor failed") << endmsg; } } @@ -1845,18 +1912,6 @@ could not match the configuration of this track."); } } -void -ProcessorBox::activate_processor (boost::shared_ptr r) -{ - r->activate (); -} - -void -ProcessorBox::deactivate_processor (boost::shared_ptr r) -{ - r->deactivate (); -} - void ProcessorBox::get_selected_processors (ProcSelection& processors) const {