diff options
author | Julien "_FrnchFrgg_" RIVAUD <frnchfrgg@free.fr> | 2016-07-28 23:06:04 +0200 |
---|---|---|
committer | Julien "_FrnchFrgg_" RIVAUD <frnchfrgg@free.fr> | 2016-07-28 23:21:10 +0200 |
commit | d26c3d380d8fdd7b9cfef6e8e21aa8ad641b978e (patch) | |
tree | 5a0cf33c4667aa2be6495906ae305aa6a7a930a5 /gtk2_ardour/generic_pluginui.cc | |
parent | 535814cf987c4b2067de5afb44d2064321c61a8f (diff) |
GenericUI: replace early return by an else
Diffstat (limited to 'gtk2_ardour/generic_pluginui.cc')
-rw-r--r-- | gtk2_ardour/generic_pluginui.cc | 196 |
1 files changed, 98 insertions, 98 deletions
diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc index 0a1631736d..0b85beffca 100644 --- a/gtk2_ardour/generic_pluginui.cc +++ b/gtk2_ardour/generic_pluginui.cc @@ -740,124 +740,124 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter& param, update_control_display(control_ui); - return control_ui; - } - + } else { - /* create the controller */ + /* create the controller */ - /* XXX memory leak: SliderController not destroyed by ControlUI - * destructor, and manage() reports object hierarchy - * ambiguity. - */ - if (mcontrol) { - control_ui->controller = AutomationController::create(insert, mcontrol->parameter(), desc, mcontrol, use_knob); - } + /* XXX memory leak: SliderController not destroyed by ControlUI + * destructor, and manage() reports object hierarchy + * ambiguity. + */ + if (mcontrol) { + control_ui->controller = AutomationController::create(insert, mcontrol->parameter(), desc, mcontrol, use_knob); + } - /* XXX this code is not right yet, because it doesn't handle - the absence of bounds in any sensible fashion. - */ + /* XXX this code is not right yet, because it doesn't handle + the absence of bounds in any sensible fashion. + */ - Adjustment* adj = control_ui->controller->adjustment(); + Adjustment* adj = control_ui->controller->adjustment(); - if (desc.integer_step && !desc.toggled) { - control_ui->clickbox = new ClickBox (adj, "PluginUIClickBox", true); - Gtkmm2ext::set_size_request_to_display_given_text (*control_ui->clickbox, "g9999999", 2, 2); - if (desc.unit == ParameterDescriptor::MIDI_NOTE) { - control_ui->clickbox->set_printer (sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::midinote_printer), control_ui)); + if (desc.integer_step && !desc.toggled) { + control_ui->clickbox = new ClickBox (adj, "PluginUIClickBox", true); + Gtkmm2ext::set_size_request_to_display_given_text (*control_ui->clickbox, "g9999999", 2, 2); + if (desc.unit == ParameterDescriptor::MIDI_NOTE) { + control_ui->clickbox->set_printer (sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::midinote_printer), control_ui)); + } else { + control_ui->clickbox->set_printer (sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::integer_printer), control_ui)); + } + } else if (desc.toggled) { + control_ui->controller->set_size_request (req.height, req.height); + } else if (use_knob) { + control_ui->controller->set_size_request (req.height * 1.5, req.height * 1.5); } else { - control_ui->clickbox->set_printer (sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::integer_printer), control_ui)); + control_ui->controller->set_size_request (200, req.height); + control_ui->controller->set_name (X_("ProcessorControlSlider")); } - } else if (desc.toggled) { - control_ui->controller->set_size_request (req.height, req.height); - } else if (use_knob) { - control_ui->controller->set_size_request (req.height * 1.5, req.height * 1.5); - } else { - control_ui->controller->set_size_request (200, req.height); - control_ui->controller->set_name (X_("ProcessorControlSlider")); - } - if (!desc.integer_step && !desc.toggled && use_knob) { - control_ui->spin_box = manage (new ArdourSpinner (mcontrol, adj, insert)); - } + if (!desc.integer_step && !desc.toggled && use_knob) { + control_ui->spin_box = manage (new ArdourSpinner (mcontrol, adj, insert)); + } + + adj->set_value (mcontrol->internal_to_interface(value)); + + if (use_knob) { + set_size_request_to_display_given_text (control_ui->automate_button, "M", 2, 2); + + control_ui->label.set_alignment (0.5, 0.5); + control_ui->knobtable = manage (new Table()); + control_ui->pack_start(*control_ui->knobtable, true, true); + + if (control_ui->clickbox) { + control_ui->knobtable->attach (*control_ui->clickbox, 0, 2, 0, 1); + control_ui->knobtable->attach (control_ui->label, 0, 1, 1, 2, FILL, SHRINK); + control_ui->knobtable->attach (control_ui->automate_button, 1, 2, 1, 2, SHRINK, SHRINK, 2, 0); + } else if (control_ui->spin_box) { + ArdourKnob* knob = dynamic_cast<ArdourKnob*>(control_ui->controller->widget ()); + knob->set_tooltip_prefix (desc.label + ": "); + knob->set_printer (insert); + Alignment *align = manage (new Alignment (.5, .5, 0, 0)); + align->add (*control_ui->controller); + control_ui->knobtable->attach (*align, 0, 1, 0, 1, EXPAND, SHRINK, 1, 2); + control_ui->knobtable->attach (*control_ui->spin_box, 0, 2, 1, 2); + control_ui->knobtable->attach (control_ui->automate_button, 1, 2, 0, 1, SHRINK, SHRINK, 2, 0); + } else if (desc.toggled) { + Alignment *align = manage (new Alignment (.5, .5, 0, 0)); + align->add (*control_ui->controller); + control_ui->knobtable->attach (*align, 0, 2, 0, 1, EXPAND, SHRINK, 2, 2); + control_ui->knobtable->attach (control_ui->label, 0, 1, 1, 2, FILL, SHRINK); + control_ui->knobtable->attach (control_ui->automate_button, 1, 2, 1, 2, SHRINK, SHRINK, 2, 0); + } else { + control_ui->knobtable->attach (*control_ui->controller, 0, 2, 0, 1); + control_ui->knobtable->attach (control_ui->label, 0, 1, 1, 2, FILL, SHRINK); + control_ui->knobtable->attach (control_ui->automate_button, 1, 2, 1, 2, SHRINK, SHRINK, 2, 0); + } - adj->set_value (mcontrol->internal_to_interface(value)); - - if (use_knob) { - set_size_request_to_display_given_text (control_ui->automate_button, "M", 2, 2); - - control_ui->label.set_alignment (0.5, 0.5); - control_ui->knobtable = manage (new Table()); - control_ui->pack_start(*control_ui->knobtable, true, true); - - if (control_ui->clickbox) { - control_ui->knobtable->attach (*control_ui->clickbox, 0, 2, 0, 1); - control_ui->knobtable->attach (control_ui->label, 0, 1, 1, 2, FILL, SHRINK); - control_ui->knobtable->attach (control_ui->automate_button, 1, 2, 1, 2, SHRINK, SHRINK, 2, 0); - } else if (control_ui->spin_box) { - ArdourKnob* knob = dynamic_cast<ArdourKnob*>(control_ui->controller->widget ()); - knob->set_tooltip_prefix (desc.label + ": "); - knob->set_printer (insert); - Alignment *align = manage (new Alignment (.5, .5, 0, 0)); - align->add (*control_ui->controller); - control_ui->knobtable->attach (*align, 0, 1, 0, 1, EXPAND, SHRINK, 1, 2); - control_ui->knobtable->attach (*control_ui->spin_box, 0, 2, 1, 2); - control_ui->knobtable->attach (control_ui->automate_button, 1, 2, 0, 1, SHRINK, SHRINK, 2, 0); - } else if (desc.toggled) { - Alignment *align = manage (new Alignment (.5, .5, 0, 0)); - align->add (*control_ui->controller); - control_ui->knobtable->attach (*align, 0, 2, 0, 1, EXPAND, SHRINK, 2, 2); - control_ui->knobtable->attach (control_ui->label, 0, 1, 1, 2, FILL, SHRINK); - control_ui->knobtable->attach (control_ui->automate_button, 1, 2, 1, 2, SHRINK, SHRINK, 2, 0); } else { - control_ui->knobtable->attach (*control_ui->controller, 0, 2, 0, 1); - control_ui->knobtable->attach (control_ui->label, 0, 1, 1, 2, FILL, SHRINK); - control_ui->knobtable->attach (control_ui->automate_button, 1, 2, 1, 2, SHRINK, SHRINK, 2, 0); + + control_ui->pack_start (control_ui->label, true, true); + if (control_ui->clickbox) { + control_ui->pack_start (*control_ui->clickbox, false, false); + } else if (control_ui->spin_box) { + control_ui->pack_start (*control_ui->spin_box, false, false); + control_ui->pack_start (*control_ui->controller, false, false); + } else { + control_ui->pack_start (*control_ui->controller, false, false); + } + control_ui->pack_start (control_ui->automate_button, false, false); } - } else { - control_ui->pack_start (control_ui->label, true, true); - if (control_ui->clickbox) { - control_ui->pack_start (*control_ui->clickbox, false, false); - } else if (control_ui->spin_box) { - control_ui->pack_start (*control_ui->spin_box, false, false); - control_ui->pack_start (*control_ui->controller, false, false); + if (mcontrol->flags () & Controllable::NotAutomatable) { + control_ui->automate_button.set_sensitive (false); + set_tooltip(control_ui->automate_button, _("This control cannot be automated")); } else { - control_ui->pack_start (*control_ui->controller, false, false); + control_ui->automate_button.signal_clicked.connect (sigc::bind ( + sigc::mem_fun(*this, &GenericPluginUI::astate_clicked), + control_ui)); + mcontrol->alist()->automation_state_changed.connect ( + control_connections, + invalidator (*this), + boost::bind (&GenericPluginUI::automation_state_changed, this, control_ui), + gui_context()); + input_controls_with_automation.push_back (control_ui); } - control_ui->pack_start (control_ui->automate_button, false, false); - } + if (desc.toggled) { + control_ui->button = true; + ArdourButton* but = dynamic_cast<ArdourButton*>(control_ui->controller->widget ()); + assert (but); + but->set_name ("pluginui toggle"); + update_control_display(control_ui); + } - if (mcontrol->flags () & Controllable::NotAutomatable) { - control_ui->automate_button.set_sensitive (false); - set_tooltip(control_ui->automate_button, _("This control cannot be automated")); - } else { - control_ui->automate_button.signal_clicked.connect (sigc::bind ( - sigc::mem_fun(*this, &GenericPluginUI::astate_clicked), - control_ui)); - mcontrol->alist()->automation_state_changed.connect ( - control_connections, - invalidator (*this), - boost::bind (&GenericPluginUI::automation_state_changed, this, control_ui), - gui_context()); - input_controls_with_automation.push_back (control_ui); - } - - if (desc.toggled) { - control_ui->button = true; - ArdourButton* but = dynamic_cast<ArdourButton*>(control_ui->controller->widget ()); - assert (but); - but->set_name ("pluginui toggle"); - update_control_display(control_ui); - } + automation_state_changed (control_ui); - automation_state_changed (control_ui); + input_controls.push_back (control_ui); - input_controls.push_back (control_ui); + } - } else if (!is_input) { + } else { control_ui->display = manage (new EventBox); control_ui->display->set_name ("ParameterValueDisplay"); |