add GUI support for Plugin Mixer Inline Display

diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index 19a6b020e804e4ff38c99a9e481e149ddb0f8454..b2e22969e7f486e6d5f77ef10a19b2304b34beb3 100644 (file)
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -28,6 +28,7 @@
 #include <sigc++/bind.h>
 
 #include "pbd/convert.h"
+#include "canvas/utils.h"
 
 #include <glibmm/miscutils.h>
 #include <glibmm/fileutils.h>
@@ -122,6 +123,7 @@ ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr<Processo
        , _width (w)
        , _input_icon(true)
        , _output_icon(false)
+       , _plugin_display(0)
 {
        _vbox.show ();
 
@@ -149,6 +151,17 @@ ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr<Processo
                _vbox.pack_start (_routing_icon);
                _vbox.pack_start (_input_icon);
                _vbox.pack_start (_button, true, true);
+
+               boost::shared_ptr<PluginInsert> pi = boost::dynamic_pointer_cast<PluginInsert> (_processor);
+               if (pi && pi->plugin() && pi->plugin()->has_inline_display()) {
+                       _plugin_display = new PluginDisplay (pi->plugin(),
+                                       std::max (60.f, rintf(80.f * UIConfiguration::instance().get_ui_scale())));
+                       _vbox.pack_start (*_plugin_display);
+                       _plugin_display->set_no_show_all (true);
+                       if (Config->get_show_inline_display_by_default ()) {
+                               _plugin_display->show ();
+                       }
+               }
                _vbox.pack_end (_output_icon);
 
                _button.set_active (_processor->active());
@@ -204,6 +217,7 @@ ProcessorEntry::~ProcessorEntry ()
        for (list<Control*>::iterator i = _controls.begin(); i != _controls.end(); ++i) {
                delete *i;
        }
+       delete _plugin_display;
 }
 
 EventBox&
@@ -347,6 +361,7 @@ ProcessorEntry::setup_visuals ()
 
        switch (_position) {
        case PreFader:
+               if (_plugin_display) { _plugin_display->set_name ("processor prefader"); }
                _button.set_name ("processor prefader");
                break;
 
@@ -355,6 +370,7 @@ ProcessorEntry::setup_visuals ()
                break;
 
        case PostFader:
+               if (_plugin_display) { _plugin_display->set_name ("processor postfader"); }
                _button.set_name ("processor postfader");
                break;
        }
@@ -552,6 +568,13 @@ ProcessorEntry::add_control_state (XMLNode* node) const
        for (list<Control*>::const_iterator i = _controls.begin(); i != _controls.end(); ++i) {
                (*i)->add_state (node);
        }
+
+       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 ());
+               node->add_child_nocopy (*c);
+       }
 }
 
 void
@@ -560,6 +583,18 @@ ProcessorEntry::set_control_state (XMLNode const * node)
        for (list<Control*>::const_iterator i = _controls.begin(); i != _controls.end(); ++i) {
                (*i)->set_state (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();
+                       } else {
+                               _plugin_display->hide();
+                       }
+               }
+       }
 }
 
 string
@@ -584,6 +619,14 @@ ProcessorEntry::build_controls_menu ()
        Menu* menu = manage (new Menu);
        MenuList& items = menu->items ();
 
+       if (_plugin_display) {
+               items.push_back (CheckMenuElem (_("Inline Display")));
+               Gtk::CheckMenuItem* c = dynamic_cast<Gtk::CheckMenuItem*> (&items.back ());
+               c->set_active (_plugin_display->is_visible ());
+               c->signal_toggled().connect (sigc::mem_fun (*this, &ProcessorEntry::toggle_inline_display_visibility));
+               items.push_back (SeparatorElem ());
+       }
+
        items.push_back (
                MenuElem (_("Show All Controls"), sigc::mem_fun (*this, &ProcessorEntry::show_all_controls))
                );
@@ -606,6 +649,17 @@ ProcessorEntry::build_controls_menu ()
        return menu;
 }
 
+void
+ProcessorEntry::toggle_inline_display_visibility ()
+{
+       if (_plugin_display->is_visible ()) {
+               _plugin_display->hide();
+       } else {
+               _plugin_display->show();
+       }
+       _parent->update_gui_object_state (this);
+}
+
 void
 ProcessorEntry::toggle_control_visibility (Control* c)
 {
@@ -1144,6 +1198,88 @@ ProcessorEntry::RoutingIcon::on_expose_event (GdkEventExpose* ev)
        return true;
 }
 
