_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), boost::bind (&ProcessorEntry::processor_property_changed, this, _1), gui_context());
ProcessorEntry::set_enum_width (Width w)
{
_width = w;
+ _button.set_text (name (_width));
}
void
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
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));
}
{
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;
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 ()));
if (processor && (Keyboard::is_edit_event (ev) || (ev->button == 1 && ev->type == GDK_2BUTTON_PRESS))) {
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 ()) {
- edit_processor (processor);
- } else {
+ if (!one_processor_can_be_edited ()) return true;
+
+ if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
generic_edit_processor (processor);
+ } else {
+ edit_processor (processor);
}
}
++j;
if (!(*i)->marked) {
- WindowManager::instance().remove (*i);
+ WM::Manager::instance().remove (*i);
delete *i;
_processor_window_info.erase (i);
}
}
_processor_window_info.push_back (wp);
- WindowManager::instance().register_window (wp);
+ WM::Manager::instance().register_window (wp);
}
void
}
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)
}
Gtk::Window*
-ProcessorBox::get_editor_window (boost::shared_ptr<Processor> processor)
+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<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) {
Window* w = get_processor_ui (plugin_insert);
if (w == 0) {
-
- plugin_ui = new PluginUIWindow (plugin_insert, false, Config->get_use_plugin_own_gui());
+ 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 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 0;
}
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);
_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 ();
}
}
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 ();
}
}
}
ProcessorWindowProxy::ProcessorWindowProxy (string const & name, ProcessorBox* box, boost::weak_ptr<Processor> processor)
- : WindowManager::ProxyBase (name, string())
+ : WM::ProxyBase (name, string())
, marked (false)
, _processor_box (box)
, _processor (processor)
, is_custom (false)
+ , want_custom (false)
{
}
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::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)
{
if (!p) {
return 0;
}
-
- if (_window && (is_custom != Config->get_use_plugin_own_gui ())) {
+ if (_window && (is_custom != want_custom)) {
/* drop existing window - wrong type */
drop_window ();
}
return 0;
}
- _window = _processor_box->get_editor_window (p);
- is_custom = Config->get_use_plugin_own_gui();
+ is_custom = want_custom;
+ _window = _processor_box->get_editor_window (p, is_custom);
if (_window) {
setup ();
void
ProcessorWindowProxy::toggle ()
{
- if (_window && (is_custom != Config->get_use_plugin_own_gui ())) {
+ if (_window && (is_custom != want_custom)) {
/* drop existing window - wrong type */
drop_window ();
}
+ is_custom = want_custom;
- WindowManager::ProxyBase::toggle ();
+ WM::ProxyBase::toggle ();
}
projects / ardour.git / blobdiff