#include <string>
#include <vector>
+#include <gtkmm/separator.h>
+
#include "pbd/stl_delete.h"
#include "pbd/unwind.h"
#include "pbd/xml++.h"
#include "pbd/failed_constructor.h"
-#include <gtkmm2ext/click_box.h>
-#include <gtkmm2ext/fastmeter.h>
-#include <gtkmm2ext/barcontroller.h>
-#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/doi.h>
-#include <gtkmm2ext/slider_controller.h>
-
#include "ardour/plugin.h"
#include "ardour/plugin_insert.h"
#include "ardour/session.h"
#include "ardour/value_as_string.h"
-#include "prompter.h"
+#include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/doi.h"
+
+#include "widgets/ardour_knob.h"
+#include "widgets/click_box.h"
+#include "widgets/fastmeter.h"
+#include "widgets/slider_controller.h"
+#include "widgets/tooltips.h"
+
#include "plugin_ui.h"
+#include "plugin_display.h"
#include "gui_thread.h"
#include "automation_controller.h"
-#include "ardour_knob.h"
#include "gain_meter.h"
#include "timers.h"
-#include "tooltips.h"
#include "ui_config.h"
#include "pbd/i18n.h"
using namespace ARDOUR;
using namespace PBD;
using namespace Gtkmm2ext;
+using namespace ArdourWidgets;
using namespace Gtk;
using namespace ARDOUR_UI_UTILS;
GenericPluginUI::build ()
{
std::vector<ControlUI *> control_uis;
- bool grid = true;
+ bool grid = plugin->parameter_count() > 0;
// Build a ControlUI for each control port
for (size_t i = 0; i < plugin->parameter_count(); ++i) {
} else {
delete output_table;
}
+
+ if (plugin->has_inline_display () && plugin->inline_display_in_gui ()) {
+ PluginDisplay* pd = manage (new PluginDisplay (plugin, 300));
+ hpacker.pack_end (*pd, true, true);
+ }
+ show_all();
+
}
void
layout->attach (*cui, cui->x0, cui->x1, cui->y0, cui->y1, FILL, SHRINK, 2, 2);
}
hpacker.pack_start (*layout, true, true);
+
+ if (plugin->has_inline_display () && plugin->inline_display_in_gui ()) {
+ PluginDisplay* pd = manage (new PluginDisplay (plugin, 300));
+ hpacker.pack_end (*pd, true, true);
+ }
}
GenericPluginUI::ControlUI::ControlUI (const Evoral::Parameter& p)
control_ui->label.set_name ("PluginParameterLabel");
control_ui->set_spacing (5);
- Gtk::Requisition req (control_ui->automate_button.size_request());
-
if (is_input) {
if (desc.datatype == Variant::PATH) {
i->second)));
}
+ control_ui->combo->set_controllable (mcontrol);
+
update_control_display(control_ui);
} else {
* destructor, and manage() reports object hierarchy
* ambiguity.
*/
- control_ui->controller = AutomationController::create(insert, mcontrol->parameter(), desc, mcontrol, use_knob);
+ control_ui->controller = AutomationController::create(mcontrol->parameter(), desc, mcontrol, use_knob);
/* Control UI's don't need the rapid timer workaround */
control_ui->controller->stop_updating ();
Adjustment* adj = control_ui->controller->adjustment();
if (desc.integer_step && !desc.toggled) {
- control_ui->clickbox = new ClickBox (adj, "PluginUIClickBox", true);
+ control_ui->clickbox = new ArdourWidgets::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));
}
+ control_ui->clickbox->set_controllable (mcontrol);
} else if (desc.toggled) {
ArdourButton* but = dynamic_cast<ArdourButton*> (control_ui->controller->widget());
assert(but);
but->set_tweaks(ArdourButton::Square);
} else if (use_knob) {
- control_ui->controller->set_size_request (req.height * 1.5, req.height * 1.5);
+ /* Delay size request so that styles are gotten right */
+ control_ui->controller->widget()->signal_size_request().connect(
+ sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::knob_size_request), control_ui));
} else {
- control_ui->controller->set_size_request (200, req.height);
+ control_ui->controller->set_size_request (200, -1);
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));
+ control_ui->spin_box = manage (new ArdourSpinner (mcontrol, adj));
}
adj->set_value (mcontrol->internal_to_interface(value));
} 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);
input_controls_with_automation.push_back (control_ui);
}
- if (desc.toggled) {
+ if (desc.toggled && !control_ui->combo) {
control_ui->button = true;
ArdourButton* but = dynamic_cast<ArdourButton*>(control_ui->controller->widget ());
assert (but);
control_ui->vbox = manage (new VBox);
control_ui->vbox->set_spacing(3);
- if (desc.integer_step || desc.enumeration) {
+ if (desc.unit == ParameterDescriptor::MIDI_NOTE) {
+ control_ui->vbox->pack_end (*control_ui->display, false, false);
+ control_ui->vbox->pack_end (control_ui->label, false, false);
+ } else if (desc.integer_step || desc.enumeration) {
control_ui->vbox->pack_end (*control_ui->display, false, false);
control_ui->vbox->pack_end (control_ui->label, false, false);
} else {
UIConfiguration::instance().color ("meter background top")
);
- info->min_unbound = desc.min_unbound;
- info->max_unbound = desc.max_unbound;
-
- info->min = desc.lower;
- info->max = desc.upper;
-
control_ui->label.set_angle(90);
HBox* center = manage (new HBox);
return control_ui;
}
+void
+GenericPluginUI::knob_size_request(Gtk::Requisition* req, ControlUI* cui) {
+ Gtk::Requisition astate_req (cui->automate_button.size_request());
+ const int size = (int) (astate_req.height * 1.5);
+ req->width = max(req->width, size);
+ req->height = max(req->height, size);
+}
+
+
bool
GenericPluginUI::astate_button_event (GdkEventButton* ev, ControlUI* cui)
{
GenericPluginUI::set_all_automation (AutoState as)
{
for (vector<ControlUI*>::iterator i = input_controls_with_automation.begin(); i != input_controls_with_automation.end(); ++i) {
- if ((*i)->controller || (*i)->button) {
- set_automation_state (as, (*i));
- }
+ set_automation_state (as, (*i));
}
}
for (vector<ControlUI*>::iterator i = output_controls.begin(); i != output_controls.end(); ++i) {
float val = plugin->get_parameter ((*i)->parameter().id());
char buf[32];
- snprintf (buf, sizeof(buf), "%.2f", val);
+ boost::shared_ptr<ReadOnlyControl> c = insert->control_output ((*i)->parameter().id());
+ const std::string& str = ARDOUR::value_as_string(c->desc(), Variant(val));
+ size_t len = str.copy(buf, 31);
+ buf[len] = '\0';
(*i)->display_label->set_text (buf);
- /* autoscaling for the meter */
if ((*i)->meterinfo && (*i)->meterinfo->packed) {
-
- if (val < (*i)->meterinfo->min) {
- if ((*i)->meterinfo->min_unbound)
- (*i)->meterinfo->min = val;
- else
- val = (*i)->meterinfo->min;
- }
-
- if (val > (*i)->meterinfo->max) {
- if ((*i)->meterinfo->max_unbound)
- (*i)->meterinfo->max = val;
- else
- val = (*i)->meterinfo->max;
- }
-
- if ((*i)->meterinfo->max > (*i)->meterinfo->min ) {
- float lval = (val - (*i)->meterinfo->min) / ((*i)->meterinfo->max - (*i)->meterinfo->min) ;
- (*i)->meterinfo->meter->set (lval );
- }
+ (*i)->meterinfo->meter->set (c->desc().to_interface (val));
}
}
}