#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"
#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;
ProcessorEntry::ProcessorEntry (ProcessorBox* parent, boost::shared_ptr<Processor> p, Width w)
: _button (ArdourButton::led_default_elements)
_vbox.pack_start (_button, true, true);
- if (_processor->active()) {
- _button.set_active_state (Gtkmm2ext::Active);
- }
-
+ _button.set_active (_processor->active());
_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 (_processor->automation_control (*i), _processor->describe_parameter (*i));
+
_controls.push_back (c);
if (boost::dynamic_pointer_cast<Amp> (_processor) == 0) {
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::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) {
+ 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."), name (Wide)));
+ } else {
+ ARDOUR_UI::instance()->set_tip (_button,
+ string_compose (_("<b>%1</b>\nDouble-click to show generic GUI."), name (Wide)));
+ }
+ return;
+ }
+ }
+ ARDOUR_UI::instance()->set_tip (_button, string_compose ("<b>%1</b>", name (Wide)));
}
string
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 ()
{
for (list<Control*>::iterator i = _controls.begin(); i != _controls.end(); ++i) {
items.push_back (CheckMenuElem ((*i)->name ()));
- CheckMenuItem* c = dynamic_cast<CheckMenuItem*> (&items.back ());
+ Gtk::CheckMenuItem* c = dynamic_cast<Gtk::CheckMenuItem*> (&items.back ());
c->set_active ((*i)->visible ());
c->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &ProcessorEntry::toggle_control_visibility), *i));
}
_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 (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 (&_adjustment, 0, 13, false)
+ , _slider_persistant_tooltip (&_slider)
, _button (ArdourButton::Element (ArdourButton::Text | ArdourButton::Indicator))
, _ignore_ui_adjustment (false)
, _visible (false)
} else {
- box.pack_start (_label);
- _label.show ();
- _label.set_text (_name);
+ _slider.set_name ("PluginSlider");
+ _slider.set_text (_name);
+
box.pack_start (_slider);
_slider.show ();
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());
+
+ ARDOUR_UI::instance()->set_tip (_label, sm);
+ _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);
}
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;
, _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);
{
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);
+
+ cairo_set_line_width (cr, 1.5);
+ cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
- double const width = ev->area.width;
- double const height = ev->area.height;
+ 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);
+ const float si_l = rint(width * 0.3) + .5;
+ const float si_c = rint(width * 0.5) + .5;
+ const float si_r = rint(width * 0.7) + .5;
+ const float si_m = rint(height * 0.5) + .5;
+
+ cairo_move_to (cr, si_l, height);
+ cairo_line_to (cr, si_l, si_m);
+ cairo_line_to (cr, si_r, si_m);
+ cairo_line_to (cr, si_r, height);
+
+ cairo_set_line_cap (cr, CAIRO_LINE_CAP_BUTT);
+ cairo_move_to (cr, si_c, si_m);
+ cairo_line_to (cr, si_c, 0);
cairo_stroke (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_size_request (48, -1);
processor_display.set_spacing (2);
processor_display.signal_enter_notify_event().connect (sigc::mem_fun(*this, &ProcessorBox::enter_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 ();
}
}
-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;
}
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 ()));
}
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;
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 (list<ProcessorWindowProxy*>::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 i = _processor_window_info.begin();
+ while (i != _processor_window_info.end()) {
list<ProcessorWindowProxy*>::iterator j = i;
++j;
if (!(*i)->marked) {
- ARDOUR_UI::instance()->remove_window_proxy (*i);
+ WM::Manager::instance().remove (*i);
delete *i;
- _processor_window_proxies.erase (i);
+ _processor_window_info.erase (i);
}
i = j;
return;
}
- list<ProcessorWindowProxy*>::iterator i = _processor_window_proxies.begin ();
- while (i != _processor_window_proxies.end()) {
+ list<ProcessorWindowProxy*>::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) {
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() == "intsend") {
+
+ /* aux sends are OK, but those used for
+ * other purposes, are not.
+ */
+
+ assert (role);
+
+ if (role->value() != "Aux") {
+ continue;
+ }
+
+ XMLNode n (**niter);
+ 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::make_unique (n, *_session);
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;
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 ..."));
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
return string_compose(_("%1: %2 (by %3)"), _route->name(), pi->name(), maker);
}
-void
-ProcessorBox::on_size_allocate (Allocation& a)
-{
- HBox::on_size_allocate (a);
-
- 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 ());
- }
-}
-
/** @param p Processor.
* @return the UI window for \a p.
*/
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)
+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)
{
}
+ARDOUR::SessionHandlePtr*
+ProcessorWindowProxy::session_handle()
+{
+ /* we don't care */
+ return 0;
+}
+
+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 ();
+}
projects / ardour.git / blobdiff