#include <gtkmm2ext/choice.h>
#include <gtkmm2ext/utils.h>
#include <gtkmm2ext/doi.h>
+#include <gtkmm2ext/rgb_macros.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/panner_shell.h"
#include "ardour/plugin_insert.h"
#include "ardour/port_insert.h"
#include "ardour/profile.h"
#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"
RefPtr<Action> ProcessorBox::rename_action;
RefPtr<Action> ProcessorBox::edit_action;
RefPtr<Action> ProcessorBox::edit_generic_action;
-Glib::RefPtr<Gdk::Pixbuf> ProcessorEntry::_slider_pixbuf;
+
+static const uint32_t audio_port_color = 0x4A8A0EFF; // Green
+static const uint32_t midi_port_color = 0x960909FF; //Red
ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr<Processor> p, Width w)
: _button (ArdourButton::led_default_elements)
, _processor (p)
, _width (w)
, _visual_state (Gtk::STATE_NORMAL)
+ , _input_icon(true)
+ , _output_icon(false)
{
_vbox.show ();
if (_processor) {
+ _vbox.pack_start (_routing_icon);
+ _vbox.pack_start (_input_icon);
_vbox.pack_start (_button, true, true);
+ _vbox.pack_end (_output_icon);
+
+ _button.set_active (_processor->active());
+
+ _routing_icon.set_no_show_all(true);
+ _input_icon.set_no_show_all(true);
- if (_processor->active()) {
- _button.set_active_state (Gtkmm2ext::Active);
- }
-
_button.show ();
-
+ _routing_icon.set_visible(false);
+ _input_icon.hide();
+ _output_icon.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());
+ _processor->ConfigurationChanged.connect (config_connection, invalidator (*this), boost::bind (&ProcessorEntry::processor_configuration_changed, this, _1, _2), 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));
+ std::string label = _processor->describe_parameter (*i);
+
+ if (boost::dynamic_pointer_cast<Send> (_processor)) {
+ label = _("Send");
+ } else if (boost::dynamic_pointer_cast<Return> (_processor)) {
+ label = _("Return");
+ }
+
+ Control* c = new Control (_processor->automation_control (*i), label);
+
_controls.push_back (c);
if (boost::dynamic_pointer_cast<Amp> (_processor) == 0) {
/* Add non-Amp controls to the processor box */
_vbox.pack_start (c->box);
}
-
- if (boost::dynamic_pointer_cast<Send> (_processor)) {
- /* Don't label send faders */
- c->hide_label ();
- }
}
+ _input_icon.set_ports(_processor->input_streams());
+ _output_icon.set_ports(_processor->output_streams());
+
+ _routing_icon.set_sources(_processor->input_streams());
+ _routing_icon.set_sinks(_processor->output_streams());
+
setup_tooltip ();
setup_visuals ();
} else {
}
void
-ProcessorEntry::set_position (Position p)
+ProcessorEntry::set_position (Position p, uint32_t num)
{
_position = p;
+ _position_num = num;
+
+ if (_position_num == 0 || _routing_icon.get_visible()) {
+ _input_icon.show();
+ } else {
+ _input_icon.hide();
+ }
+
setup_visuals ();
}
ProcessorEntry::set_enum_width (Width w)
{
_width = w;
+ _button.set_text (name (_width));
}
void
ProcessorEntry::led_clicked()
{
if (_processor) {
- if (_button.active_state() == Gtkmm2ext::Active) {
+ if (_button.get_active ()) {
_processor->deactivate ();
} else {
_processor->activate ();
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());
}
}
}
}
+void
+ProcessorEntry::processor_configuration_changed (const ChanCount in, const ChanCount out)
+{
+ _input_icon.set_ports(in);
+ _output_icon.set_ports(out);
+ _routing_icon.set_sources(in);
+ _routing_icon.set_sinks(out);
+ _input_icon.queue_draw();
+ _output_icon.queue_draw();
+ _routing_icon.queue_draw();
+}
+
void
ProcessorEntry::setup_tooltip ()
{
- ARDOUR_UI::instance()->set_tip (_button, name (Wide));
+ if (_processor) {
+ boost::shared_ptr<PluginInsert> pi = boost::dynamic_pointer_cast<PluginInsert> (_processor);
+ if (pi) {
+ std::string postfix = "";
+ uint32_t replicated;
+ if ((replicated = pi->get_count()) > 1) {
+ postfix = string_compose(_("\nThis mono plugin has been replicated %1 times."), replicated);
+ }
+ if (pi->plugin()->has_editor()) {
+ ARDOUR_UI::instance()->set_tip (_button,
+ string_compose (_("<b>%1</b>\nDouble-click to show GUI.\nAlt+double-click to show generic GUI.%2"), name (Wide), postfix));
+ } else {
+ ARDOUR_UI::instance()->set_tip (_button,
+ string_compose (_("<b>%1</b>\nDouble-click to show generic GUI.%2"), name (Wide), postfix));
+ }
+ return;
+ }
+ }
+ ARDOUR_UI::instance()->set_tip (_button, string_compose ("<b>%1</b>", name (Wide)));
}
string
}
} else {
+ boost::shared_ptr<ARDOUR::PluginInsert> pi;
+ uint32_t replicated;
+ if ((pi = boost::dynamic_pointer_cast<ARDOUR::PluginInsert> (_processor)) != 0
+ && (replicated = pi->get_count()) > 1)
+ {
+ name_display += string_compose(_("(%1x1) "), replicated);
+ }
switch (w) {
case Wide:
return name_display;
}
-void
-ProcessorEntry::setup_slider_pix ()
-{
- _slider_pixbuf = ::get_icon ("fader_belt_h_thin");
- assert (_slider_pixbuf);
-}
-
-void
-ProcessorEntry::set_pixel_width (int p)
-{
- for (list<Control*>::iterator i = _controls.begin(); i != _controls.end(); ++i) {
- (*i)->set_pixel_width (p);
- }
-}
-
void
ProcessorEntry::show_all_controls ()
{
_parent->update_gui_object_state (this);
}
-ProcessorEntry::Control::Control (Glib::RefPtr<Gdk::Pixbuf> s, boost::shared_ptr<AutomationControl> c, string const & n)
+Menu *
+ProcessorEntry::build_send_options_menu ()
+{
+ using namespace Menu_Helpers;
+ Menu* menu = manage (new Menu);
+ MenuList& items = menu->items ();
+
+ boost::shared_ptr<Send> send = boost::dynamic_pointer_cast<Send> (_processor);
+ if (send) {
+
+ items.push_back (CheckMenuElem (_("Link panner controls")));
+ CheckMenuItem* c = dynamic_cast<CheckMenuItem*> (&items.back ());
+ c->set_active (send->panner_shell()->is_linked_to_route());
+ c->signal_toggled().connect (sigc::mem_fun (*this, &ProcessorEntry::toggle_panner_link));
+
+ }
+ return menu;
+}
+
+void
+ProcessorEntry::toggle_panner_link ()
+{
+ boost::shared_ptr<Send> send = boost::dynamic_pointer_cast<Send> (_processor);
+ if (send) {
+ send->panner_shell()->set_linked_to_route(!send->panner_shell()->is_linked_to_route());
+ }
+}
+
+ProcessorEntry::Control::Control (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)
- , _button (ArdourButton::Element (ArdourButton::Text | ArdourButton::Indicator))
+ , _slider (&_adjustment, 0, 13, false)
+ , _slider_persistant_tooltip (&_slider)
+ , _button (ArdourButton::led_default_elements)
, _ignore_ui_adjustment (false)
, _visible (false)
, _name (n)
{
_slider.set_controllable (c);
+ box.set_padding(0, 0, 4, 4);
if (c->toggled()) {
_button.set_text (_name);
_button.set_led_left (true);
_button.set_name ("processor control button");
- box.pack_start (_button);
+ box.add (_button);
_button.show ();
_button.signal_clicked.connect (sigc::mem_fun (*this, &Control::button_clicked));
} else {
- box.pack_start (_label);
- _label.show ();
- _label.set_text (_name);
- box.pack_start (_slider);
+ _slider.set_name ("ProcessorControlSlider");
+ _slider.set_text (_name);
+
+ box.add (_slider);
_slider.show ();
double const lo = c->internal_to_interface (c->lower ());
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_pixel_width (int p)
+ProcessorEntry::Control::set_tooltip ()
{
- _slider.set_fader_length (p);
+ 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 ());
+ }
+
+ string sm = Glib::Markup::escape_text (s.str());
+
+ _slider_persistant_tooltip.set_tip (sm);
+ ARDOUR_UI::instance()->set_tip (_button, sm);
}
void
}
c->set_value (c->interface_to_internal (_adjustment.get_value ()));
+ set_tooltip ();
}
void
return;
}
- bool const n = _button.active_state() == Gtkmm2ext::Active ? false : true;
-
- c->set_value (n ? 1 : 0);
- _button.set_active_state (n ? Gtkmm2ext::Active : Gtkmm2ext::ActiveState (0));
+ bool const n = _button.get_active ();
+
+ c->set_value (n ? 0 : 1);
+ _button.set_active (!n);
+ set_tooltip ();
}
void
if (c->toggled ()) {
- _button.set_active_state (c->get_value() > 0.5 ? Gtkmm2ext::Active : Gtkmm2ext::ActiveState (0));
+ _button.set_active (c->get_value() > 0.5);
} else {
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;
}
}
-void
-ProcessorEntry::Control::hide_label ()
-{
- _label.hide ();
-}
-
string
ProcessorEntry::Control::state_id () const
{
return string_compose (X_("control %1"), c->id().to_s ());
}
-BlankProcessorEntry::BlankProcessorEntry (ProcessorBox* b, Width w)
- : ProcessorEntry (b, boost::shared_ptr<Processor>(), w)
-{
-}
-
PluginInsertProcessorEntry::PluginInsertProcessorEntry (ProcessorBox* b, boost::shared_ptr<ARDOUR::PluginInsert> p, Width w)
: ProcessorEntry (b, p, w)
, _plugin_insert (p)
{
- p->SplittingChanged.connect (
- _splitting_connection, invalidator (*this), ui_bind (&PluginInsertProcessorEntry::plugin_insert_splitting_changed, this), gui_context()
+ p->PluginIoReConfigure.connect (
+ _splitting_connection, invalidator (*this), boost::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 ();
+ _output_icon.set_ports(_plugin_insert->output_streams());
+ _routing_icon.set_splitting(_plugin_insert->splitting ());
+
+ ChanCount sources = _plugin_insert->input_streams();
+ ChanCount sinks = _plugin_insert->natural_input_streams();
+
+ /* replicated instances */
+ if (!_plugin_insert->splitting () && _plugin_insert->get_count() > 1) {
+ for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+ sinks.set(*t, sinks.get(*t) * _plugin_insert->get_count());
+ }
+ }
+ /* MIDI bypass */
+ if (_plugin_insert->natural_output_streams().n_midi() == 0 &&
+ _plugin_insert->output_streams().n_midi() == 1) {
+ sinks.set(DataType::MIDI, 1);
+ sources.set(DataType::MIDI, 1);
+ }
+
+ _input_icon.set_ports(sinks);
+ _routing_icon.set_sinks(sinks);
+ _routing_icon.set_sources(sources);
+
+ if (_plugin_insert->splitting () ||
+ _plugin_insert->input_streams().n_audio() < _plugin_insert->natural_input_streams().n_audio()
+ )
+ {
+ _routing_icon.set_size_request (-1, 7);
+ _routing_icon.set_visible(true);
+ _input_icon.show();
} else {
- _splitting_icon.hide ();
+ _routing_icon.set_visible(false);
+ if (_position_num != 0) {
+ _input_icon.hide();
+ }
}
+
+ _input_icon.queue_draw();
+ _output_icon.queue_draw();
+ _routing_icon.queue_draw();
}
void
plugin_insert_splitting_changed ();
}
-void
-PluginInsertProcessorEntry::setup_visuals ()
+
+bool
+ProcessorEntry::PortIcon::on_expose_event (GdkEventExpose* ev)
{
- switch (_position) {
- case PreFader:
- _splitting_icon.set_name ("ProcessorPreFader");
- break;
+ cairo_t* cr = gdk_cairo_create (get_window()->gobj());
- case Fader:
- _splitting_icon.set_name ("ProcessorFader");
- break;
+ cairo_rectangle (cr, ev->area.x, ev->area.y, ev->area.width, ev->area.height);
+ cairo_clip (cr);
- case PostFader:
- _splitting_icon.set_name ("ProcessorPostFader");
- break;
+ Gtk::Allocation a = get_allocation();
+ double const width = a.get_width();
+ double const height = a.get_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);
+
+ if (_ports.n_total() > 1) {
+ for (uint32_t i = 0; i < _ports.n_total(); ++i) {
+ if (i < _ports.n_midi()) {
+ cairo_set_source_rgb (cr,
+ UINT_RGBA_R_FLT(midi_port_color),
+ UINT_RGBA_G_FLT(midi_port_color),
+ UINT_RGBA_B_FLT(midi_port_color));
+ } else {
+ cairo_set_source_rgb (cr,
+ UINT_RGBA_R_FLT(audio_port_color),
+ UINT_RGBA_G_FLT(audio_port_color),
+ UINT_RGBA_B_FLT(audio_port_color));
+ }
+ const float x = rintf(width * (.2f + .6f * i / (_ports.n_total() - 1.f)));
+ cairo_rectangle (cr, x-1, 0, 3, height);
+ cairo_fill(cr);
+ }
+ } else if (_ports.n_total() == 1) {
+ if (_ports.n_midi() == 1) {
+ cairo_set_source_rgb (cr,
+ UINT_RGBA_R_FLT(midi_port_color),
+ UINT_RGBA_G_FLT(midi_port_color),
+ UINT_RGBA_B_FLT(midi_port_color));
+ } else {
+ cairo_set_source_rgb (cr,
+ UINT_RGBA_R_FLT(audio_port_color),
+ UINT_RGBA_G_FLT(audio_port_color),
+ UINT_RGBA_B_FLT(audio_port_color));
+ }
+ const float x = rintf(width * .5);
+ cairo_rectangle (cr, x-1, 0, 3, height);
+ cairo_fill(cr);
+ cairo_stroke(cr);
}
- ProcessorEntry::setup_visuals ();
+ cairo_destroy(cr);
+ return true;
}
bool
-PluginInsertProcessorEntry::SplittingIcon::on_expose_event (GdkEventExpose* ev)
+ProcessorEntry::RoutingIcon::on_expose_event (GdkEventExpose* ev)
{
cairo_t* cr = gdk_cairo_create (get_window()->gobj());
- cairo_set_line_width (cr, 1);
+ cairo_rectangle (cr, ev->area.x, ev->area.y, ev->area.width, ev->area.height);
+ cairo_clip (cr);
- double const width = ev->area.width;
- double const height = ev->area.height;
+ cairo_set_line_width (cr, 1.0);
+ cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
+
+ Gtk::Allocation a = get_allocation();
+ double const width = a.get_width();
+ double const height = a.get_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 ());
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);
-
+ const uint32_t sources = _sources.n_total();
+ const uint32_t sinks = _sinks.n_total();
+
+ /* MIDI */
+ const uint32_t midi_sources = _sources.n_midi();
+ const uint32_t midi_sinks = _sinks.n_midi();
+
+ cairo_set_source_rgb (cr,
+ UINT_RGBA_R_FLT(midi_port_color),
+ UINT_RGBA_G_FLT(midi_port_color),
+ UINT_RGBA_B_FLT(midi_port_color));
+ if (midi_sources > 0 && midi_sinks > 0 && sinks > 1 && sources > 1) {
+ for (uint32_t i = 0 ; i < midi_sources; ++i) {
+ const float si_x = rintf(width * (.2f + .6f * i / (sinks - 1.f))) + .5f;
+ const float si_x0 = rintf(width * (.2f + .6f * i / (sources - 1.f))) + .5f;
+ cairo_move_to (cr, si_x, height);
+ cairo_curve_to (cr, si_x, 0, si_x0, height, si_x0, 0);
+ cairo_stroke (cr);
+ }
+ } else if (midi_sources == 1 && midi_sinks == 1 && sinks == 1 && sources == 1) {
+ const float si_x = rintf(width * .5f) + .5f;
+ cairo_move_to (cr, si_x, height);
+ cairo_line_to (cr, si_x, 0);
+ cairo_stroke (cr);
+ }
+
+ /* AUDIO */
+ const uint32_t audio_sources = _sources.n_audio();
+ const uint32_t audio_sinks = _sinks.n_audio();
+ cairo_set_source_rgb (cr,
+ UINT_RGBA_R_FLT(audio_port_color),
+ UINT_RGBA_G_FLT(audio_port_color),
+ UINT_RGBA_B_FLT(audio_port_color));
+
+ if (_splitting) {
+ assert(audio_sinks > 1);
+ const float si_x0 = rintf(width * .5f) + .5f;
+ for (uint32_t i = midi_sinks; i < sinks; ++i) {
+ const float si_x = rintf(width * (.2f + .6f * i / (sinks - 1.f))) + .5f;
+ cairo_move_to (cr, si_x, height);
+ cairo_curve_to (cr, si_x, 0, si_x0, height, si_x0, 0);
+ cairo_stroke (cr);
+ }
+ } else if (audio_sources > 1) {
+ for (uint32_t i = 0 ; i < audio_sources; ++i) {
+ const float si_x = rintf(width * (.2f + .6f * (i + midi_sinks) / (sinks - 1.f))) + .5f;
+ const float si_x0 = rintf(width * (.2f + .6f * (i + midi_sources) / (sources - 1.f))) + .5f;
+ cairo_move_to (cr, si_x, height);
+ cairo_curve_to (cr, si_x, 0, si_x0, height, si_x0, 0);
+ cairo_stroke (cr);
+ }
+ } else if (audio_sources == 1 && audio_sinks == 1) {
+ const float si_x = rintf(width * .5f) + .5f;
+ cairo_move_to (cr, si_x, height);
+ cairo_line_to (cr, si_x, 0);
+ cairo_stroke (cr);
+ }
+ cairo_destroy(cr);
return true;
}
, _placement (-1)
, _visible_prefader_processors (0)
, _rr_selection(rsel)
+ , _redisplay_pending (false)
+
{
set_session (sess);
processor_display.set_flags (CAN_FOCUS);
processor_display.set_name ("ProcessorList");
- processor_display.set_size_request (48, -1);
processor_display.set_data ("processorbox", this);
- processor_display.set_spacing (2);
+ processor_display.set_size_request (48, -1);
+ processor_display.set_spacing (0);
processor_display.signal_enter_notify_event().connect (sigc::mem_fun(*this, &ProcessorBox::enter_notify), false);
processor_display.signal_leave_notify_event().connect (sigc::mem_fun(*this, &ProcessorBox::leave_notify), false);
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 ()
);
}
_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 (
);
_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 ();
`dropped on' processor */
list<ProcessorEntry*> c = processor_display.children ();
list<ProcessorEntry*>::iterator i = c.begin ();
- while (dynamic_cast<BlankProcessorEntry*> (*i)) {
- assert (i != c.end ());
- ++i;
- }
assert (i != c.end ());
p = (*i)->processor ();
}
}
-void
-ProcessorBox::update()
-{
- redisplay_processors ();
-}
-
void
ProcessorBox::set_width (Width w)
{
(*i)->set_enum_width (w);
}
- redisplay_processors ();
+ queue_resize ();
}
Gtk::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;
}
}
}
+ Gtk::MenuItem* send_menu_item = dynamic_cast<Gtk::MenuItem*>(ActionManager::get_widget("/ProcessorMenu/send_options"));
+ if (send_menu_item) {
+ if (single_selection) {
+ Menu* m = single_selection->build_send_options_menu ();
+ if (m && !m->items().empty()) {
+ send_menu_item->set_submenu (*m);
+ send_menu_item->set_sensitive (true);
+ } else {
+ gtk_menu_item_set_submenu (send_menu_item->gobj(), 0);
+ send_menu_item->set_sensitive (false);
+ }
+ }
+ }
+
/* Sensitise actions as approprioate */
cut_action->set_sensitive (can_cut());
const bool sensitive = !processor_display.selection().empty();
ActionManager::set_sensitive (ActionManager::plugin_selection_sensitive_actions, sensitive);
edit_action->set_sensitive (one_processor_can_be_edited ());
+ edit_generic_action->set_sensitive (one_processor_can_be_edited ());
boost::shared_ptr<PluginInsert> pi;
if (single_selection) {
}
/* allow editing with an Ardour-generated UI for plugin inserts with editors */
- edit_generic_action->set_sensitive (pi && pi->plugin()->has_editor ());
+ edit_action->set_sensitive (pi && pi->plugin()->has_editor ());
/* disallow rename for multiple selections, for plugin inserts and for the fader */
rename_action->set_sensitive (single_selection && !pi && !boost::dynamic_pointer_cast<Amp> (single_selection->processor ()));
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;
}
}
}
bool
-ProcessorBox::leave_notify (GdkEventCrossing* ev)
+ProcessorBox::leave_notify (GdkEventCrossing*)
{
return false;
}
}
}
+ProcessorWindowProxy*
+ProcessorBox::find_window_proxy (boost::shared_ptr<Processor> processor) const
+{
+ for (list<ProcessorWindowProxy*>::const_iterator i = _processor_window_info.begin(); i != _processor_window_info.end(); ++i) {
+ boost::shared_ptr<Processor> p = (*i)->processor().lock();
+
+ if (p && p == processor) {
+ return (*i);
+ }
+ }
+
+ return 0;
+}
+
+
+
bool
ProcessorBox::processor_button_press_event (GdkEventButton *ev, ProcessorEntry* child)
{
if (_session->engine().connected()) {
/* XXX giving an error message here is hard, because we may be in the midst of a button press */
- if (Config->get_use_plugin_own_gui ()) {
- toggle_edit_processor (processor);
+
+ if (!one_processor_can_be_edited ()) return true;
+
+ if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
+ generic_edit_processor (processor);
} else {
- toggle_edit_generic_processor (processor);
+ edit_processor (processor);
}
}
+
ret = true;
} else if (processor && ev->button == 1 && selected) {
dialog.add_button (Stock::OK, RESPONSE_ACCEPT);
dialog.set_name (X_("PluginIODialog"));
- dialog.set_position (Gtk::WIN_POS_MOUSE);
dialog.set_modal (true);
dialog.show_all ();
/* 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;
return;
}
- boost::shared_ptr<RouteList> rlist (new RouteList);
- rlist->push_back (_route);
-
- _session->add_internal_sends (target, PreFader, rlist);
+ _session->add_internal_send (target, _placement, _route);
}
void
_route->foreach_processor (sigc::bind (sigc::mem_fun (*this, &ProcessorBox::help_count_visible_prefader_processors),
&_visible_prefader_processors, &fader_seen));
- if (_visible_prefader_processors == 0) { // fader only
- BlankProcessorEntry* bpe = new BlankProcessorEntry (this, _width);
- bpe->set_pixel_width (get_allocation().get_width());
- processor_display.add_child (bpe);
- }
-
_route->foreach_processor (sigc::mem_fun (*this, &ProcessorBox::add_processor_to_display));
- for (list<ProcessorWindowProxy*>::iterator i = _processor_window_proxies.begin(); i != _processor_window_proxies.end(); ++i) {
+ for (ProcessorWindowProxies::iterator i = _processor_window_info.begin(); i != _processor_window_info.end(); ++i) {
(*i)->marked = false;
}
/* trim dead wood from the processor window proxy list */
- list<ProcessorWindowProxy*>::iterator i = _processor_window_proxies.begin();
- while (i != _processor_window_proxies.end()) {
- list<ProcessorWindowProxy*>::iterator j = i;
+ ProcessorWindowProxies::iterator i = _processor_window_info.begin();
+ while (i != _processor_window_info.end()) {
+ ProcessorWindowProxies::iterator j = i;
++j;
- if (!(*i)->marked) {
- ARDOUR_UI::instance()->remove_window_proxy (*i);
+ if (!(*i)->valid()) {
+
+ WM::Manager::instance().remove (*i);
delete *i;
- _processor_window_proxies.erase (i);
- }
+ _processor_window_info.erase (i);
+
+ } else if (!(*i)->marked) {
+
+ /* this processor is no longer part of this processor
+ * box.
+ *
+ * that could be because it was deleted or it could be
+ * because the route being displayed in the parent
+ * strip changed.
+ *
+ * The latter only happens with the editor mixer strip.
+ */
+
+ if (is_editor_mixer_strip()) {
+
+ /* editor mixer strip .. DO NOTHING
+ *
+ * note: the processor window stays visible if
+ * it is already visible
+ */
+ } else {
+ (*i)->hide ();
+ WM::Manager::instance().remove (*i);
+ delete *i;
+ _processor_window_info.erase (i);
+ }
+ }
i = j;
}
return;
}
- list<ProcessorWindowProxy*>::iterator i = _processor_window_proxies.begin ();
- while (i != _processor_window_proxies.end()) {
+ ProcessorWindowProxies::iterator i = _processor_window_info.begin ();
+ while (i != _processor_window_info.end()) {
boost::shared_ptr<Processor> t = (*i)->processor().lock ();
ProcessorWindowProxy* wp = new ProcessorWindowProxy (
string_compose ("%1-%2-%3", loc, _route->id(), p->id()),
- _session->extra_xml (X_("UI")),
this,
w);
+ const XMLNode* ui_xml = _session->extra_xml (X_("UI"));
+
+ if (ui_xml) {
+ wp->set_state (*ui_xml);
+ }
+
wp->marked = true;
/* if the processor already has an existing UI,
void* existing_ui = p->get_ui ();
if (existing_ui) {
- wp->set (static_cast<Gtk::Window*>(existing_ui));
+ wp->use_window (*(reinterpret_cast<Gtk::Window*>(existing_ui)));
}
- _processor_window_proxies.push_back (wp);
- ARDOUR_UI::instance()->add_window_proxy (wp);
+ _processor_window_info.push_back (wp);
+ WM::Manager::instance().register_window (wp);
}
void
e = new ProcessorEntry (this, processor, _width);
}
- e->set_pixel_width (get_allocation().get_width());
-
/* Set up this entry's state from the GUIObjectState */
XMLNode* proc = entry_gui_object_state (e);
if (proc) {
list<ProcessorEntry*> children = processor_display.children ();
bool pre_fader = true;
+ uint32_t num = 0;
for (list<ProcessorEntry*>::iterator i = children.begin(); i != children.end(); ++i) {
if (boost::dynamic_pointer_cast<Amp>((*i)->processor())) {
pre_fader = false;
- (*i)->set_position (ProcessorEntry::Fader);
+ (*i)->set_position (ProcessorEntry::Fader, num++);
} else {
if (pre_fader) {
- (*i)->set_position (ProcessorEntry::PreFader);
+ (*i)->set_position (ProcessorEntry::PreFader, num++);
} else {
- (*i)->set_position (ProcessorEntry::PostFader);
+ (*i)->set_position (ProcessorEntry::PostFader, num++);
}
}
}
dialog.add_button (Stock::OK, RESPONSE_ACCEPT);
dialog.set_name (X_("PluginIODialog"));
- dialog.set_position (Gtk::WIN_POS_MOUSE);
dialog.set_modal (true);
dialog.show_all ();
_rr_selection.set (node);
}
-void
-ProcessorBox::processors_up ()
-{
- /* unimplemented */
-}
-
-void
-ProcessorBox::processors_down ()
-{
- /* unimplemented */
-}
-
-
void
ProcessorBox::delete_processors (const ProcSelection& targets)
{
for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
XMLProperty const * type = (*niter)->property ("type");
+ XMLProperty const * role = (*niter)->property ("role");
assert (type);
boost::shared_ptr<Processor> p;
if (type->value() == "meter" ||
type->value() == "main-outs" ||
type->value() == "amp" ||
- type->value() == "intsend" || type->value() == "intreturn") {
- /* do not paste meter, main outs, amp or internal send/returns */
+ type->value() == "intreturn") {
+ /* do not paste meter, main outs, amp or internal returns */
continue;
- } else if (type->value() == "send") {
+ } else if (type->value() == "intsend") {
+
+ /* aux sends are OK, but those used for
+ * other purposes, are not.
+ */
+
+ assert (role);
+
+ if (role->value() != "Aux") {
+ continue;
+ }
XMLNode n (**niter);
- Send::make_unique (n, *_session);
- Send* s = new Send (*_session, _route->pannable(), _route->mute_master());
+ InternalSend* s = new InternalSend (*_session, _route->pannable(), _route->mute_master(),
+ boost::shared_ptr<Route>(), Delivery::Aux);
+
+ IOProcessor::prepare_for_reset (n, s->name());
+
if (s->set_state (n, Stateful::loading_state_version)) {
delete s;
return;
p.reset (s);
+ } else if (type->value() == "send") {
+
+ XMLNode n (**niter);
+ 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;
+ }
+
+ 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;
} 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
}
catch (...) {
- cerr << "plugin insert constructor failed\n";
+ error << _("plugin insert constructor failed") << endmsg;
}
}
}
}
-void
-ProcessorBox::activate_processor (boost::shared_ptr<Processor> r)
-{
- r->activate ();
-}
-
-void
-ProcessorBox::deactivate_processor (boost::shared_ptr<Processor> r)
-{
- r->deactivate ();
-}
-
void
ProcessorBox::get_selected_processors (ProcSelection& processors) const
{
}
if (
- (boost::dynamic_pointer_cast<Send> (processor) && !boost::dynamic_pointer_cast<InternalSend> (processor))||
+ boost::dynamic_pointer_cast<Send> (processor) ||
boost::dynamic_pointer_cast<Return> (processor) ||
boost::dynamic_pointer_cast<PluginInsert> (processor) ||
boost::dynamic_pointer_cast<PortInsert> (processor)
return (i != selection.end());
}
-void
-ProcessorBox::toggle_edit_processor (boost::shared_ptr<Processor> processor)
+Gtk::Window*
+ProcessorBox::get_editor_window (boost::shared_ptr<Processor> processor, bool use_custom)
{
boost::shared_ptr<Send> send;
boost::shared_ptr<InternalSend> internal_send;
boost::shared_ptr<PortInsert> port_insert;
Window* gidget = 0;
+ /* This method may or may not return a Window, but if it does not it
+ * will modify the parent mixer strip appearance layout to allow
+ * "editing" the @param processor that was passed in.
+ *
+ * So for example, if the processor is an Amp (gain), the parent strip
+ * will be forced back into a model where the fader controls the main gain.
+ * If the processor is a send, then we map the send controls onto the
+ * strip.
+ *
+ * Plugins and others will return a window for control.
+ */
+
if (boost::dynamic_pointer_cast<AudioTrack>(_route) != 0) {
if (boost::dynamic_pointer_cast<AudioTrack> (_route)->freeze_state() == AudioTrack::Frozen) {
- return;
+ return 0;
}
}
} else if ((send = boost::dynamic_pointer_cast<Send> (processor)) != 0) {
if (!_session->engine().connected()) {
- return;
+ return 0;
}
if (boost::dynamic_pointer_cast<InternalSend> (processor) == 0) {
- SendUIWindow* w = new SendUIWindow (send, _session);
- w->show ();
- } else {
- /* assign internal send to main fader */
- if (_parent_strip) {
- if (_parent_strip->current_delivery() == send) {
- _parent_strip->revert_to_default_display ();
- } else {
- _parent_strip->show_send(send);
- }
- }
+
+ gidget = new SendUIWindow (send, _session);
}
} else if ((retrn = boost::dynamic_pointer_cast<Return> (processor)) != 0) {
if (boost::dynamic_pointer_cast<InternalReturn> (retrn)) {
/* no GUI for these */
- return;
+ return 0;
}
if (!_session->engine().connected()) {
- return;
+ return 0;
}
boost::shared_ptr<Return> retrn = boost::dynamic_pointer_cast<Return> (processor);
/* these are both allowed to be null */
- Container* toplevel = get_toplevel();
- Window* win = dynamic_cast<Gtk::Window*>(toplevel);
-
Window* w = get_processor_ui (plugin_insert);
if (w == 0) {
-
- plugin_ui = new PluginUIWindow (win, plugin_insert);
+ plugin_ui = new PluginUIWindow (plugin_insert, false, use_custom);
plugin_ui->set_title (generate_processor_title (plugin_insert));
set_processor_ui (plugin_insert, plugin_ui);
} else {
plugin_ui = dynamic_cast<PluginUIWindow *> (w);
- plugin_ui->set_parent (win);
}
gidget = plugin_ui;
} else if ((port_insert = boost::dynamic_pointer_cast<PortInsert> (processor)) != 0) {
if (!_session->engine().connected()) {
- MessageDialog msg ( _("Not connected to JACK - no I/O changes are possible"));
+ MessageDialog msg ( _("Not connected to audio engine - no I/O changes are possible"));
msg.run ();
- return;
+ return 0;
}
PortInsertWindow *io_selector;
gidget = io_selector;
}
- if (gidget) {
- if (gidget->is_visible()) {
- gidget->hide ();
- } else {
- gidget->show_all ();
- gidget->present ();
- }
- }
+ return gidget;
}
-/** Toggle a generic (Ardour-generated) plugin UI */
-void
-ProcessorBox::toggle_edit_generic_processor (boost::shared_ptr<Processor> processor)
+Gtk::Window*
+ProcessorBox::get_generic_editor_window (boost::shared_ptr<Processor> processor)
{
boost::shared_ptr<PluginInsert> plugin_insert
= boost::dynamic_pointer_cast<PluginInsert>(processor);
+
if (!plugin_insert) {
- return;
+ return 0;
}
- Container* toplevel = get_toplevel();
- Window* win = dynamic_cast<Gtk::Window*>(toplevel);
- PluginUIWindow* plugin_ui = new PluginUIWindow(win, plugin_insert, true, false);
- plugin_ui->set_title(generate_processor_title (plugin_insert));
+ PluginUIWindow* win = new PluginUIWindow (plugin_insert, true, false);
+ win->set_title (generate_processor_title (plugin_insert));
- if (plugin_ui->is_visible()) {
- plugin_ui->hide();
- } else {
- plugin_ui->show_all();
- plugin_ui->present();
- }
+ return win;
}
void
act = ActionManager::register_action (popup_act_grp, X_("newinsert"), _("New Insert"),
sigc::ptr_fun (ProcessorBox::rb_choose_insert));
- ActionManager::jack_sensitive_actions.push_back (act);
+ ActionManager::engine_sensitive_actions.push_back (act);
act = ActionManager::register_action (popup_act_grp, X_("newsend"), _("New External Send ..."),
sigc::ptr_fun (ProcessorBox::rb_choose_send));
- ActionManager::jack_sensitive_actions.push_back (act);
+ ActionManager::engine_sensitive_actions.push_back (act);
ActionManager::register_action (popup_act_grp, X_("newaux"), _("New Aux Send ..."));
ActionManager::register_action (popup_act_grp, X_("controls"), _("Controls"));
+ ActionManager::register_action (popup_act_grp, X_("send_options"), _("Send Options"));
ActionManager::register_action (popup_act_grp, X_("clear"), _("Clear (all)"),
sigc::ptr_fun (ProcessorBox::rb_clear));
sigc::ptr_fun (ProcessorBox::rb_edit));
edit_generic_action = ActionManager::register_action (
- popup_act_grp, X_("edit-generic"), _("Edit with basic controls..."),
+ popup_act_grp, X_("edit-generic"), _("Edit with generic controls..."),
sigc::ptr_fun (ProcessorBox::rb_edit_generic));
ActionManager::add_action_group (popup_act_grp);
return;
}
- _current_processor_box->for_selected_processors (&ProcessorBox::toggle_edit_generic_processor);
+ _current_processor_box->for_selected_processors (&ProcessorBox::generic_edit_processor);
}
void
return;
}
- _current_processor_box->for_selected_processors (&ProcessorBox::toggle_edit_processor);
+ _current_processor_box->for_selected_processors (&ProcessorBox::edit_processor);
+}
+
+bool
+ProcessorBox::edit_aux_send (boost::shared_ptr<Processor> processor)
+{
+ if (boost::dynamic_pointer_cast<InternalSend> (processor) == 0) {
+ return false;
+ }
+
+ if (_parent_strip) {
+ boost::shared_ptr<Send> send = boost::dynamic_pointer_cast<Send> (processor);
+ if (_parent_strip->current_delivery() == send) {
+ _parent_strip->revert_to_default_display ();
+ } else {
+ _parent_strip->show_send(send);
+ }
+ }
+ return true;
+}
+
+void
+ProcessorBox::edit_processor (boost::shared_ptr<Processor> processor)
+{
+ if (!processor) {
+ return;
+ }
+ if (edit_aux_send (processor)) {
+ return;
+ }
+
+ ProcessorWindowProxy* proxy = find_window_proxy (processor);
+
+ if (proxy) {
+ proxy->set_custom_ui_mode (true);
+ proxy->toggle ();
+ }
+}
+
+void
+ProcessorBox::generic_edit_processor (boost::shared_ptr<Processor> processor)
+{
+ if (!processor) {
+ return;
+ }
+ if (edit_aux_send (processor)) {
+ return;
+ }
+
+ ProcessorWindowProxy* proxy = find_window_proxy (processor);
+
+ if (proxy) {
+ proxy->set_custom_ui_mode (false);
+ proxy->toggle ();
+ }
}
void
maker += " ...";
}
- return string_compose(_("%1: %2 (by %3)"), _route->name(), pi->name(), maker);
-}
-
-void
-ProcessorBox::on_size_allocate (Allocation& a)
-{
- HBox::on_size_allocate (a);
+ SessionObject* owner = pi->owner();
- list<ProcessorEntry*> children = processor_display.children ();
- for (list<ProcessorEntry*>::const_iterator i = children.begin(); i != children.end(); ++i) {
- (*i)->set_pixel_width (a.get_width ());
+ if (owner) {
+ return string_compose(_("%1: %2 (by %3)"), owner->name(), pi->name(), maker);
+ } else {
+ return string_compose(_("%1 (by %2)"), pi->name(), maker);
}
}
Window *
ProcessorBox::get_processor_ui (boost::shared_ptr<Processor> p) const
{
- list<ProcessorWindowProxy*>::const_iterator i = _processor_window_proxies.begin ();
- while (i != _processor_window_proxies.end()) {
+ list<ProcessorWindowProxy*>::const_iterator i = _processor_window_info.begin ();
+ while (i != _processor_window_info.end()) {
boost::shared_ptr<Processor> t = (*i)->processor().lock ();
if (t && t == p) {
return (*i)->get ();
void
ProcessorBox::set_processor_ui (boost::shared_ptr<Processor> p, Gtk::Window* w)
{
- list<ProcessorWindowProxy*>::iterator i = _processor_window_proxies.begin ();
+ list<ProcessorWindowProxy*>::iterator i = _processor_window_info.begin ();
p->set_ui (w);
- while (i != _processor_window_proxies.end()) {
+ while (i != _processor_window_info.end()) {
boost::shared_ptr<Processor> t = (*i)->processor().lock ();
if (t && t == p) {
- (*i)->set (w);
+ (*i)->use_window (*w);
return;
}
entry->add_control_state (proc);
}
-ProcessorWindowProxy::ProcessorWindowProxy (
- string const & name,
- XMLNode const * node,
- ProcessorBox* box,
- boost::weak_ptr<Processor> processor
- )
- : WindowProxy<Gtk::Window> (name, node)
+bool
+ProcessorBox::is_editor_mixer_strip() const
+{
+ return _parent_strip && !_parent_strip->mixer_owned();
+}
+
+ProcessorWindowProxy::ProcessorWindowProxy (string const & name, ProcessorBox* box, boost::weak_ptr<Processor> processor)
+ : WM::ProxyBase (name, string())
, marked (false)
, _processor_box (box)
, _processor (processor)
+ , is_custom (false)
+ , want_custom (false)
+ , _valid (true)
+{
+ boost::shared_ptr<Processor> p = _processor.lock ();
+ if (!p) {
+ return;
+ }
+ p->DropReferences.connect (going_away_connection, MISSING_INVALIDATOR, boost::bind (&ProcessorWindowProxy::processor_going_away, this), gui_context());
+}
+
+ProcessorWindowProxy::~ProcessorWindowProxy()
{
+ /* processor window proxies do not own the windows they create with
+ * ::get(), so set _window to null before the normal WindowProxy method
+ * deletes it.
+ */
+ _window = 0;
+}
+void
+ProcessorWindowProxy::processor_going_away ()
+{
+ delete _window;
+ _window = 0;
+ _valid = false;
+ /* should be no real reason to do this, since the object that would
+ send DropReferences is about to be deleted, but lets do it anyway.
+ */
+ going_away_connection.disconnect();
}
+ARDOUR::SessionHandlePtr*
+ProcessorWindowProxy::session_handle()
+{
+ /* we don't care */
+ return 0;
+}
+
+bool
+ProcessorWindowProxy::valid() const
+{
+ return _valid;
+}
+
+XMLNode&
+ProcessorWindowProxy::get_state () const
+{
+ XMLNode *node;
+ node = &ProxyBase::get_state();
+ node->add_property (X_("custom-ui"), is_custom? X_("yes") : X_("no"));
+ return *node;
+}
void
-ProcessorWindowProxy::show ()
+ProcessorWindowProxy::set_state (const XMLNode& node)
+{
+ XMLNodeList children = node.children ();
+ XMLNodeList::const_iterator i = children.begin ();
+ while (i != children.end()) {
+ XMLProperty* prop = (*i)->property (X_("name"));
+ if ((*i)->name() == X_("Window") && prop && prop->value() == _name) {
+ break;
+ }
+ ++i;
+ }
+
+ if (i != children.end()) {
+ XMLProperty* prop;
+ if ((prop = (*i)->property (X_("custom-ui"))) != 0) {
+ want_custom = PBD::string_is_affirmative (prop->value ());
+ }
+ }
+
+ ProxyBase::set_state(node);
+}
+
+Gtk::Window*
+ProcessorWindowProxy::get (bool create)
{
boost::shared_ptr<Processor> p = _processor.lock ();
+
if (!p) {
- return;
+ return 0;
+ }
+ if (_window && (is_custom != want_custom)) {
+ /* drop existing window - wrong type */
+ drop_window ();
+ }
+
+ if (!_window) {
+ if (!create) {
+ return 0;
+ }
+
+ is_custom = want_custom;
+ _window = _processor_box->get_editor_window (p, is_custom);
+
+ if (_window) {
+ setup ();
+ }
}
- _processor_box->toggle_edit_processor (p);
+ return _window;
}
+void
+ProcessorWindowProxy::toggle ()
+{
+ if (_window && (is_custom != want_custom)) {
+ /* drop existing window - wrong type */
+ drop_window ();
+ }
+ is_custom = want_custom;
+
+ WM::ProxyBase::toggle ();
+}