X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fprocessor_box.cc;h=18b4b50ef1958cb0cc90939be7908fa54db0e678;hb=a2fefe68db911fb514f463557d23213c8bae1fda;hp=ec29255d90464fc554176a71352d742a8e1ae012;hpb=f9e5e4360e54f5ff5327b4384ee451d86f8dec91;p=ardour.git diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index ec29255d90..18b4b50ef1 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -27,13 +27,12 @@ #include -#include "canvas/utils.h" - #include #include #include +#include "gtkmm2ext/colors.h" #include "gtkmm2ext/gtk_ui.h" #include "gtkmm2ext/menu_elems.h" #include "gtkmm2ext/utils.h" @@ -41,6 +40,7 @@ #include "gtkmm2ext/rgb_macros.h" #include "widgets/choice.h" +#include "widgets/prompter.h" #include "widgets/tooltips.h" #include "ardour/amp.h" @@ -113,6 +113,7 @@ RefPtr ProcessorBox::rename_action; RefPtr ProcessorBox::delete_action; RefPtr ProcessorBox::backspace_action; RefPtr ProcessorBox::manage_pins_action; +RefPtr ProcessorBox::disk_io_action; RefPtr ProcessorBox::edit_action; RefPtr ProcessorBox::edit_generic_action; RefPtr ProcessorBox::processor_box_actions; @@ -184,7 +185,7 @@ 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 (*this, pi->plugin(), + _plugin_display = new PluginInlineDisplay (*this, pi->plugin(), std::max (60.f, rintf(112.f * UIConfiguration::instance().get_ui_scale()))); } else { assert (boost::dynamic_pointer_cast(pi->plugin())); @@ -851,6 +852,9 @@ ProcessorEntry::Control::Control (boost::shared_ptr c, string _adjustment.set_page_increment (largestep); _slider.set_default_value (normal); + _slider.StartGesture.connect(sigc::mem_fun(*this, &Control::start_touch)); + _slider.StopGesture.connect(sigc::mem_fun(*this, &Control::end_touch)); + _adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &Control::slider_adjusted)); c->Changed.connect (_connections, invalidator (*this), boost::bind (&Control::control_changed, this), gui_context ()); if (c->alist ()) { @@ -881,7 +885,7 @@ ProcessorEntry::Control::set_tooltip () std::string tt = _name + ": " + ARDOUR::value_as_string (c->desc(), c->get_value ()); string sm = Gtkmm2ext::markup_escape_text (tt); _slider_persistant_tooltip.set_tip (sm); - ArdourWidgets::set_tooltip (_button, sm); + ArdourWidgets::set_tooltip (_button, Gtkmm2ext::markup_escape_text (sm)); } void @@ -901,6 +905,26 @@ ProcessorEntry::Control::slider_adjusted () set_tooltip (); } +void +ProcessorEntry::Control::start_touch () +{ + boost::shared_ptr c = _control.lock (); + if (!c) { + return; + } + c->start_touch (c->session().transport_frame()); +} + +void +ProcessorEntry::Control::end_touch () +{ + boost::shared_ptr c = _control.lock (); + if (!c) { + return; + } + c->stop_touch (c->session().transport_frame()); +} + void ProcessorEntry::Control::button_clicked () { @@ -1540,20 +1564,11 @@ ProcessorEntry::RoutingIcon::expose_output_map (cairo_t* cr, const double width, } } -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) +ProcessorEntry::PluginInlineDisplay::PluginInlineDisplay (ProcessorEntry& e, boost::shared_ptr p, uint32_t max_height) + : PluginDisplay (p, max_height) + , _entry (e) , _scroll (false) { - set_name ("processor prefader"); - add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); - _plug->DropReferences.connect (_death_connection, invalidator (*this), boost::bind (&PluginDisplay::plugin_going_away, this), gui_context()); - _plug->QueueDraw.connect (_qdraw_connection, invalidator (*this), - boost::bind (&Gtk::Widget::queue_draw, this), gui_context ()); - std::string postfix = string_compose(_("\n%1+double-click to toggle inline-display"), Keyboard::tertiary_modifier_name ()); if (_plug->has_editor()) { @@ -1565,15 +1580,9 @@ ProcessorEntry::PluginDisplay::PluginDisplay (ProcessorEntry& e, boost::shared_p } } -ProcessorEntry::PluginDisplay::~PluginDisplay () -{ - if (_surf) { - cairo_surface_destroy (_surf); - } -} bool -ProcessorEntry::PluginDisplay::on_button_press_event (GdkEventButton *ev) +ProcessorEntry::PluginInlineDisplay::on_button_press_event (GdkEventButton *ev) { assert (_entry.processor ()); @@ -1600,14 +1609,8 @@ ProcessorEntry::PluginDisplay::on_button_press_event (GdkEventButton *ev) return false; } -bool -ProcessorEntry::PluginDisplay::on_button_release_event (GdkEventButton *ev) -{ - return false; -} - void -ProcessorEntry::PluginDisplay::on_size_request (Requisition* req) +ProcessorEntry::PluginInlineDisplay::on_size_request (Requisition* req) { req->width = 56; req->height = _cur_height; @@ -1615,7 +1618,7 @@ ProcessorEntry::PluginDisplay::on_size_request (Requisition* req) void -ProcessorEntry::PluginDisplay::update_height_alloc (uint32_t inline_height) +ProcessorEntry::PluginInlineDisplay::update_height_alloc (uint32_t inline_height) { /* work-around scroll-bar + aspect ratio * show inline-view -> height changes -> scrollbar gets added @@ -1644,105 +1647,14 @@ ProcessorEntry::PluginDisplay::update_height_alloc (uint32_t inline_height) _scroll = sc; } -uint32_t -ProcessorEntry::PluginDisplay::render_inline (cairo_t* cr, uint32_t width) +void +ProcessorEntry::PluginInlineDisplay::display_frame (cairo_t* cr, double w, double h) { - Plugin::Display_Image_Surface* dis = _plug->render_inline_display (width, _max_height); - if (!dis) { - return 0; - } - - /* allocate a local image-surface, - * We cannot re-use the data via cairo_image_surface_create_for_data(), - * since pixman keeps a reference to it. - * we'd need to hand over the data and ha cairo_surface_destroy to free it. - * it might be possible to work around via cairo_surface_set_user_data(). - */ - if (!_surf - || dis->width != cairo_image_surface_get_width (_surf) - || dis->height != cairo_image_surface_get_height (_surf) - ) { - if (_surf) { - cairo_surface_destroy (_surf); - } - _surf = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, dis->width, dis->height); - } - - if (cairo_image_surface_get_stride (_surf) == dis->stride) { - memcpy (cairo_image_surface_get_data (_surf), dis->data, dis->stride * dis->height); - } else { - unsigned char *src = dis->data; - unsigned char *dst = cairo_image_surface_get_data (_surf); - const int dst_stride = cairo_image_surface_get_stride (_surf); - for (int y = 0; y < dis->height; ++y) { - memcpy (dst, src, dis->width * 4 /*ARGB32*/); - src += dis->stride; - dst += dst_stride; - } - } - - 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); - cairo_paint (cr); - - return dis->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(); - - 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); - - 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); - cairo_set_operator (cr, CAIRO_OPERATOR_OVER); - - uint32_t ht = render_inline (cr, width); - cairo_restore (cr); - - if (ht == 0) { - hide (); - if (_cur_height != 1) { - _cur_height = 1; - queue_resize (); - } - cairo_destroy (cr); - return true; - } else { - update_height_alloc (ht); - } - - 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; + Gtkmm2ext::rounded_rectangle (cr, .5, -1.5, w - 1, h + 1, 7); } ProcessorEntry::LuaPluginDisplay::LuaPluginDisplay (ProcessorEntry& e, boost::shared_ptr p, uint32_t max_height) - : PluginDisplay (e, p, max_height) + : PluginInlineDisplay (e, p, max_height) , _luaproc (p) , _lua_render_inline (0) { @@ -1775,7 +1687,7 @@ ProcessorEntry::LuaPluginDisplay::render_inline (cairo_t *cr, uint32_t width) #ifndef NDEBUG cerr << "LuaException:" << e.what () << endl; #endif - } + } catch (...) { } return 0; } @@ -2033,7 +1945,7 @@ ProcessorBox::object_drop (DnDVBox* source, ProcessorEntry* posi * otherwise we'll end up with duplicate ports-names. * (this needs a better solution which retains connections) */ - state.remove_nodes ("Processor"); + state.remove_nodes_and_delete ("Processor"); proc->set_state (state, Stateful::loading_state_version); boost::dynamic_pointer_cast(proc)->update_id (id); return; @@ -2194,7 +2106,6 @@ ProcessorBox::show_processor_menu (int arg) /* Sensitise actions as approprioate */ - const bool sensitive = !processor_display.selection().empty() && ! stub_processor_selected (); paste_action->set_sensitive (!_p_selection.processors.empty()); @@ -2212,6 +2123,11 @@ ProcessorBox::show_processor_menu (int arg) } manage_pins_action->set_sensitive (pi != 0); + if (boost::dynamic_pointer_cast(_route)) { + disk_io_action->set_sensitive (true); + } else { + disk_io_action->set_sensitive (false); + } /* allow editing with an Ardour-generated UI for plugin inserts with editors */ edit_action->set_sensitive (pi && pi->plugin()->has_editor ()); @@ -3222,7 +3138,7 @@ ProcessorBox::idle_delete_processor (boost::weak_ptr weak_processor) void ProcessorBox::rename_processor (boost::shared_ptr processor) { - ArdourPrompter name_prompter (true); + Prompter name_prompter (true); string result; name_prompter.set_title (_("Rename Processor")); name_prompter.set_prompt (_("New name:")); @@ -3396,7 +3312,7 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr * We really would want Stateful::ForceIDRegeneration here :( */ XMLNode state (**niter); - state.remove_nodes ("Processor"); + state.remove_nodes_and_delete ("Processor"); p->set_state (state, Stateful::current_state_version); boost::dynamic_pointer_cast(p)->update_id (id); @@ -3456,6 +3372,14 @@ ProcessorBox::ab_plugins () ab_direction = !ab_direction; } +void +ProcessorBox::set_disk_io_position (DiskIOPoint diop) +{ + boost::shared_ptr t = boost::dynamic_pointer_cast (_route); + if (t) { + t->set_disk_io_point (diop); + } +} void ProcessorBox::clear_processors () @@ -3736,6 +3660,12 @@ ProcessorBox::register_actions () processor_box_actions, X_("manage-pins"), _("Pin Connections..."), sigc::ptr_fun (ProcessorBox::rb_manage_pins)); + /* Disk IO stuff */ + disk_io_action = myactions.register_action (processor_box_actions, X_("disk-io-menu"), _("Disk I/O ...")); + myactions.register_action (processor_box_actions, X_("disk-io-prefader"), _("Pre-Fader."), sigc::bind (sigc::ptr_fun (ProcessorBox::rb_set_disk_io_position), DiskIOPreFader)); + myactions.register_action (processor_box_actions, X_("disk-io-postfader"), _("Post-Fader."), sigc::bind (sigc::ptr_fun (ProcessorBox::rb_set_disk_io_position), DiskIOPostFader)); + myactions.register_action (processor_box_actions, X_("disk-io-custom"), _("Custom."), sigc::bind (sigc::ptr_fun (ProcessorBox::rb_set_disk_io_position), DiskIOCustom)); + /* show editors */ edit_action = myactions.register_action ( processor_box_actions, X_("edit"), _("Edit..."), @@ -3768,6 +3698,16 @@ ProcessorBox::rb_ab_plugins () _current_processor_box->ab_plugins (); } +void +ProcessorBox::rb_set_disk_io_position (DiskIOPoint diop) +{ + if (_current_processor_box == 0) { + return; + } + + _current_processor_box->set_disk_io_position (diop); +} + void ProcessorBox::rb_manage_pins () {