X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fprocessor_box.cc;h=064e7358fdd25ee8ec38db750b6f660231f01aa8;hb=b502bbc61895d61c39bf240b47e8a3664be2c541;hp=a03b2ccb99b3f5eb44320ac2469d7c016e478bc4;hpb=bea909f8d03309322a5a5607a476f78a946edcdd;p=ardour.git diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index a03b2ccb99..064e7358fd 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -54,6 +54,7 @@ #include "ardour/route.h" #include "ardour/send.h" #include "ardour/session.h" +#include "ardour/dB.h" #include "actions.h" #include "ardour_dialog.h" @@ -94,10 +95,10 @@ RefPtr ProcessorBox::edit_action; Glib::RefPtr SendProcessorEntry::_slider; ProcessorEntry::ProcessorEntry (boost::shared_ptr p, Width w) - : _processor (p) + : _position (PreFader) + , _processor (p) , _width (w) , _visual_state (Gtk::STATE_NORMAL) - , _position (PreFader) { _hbox.pack_start (_active, false, false); _event_box.add (_name); @@ -105,6 +106,9 @@ ProcessorEntry::ProcessorEntry (boost::shared_ptr p, Width w) _vbox.pack_start (_hbox); _frame.add (_vbox); + /* without this, the border is mis-drawn on some systems */ + _vbox.set_border_width (1); + _name.set_alignment (0, 0.5); _name.set_text (name ()); _name.set_padding (2, 2); @@ -118,6 +122,13 @@ ProcessorEntry::ProcessorEntry (boost::shared_ptr p, Width w) _active.set_active (_processor->active ()); _active.signal_toggled().connect (sigc::mem_fun (*this, &ProcessorEntry::active_toggled)); + + _frame.show (); + _vbox.show (); + _hbox.show (); + _event_box.show (); + _name.show (); + _active.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()); @@ -297,6 +308,8 @@ SendProcessorEntry::SendProcessorEntry (boost::shared_ptr s, Width w) _fader.set_controllable (_send->amp()->gain_control ()); _vbox.pack_start (_fader); + _fader.show (); + _adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &SendProcessorEntry::gain_adjusted)); _send->amp()->gain_control()->Changed.connect (send_gain_connection, invalidator (*this), boost::bind (&SendProcessorEntry::show_gain, this), gui_context()); show_gain (); @@ -320,6 +333,12 @@ SendProcessorEntry::show_gain () _ignore_gain_change = true; _adjustment.set_value (value); _ignore_gain_change = false; + + stringstream s; + s.precision (1); + s.setf (ios::fixed, ios::floatfield); + s << accurate_coefficient_to_dB (_send->amp()->gain ()) << _("dB"); + _fader.set_tooltip_text (s.str ()); } } @@ -339,6 +358,88 @@ SendProcessorEntry::set_pixel_width (int p) _fader.set_fader_length (p); } +PluginInsertProcessorEntry::PluginInsertProcessorEntry (boost::shared_ptr p, Width w) + : ProcessorEntry (p, w) + , _plugin_insert (p) +{ + p->SplittingChanged.connect ( + _splitting_connection, invalidator (*this), ui_bind (&PluginInsertProcessorEntry::plugin_insert_splitting_changed, this), gui_context() + ); + + _splitting_icon.set_size_request (-1, 12); + + _vbox.pack_start (_splitting_icon); + _vbox.reorder_child (_splitting_icon, 0); + + plugin_insert_splitting_changed (); +} + +void +PluginInsertProcessorEntry::plugin_insert_splitting_changed () +{ + if (_plugin_insert->splitting ()) { + _splitting_icon.show (); + } else { + _splitting_icon.hide (); + } +} + +void +PluginInsertProcessorEntry::hide_things () +{ + plugin_insert_splitting_changed (); +} + +void +PluginInsertProcessorEntry::setup_visuals () +{ + switch (_position) { + case PreFader: + _splitting_icon.set_name ("ProcessorPreFader"); + break; + + case Fader: + _splitting_icon.set_name ("ProcessorFader"); + break; + + case PostFader: + _splitting_icon.set_name ("ProcessorPostFader"); + break; + } + + ProcessorEntry::setup_visuals (); +} + +bool +PluginInsertProcessorEntry::SplittingIcon::on_expose_event (GdkEventExpose* ev) +{ + cairo_t* cr = gdk_cairo_create (get_window()->gobj()); + + cairo_set_line_width (cr, 1); + + double const width = ev->area.width; + double const height = ev->area.height; + + 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); + + Gdk::Color const fg = get_style()->get_fg (STATE_NORMAL); + cairo_set_source_rgb (cr, fg.get_red_p (), fg.get_green_p (), fg.get_blue_p ()); + + cairo_move_to (cr, width * 0.3, height); + cairo_line_to (cr, width * 0.3, height * 0.5); + cairo_line_to (cr, width * 0.7, height * 0.5); + cairo_line_to (cr, width * 0.7, height); + cairo_move_to (cr, width * 0.5, height * 0.5); + cairo_line_to (cr, width * 0.5, 0); + cairo_stroke (cr); + + return true; +} + ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::function get_plugin_selector, RouteRedirectSelection& rsel, MixerStrip* parent, bool owner_is_mixer) : _parent_strip (parent) @@ -378,6 +479,9 @@ ProcessorBox::ProcessorBox (ARDOUR::Session* sess, boost::functionDeliveryChanged.connect ( _mixer_strip_connections, invalidator (*this), ui_bind (&ProcessorBox::mixer_strip_delivery_changed, this, _1), gui_context () @@ -534,13 +638,13 @@ ProcessorBox::show_processor_menu (gint arg) processor_menu = build_processor_menu (); } - Gtk::MenuItem* plugin_menu_item = dynamic_cast(ActionManager::get_widget("/processormenu/newplugin")); + Gtk::MenuItem* plugin_menu_item = dynamic_cast(ActionManager::get_widget("/ProcessorMenu/newplugin")); if (plugin_menu_item) { plugin_menu_item->set_submenu (*_get_plugin_selector()->plugin_menu()); } - Gtk::MenuItem* aux_menu_item = dynamic_cast(ActionManager::get_widget("/processormenu/newaux")); + Gtk::MenuItem* aux_menu_item = dynamic_cast(ActionManager::get_widget("/ProcessorMenu/newaux")); if (aux_menu_item) { Menu* m = build_possible_aux_menu(); @@ -771,11 +875,8 @@ ProcessorBox::processor_button_release_event (GdkEventButton *ev, ProcessorEntry Menu * ProcessorBox::build_processor_menu () { - processor_menu = dynamic_cast(ActionManager::get_widget("/processormenu") ); + processor_menu = dynamic_cast(ActionManager::get_widget("/ProcessorMenu") ); processor_menu->set_name ("ArdourContextMenu"); - - show_all_children(); - return processor_menu; } @@ -854,14 +955,14 @@ ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams) text += _("\nThis plugin has:\n"); if (has_midi) { uint32_t const n = p.get_info()->n_inputs.n_midi (); - text += string_compose (ngettext ("\t%1 MIDI input", "\t%1 MIDI inputs", n), n); + text += string_compose (ngettext ("\t%1 MIDI input\n", "\t%1 MIDI inputs\n", n), n); } if (has_audio) { uint32_t const n = p.get_info()->n_inputs.n_audio (); - text += string_compose (ngettext ("\t%1 audio input", "\t%1 audio inputs", n), n); + text += string_compose (ngettext ("\t%1 audio input\n", "\t%1 audio inputs\n", n), n); } - text += _("\nBut at the insertion point, there are:\n"); + text += _("\nbut at the insertion point, there are:\n"); if (has_midi) { uint32_t const n = streams.count.n_midi (); text += string_compose (ngettext ("\t%1 MIDI channel\n", "\t%1 MIDI channels\n", n), n); @@ -888,7 +989,7 @@ ProcessorBox::weird_plugin_dialog (Plugin& p, Route::ProcessorStreams streams) void ProcessorBox::choose_insert () { - boost::shared_ptr processor (new PortInsert (*_session, _route->mute_master())); + boost::shared_ptr processor (new PortInsert (*_session, _route->pannable(), _route->mute_master())); _route->add_processor (processor, _placement); } @@ -896,7 +997,7 @@ ProcessorBox::choose_insert () void ProcessorBox::choose_send () { - boost::shared_ptr send (new Send (*_session, _route->mute_master())); + boost::shared_ptr send (new Send (*_session, _route->pannable(), _route->mute_master())); /* make an educated guess at the initial number of outputs for the send */ ChanCount outs = (_session->master_out()) @@ -1032,8 +1133,6 @@ ProcessorBox::redisplay_processors () _route->foreach_processor (sigc::mem_fun (*this, &ProcessorBox::add_processor_to_display)); - build_processor_tooltip (processor_eventbox, _("Inserts, sends & plugins:")); - for (list::iterator i = _processor_window_proxies.begin(); i != _processor_window_proxies.end(); ++i) { (*i)->marked = false; } @@ -1104,6 +1203,17 @@ ProcessorBox::maybe_add_processor_to_ui_list (boost::weak_ptr w) w); 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 (); + + if (existing_ui) { + wp->set (static_cast(existing_ui)); + } + _processor_window_proxies.push_back (wp); ARDOUR_UI::instance()->add_window_proxy (wp); } @@ -1118,12 +1228,16 @@ ProcessorBox::add_processor_to_display (boost::weak_ptr p) } boost::shared_ptr send = boost::dynamic_pointer_cast (processor); + boost::shared_ptr plugin_insert = boost::dynamic_pointer_cast (processor); ProcessorEntry* e = 0; if (send) { e = new SendProcessorEntry (send, _width); + } else if (plugin_insert) { + e = new PluginInsertProcessorEntry (plugin_insert, _width); } else { e = new ProcessorEntry (processor, _width); } + e->set_pixel_width (get_allocation().get_width()); processor_display.add_child (e); } @@ -1500,7 +1614,7 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr XMLNode n (**niter); Send::make_unique (n, *_session); - Send* s = new Send (*_session, _route->mute_master()); + Send* s = new Send (*_session, _route->pannable(), _route->mute_master()); if (s->set_state (n, Stateful::loading_state_version)) { delete s; return; @@ -1522,6 +1636,14 @@ ProcessorBox::paste_processor_state (const XMLNodeList& nlist, boost::shared_ptr p.reset (r); + } 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)) { + return; + } + } else { /* XXX its a bit limiting to assume that everything else is a plugin. @@ -1806,7 +1928,7 @@ ProcessorBox::toggle_edit_processor (boost::shared_ptr processor) void ProcessorBox::register_actions () { - Glib::RefPtr popup_act_grp = Gtk::ActionGroup::create(X_("processormenu")); + Glib::RefPtr popup_act_grp = Gtk::ActionGroup::create(X_("ProcessorMenu")); Glib::RefPtr act; /* new stuff */ @@ -2137,6 +2259,9 @@ void ProcessorBox::set_processor_ui (boost::shared_ptr p, Gtk::Window* w) { list::iterator i = _processor_window_proxies.begin (); + + p->set_ui (w); + while (i != _processor_window_proxies.end()) { boost::shared_ptr t = (*i)->processor().lock (); if (t && t == p) { @@ -2174,6 +2299,15 @@ ProcessorBox::mixer_strip_delivery_changed (boost::weak_ptr w) } } +void +ProcessorBox::hide_things () +{ + list c = processor_display.children (); + for (list::iterator i = c.begin(); i != c.end(); ++i) { + (*i)->hide_things (); + } +} + ProcessorWindowProxy::ProcessorWindowProxy ( string const & name, XMLNode const * node,