+
+ProcessorEntry::PluginDisplay::PluginDisplay (boost::shared_ptr<ARDOUR::Plugin> p, uint32_t max_height)
+       : _plug (p)
+       , _max_height (max_height)
+       , _cur_height (1)
+{
+       set_name ("processor prefader");
+       _plug->QueueDraw.connect (_qdraw_connection, invalidator (*this),
+                       boost::bind (&Gtk::Widget::queue_draw, this), gui_context ());
+}
+
+void
+ProcessorEntry::PluginDisplay::on_size_request (Gtk::Requisition* req)
+{
+       req->width = 56;
+       req->height = _cur_height;
+}
+
+bool
+ProcessorEntry::PluginDisplay::on_expose_event (GdkEventExpose* ev)
+{
+       Gtk::Allocation a = get_allocation();
+       double const width = a.get_width();
+       double const height = a.get_height();
+
+       void* csf = _plug->render_inline_display (width, _max_height);
+
+       cairo_surface_t* surf = NULL;
+       if (csf) {
+               surf = (cairo_surface_t*) csf;
+       }
+
+       if (!surf) {
+               hide ();
+               if (_cur_height != 1) {
+                       _cur_height = 1;
+                       queue_resize ();
+               }
+               return true;
+       }
+
+       cairo_t* cr = gdk_cairo_create (get_window()->gobj());
+       cairo_rectangle (cr, ev->area.x, ev->area.y, ev->area.width, ev->area.height);
+       cairo_clip (cr);
+
+       Gdk::Color const bg = get_style()->get_bg (STATE_NORMAL);
+       cairo_set_source_rgb (cr, bg.get_red_p (), bg.get_green_p (), bg.get_blue_p ());
+       cairo_rectangle (cr, 0, 0, width, height);
+       cairo_fill (cr);
+
+       if (surf) {
+               cairo_save (cr);
+               cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+               Gtkmm2ext::rounded_rectangle (cr, .5, -1.5, width - 1, height + 1, 7);
+               cairo_clip (cr);
+
+               const double xc = floor ((width - cairo_image_surface_get_width (surf)) * .5);
+               const double sh = cairo_image_surface_get_height (surf);
+               uint32_t shm = std::min (_max_height, (uint32_t) ceil (sh));
+               if (shm != _cur_height) {
+                       _cur_height = shm;
+                       queue_resize ();
+               }
+               cairo_set_source_surface(cr, surf, xc, 0);
+               cairo_paint (cr);
+               cairo_restore (cr);
+       }
+
+       bool failed = false;
+       std::string name = get_name();
+       ArdourCanvas::Color fill_color = UIConfiguration::instance().color (string_compose ("%1: fill active", name), &failed);
+
+       Gtkmm2ext::rounded_rectangle (cr, .5, -1.5, width - 1, height + 1, 7);
+       cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+       cairo_set_line_width(cr, 1.0);
+       ArdourCanvas::set_source_rgb_a (cr, fill_color, 1.0);
+       cairo_stroke (cr);
+
+       cairo_destroy(cr);
+       return true;
+}
+
 static std::list<Gtk::TargetEntry> drop_targets()
 {
        std::list<Gtk::TargetEntry> tmp;

diff --git a/gtk2_ardour/processor_box.h b/gtk2_ardour/processor_box.h
index 98d194fbde76f627abffdb6efdafec105717e4a1..807af85ddc28d4bc0d3b532115e973147967e515 100644 (file)
--- a/gtk2_ardour/processor_box.h
+++ b/gtk2_ardour/processor_box.h
@@ -216,9 +216,22 @@ private:
 
        std::list<Control*> _controls;
 
+       void toggle_inline_display_visibility ();
        void toggle_control_visibility (Control *);
        void toggle_panner_link ();
 
+       class PluginDisplay : public Gtk::DrawingArea {
+       public:
+               PluginDisplay(boost::shared_ptr<ARDOUR::Plugin>, uint32_t max_height = 80);
+       private:
+               bool on_expose_event (GdkEventExpose *);
+               void on_size_request (Gtk::Requisition* req);
+               boost::shared_ptr<ARDOUR::Plugin> _plug;
+               PBD::ScopedConnection _qdraw_connection;
+               uint32_t _max_height;
+               uint32_t _cur_height;
+       };
+
        class PortIcon : public Gtk::DrawingArea {
        public:
                PortIcon(bool input);
@@ -252,6 +265,7 @@ protected:
        RoutingIcon _routing_icon;
        PortIcon _input_icon;
        PortIcon _output_icon;
+       PluginDisplay *_plugin_display ;
 };
 
 class PluginInsertProcessorEntry : public ProcessorEntry

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index d0545b8cb9203501f8f02b06a0095467f731ebcc..5e5e7ca7fb81e9b1cbb706f819d462471406e42e 100644 (file)
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -2908,6 +2908,16 @@ if (!Profile->get_mixbus()) {
                     sigc::mem_fun (*_rc_config, &RCConfiguration::get_open_gui_after_adding_plugin),
                     sigc::mem_fun (*_rc_config, &RCConfiguration::set_open_gui_after_adding_plugin)
                     ));
+
+#ifdef LV2_SUPPORT
+       add_option (_("Plugins"),
+            new BoolOption (
+                    "show-inline-display-by-default,",
+                    _("Show Plugin Inline Display on Mixerstrip by default"),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::get_show_inline_display_by_default),
+                    sigc::mem_fun (*_rc_config, &RCConfiguration::set_show_inline_display_by_default)
+                    ));
+#endif
 #endif
 
        /* INTERFACE */