finalize fix for MIDI track monitoring

[ardour.git] / gtk2_ardour / processor_box.cc

diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index f7168934bbc29db925c6cc747ee719cb93bbe810..dd8a2e957f38a2a4251fea94fee5f77ce94a9b90 100644 (file)
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -40,13 +40,10 @@
 #include <gtkmm2ext/doi.h>
 
 #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<Action> ProcessorBox::rename_action;
 RefPtr<Action> ProcessorBox::edit_action;
 RefPtr<Action> ProcessorBox::edit_generic_action;
 Glib::RefPtr<Gdk::Pixbuf> ProcessorEntry::_slider_pixbuf;
+Glib::RefPtr<Gdk::Pixbuf> ProcessorEntry::_slider_pixbuf_desensitised;
 
 ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr<Processor> p, Width w)
        : _button (ArdourButton::led_default_elements)
@@ -119,12 +117,18 @@ ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr<Processo
                _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<Evoral::Parameter> p = _processor->what_can_be_automated ();
                for (set<Evoral::Parameter>::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<Amp> (_processor) == 0) {
@@ -304,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
@@ -401,10 +407,11 @@ ProcessorEntry::toggle_control_visibility (Control* c)
        _parent->update_gui_object_state (this);
 }
 
-ProcessorEntry::Control::Control (Glib::RefPtr<Gdk::Pixbuf> s, boost::shared_ptr<AutomationControl> c, string const & n)
+ProcessorEntry::Control::Control (Glib::RefPtr<Gdk::Pixbuf> s, Glib::RefPtr<Gdk::Pixbuf> sd, boost::shared_ptr<AutomationControl> 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)
+       , _slider (s, sd, &_adjustment, 0, false)
+       , _slider_persistant_tooltip (&_slider)
        , _button (ArdourButton::Element (ArdourButton::Text | ArdourButton::Indicator))
        , _ignore_ui_adjustment (false)
        , _visible (false)
@@ -425,9 +432,13 @@ ProcessorEntry::Control::Control (Glib::RefPtr<Gdk::Pixbuf> s, boost::shared_ptr
 
        } else {
                
-               box.pack_start (_label);
-               _label.show ();
-               _label.set_text (_name);
+               _slider.set_name ("PluginSlider");
+               _slider.set_size_request (-1, 16);
+               _slider.set_text (_name);
+
+//             box.pack_start (_label);
+//             _label.show ();
+//             _label.set_text (_name);
                box.pack_start (_slider);
                _slider.show ();
 
@@ -444,7 +455,36 @@ ProcessorEntry::Control::Control (Glib::RefPtr<Gdk::Pixbuf> s, boost::shared_ptr
                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));
+       
        control_changed ();
+       set_tooltip ();
+
+       /* We're providing our own PersistentTooltip */
+       set_no_tooltip_whatsoever (_slider);
+}
+
+void
+ProcessorEntry::Control::set_tooltip ()
+{
+       boost::shared_ptr<AutomationControl> 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
@@ -467,6 +507,7 @@ ProcessorEntry::Control::slider_adjusted ()
        }
 
        c->set_value (c->interface_to_internal (_adjustment.get_value ()));
+       set_tooltip ();
 }
 
 void
@@ -506,8 +547,6 @@ ProcessorEntry::Control::control_changed ()
                s.precision (1);
                s.setf (ios::fixed, ios::floatfield);
                s << c->internal_to_user (c->get_value ());
-               
-               _slider.set_tooltip_text (s.str ());
        }
        
        _ignore_ui_adjustment = false;
@@ -582,7 +621,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);
@@ -700,7 +739,7 @@ ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::function<PluginSelecto
 
        if (parent) {
                parent->DeliveryChanged.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 ()
                        );
        }
 
@@ -734,7 +773,7 @@ ProcessorBox::set_route (boost::shared_ptr<Route> 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 (
@@ -742,7 +781,7 @@ ProcessorBox::set_route (boost::shared_ptr<Route> 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 ();
@@ -830,6 +869,7 @@ ProcessorBox::build_possible_aux_menu ()
        boost::shared_ptr<RouteList> rl = _session->get_routes_with_internal_returns();
 
        if (rl->empty()) {
+               /* No aux sends if there are no busses */
                return 0;
        }
 
@@ -942,7 +982,7 @@ ProcessorBox::enter_notify (GdkEventCrossing*)
 }
 
 bool
-ProcessorBox::leave_notify (GdkEventCrossing* ev)
+ProcessorBox::leave_notify (GdkEventCrossing*)
 {
        return false;
 }
@@ -1200,7 +1240,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;
@@ -1857,7 +1897,7 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr
                }
 
                catch (...) {
-                       cerr << "plugin insert constructor failed\n";
+                       error << _("plugin insert constructor failed") << endmsg;
                }
        }