#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"
automation_write_all_button.set_name (X_("generic button"));
automation_touch_all_button.set_text(_("Touch"));
automation_touch_all_button.set_name (X_("generic button"));
+ automation_latch_all_button.set_text(_("Touch"));
+ automation_latch_all_button.set_name (X_("generic button"));
constraint_hbox->set_spacing (5);
constraint_hbox->set_homogeneous (false);
} else {
pack_end (plugin_analysis_expander, false, false);
}
+
+ if (insert->provides_stats ()) {
+ pack_end (cpuload_expander, false, false);
+ }
+
if (!plugin->get_docs().empty()) {
pack_end (description_expander, false, false);
}
main_contents.pack_start (scroller, true, true);
- prefheight = 0;
+ prefheight = -1;
build ();
if (insert->plugin()->has_midnam() && insert->plugin()->knows_bank_patch()) {
scroller.set_name ("PluginEditor");
} else {
scroller.signal_size_request().connect (sigc::mem_fun(*this, &GenericPluginUI::scroller_size_request));
+ scroller.signal_realize().connect (sigc::mem_fun(scroller, &Widget::queue_resize));
scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_NEVER);
}
void
GenericPluginUI::scroller_size_request (Gtk::Requisition* a)
{
- Glib::RefPtr<Gdk::Screen> screen = get_screen();
- if (!screen)
- screen = Gdk::Screen::get_default();
-
- int maximum_width;
- {
- Gdk::Rectangle monitor;
- const int monitor_num = screen->get_monitor_at_window (get_window ());
- screen->get_monitor_geometry (
- (monitor_num < 0) ? 0 : monitor_num,
- monitor);
-
- maximum_width = monitor.get_width() * 0.9;
+ GtkRequisition request = hpacker.size_request();
+
+ Glib::RefPtr<Gdk::Window> window (scroller.get_window());
+ Glib::RefPtr<Gdk::Screen> screen;
+
+ if (window) {
+ screen = window->get_screen();
}
- GtkRequisition request = hpacker.size_request();
+ if (!screen) {
+ a->width = min(1024, request.width);
+ return;
+ }
+
+ Gdk::Rectangle monitor;
+ const int monitor_num = screen->get_monitor_at_window (window);
+ screen->get_monitor_geometry (
+ (monitor_num < 0) ? 0 : monitor_num,
+ monitor);
+
+ const int maximum_width = monitor.get_width() * 0.9;
if (request.width > maximum_width) {
for (vector<ControlUI*>::const_iterator cuip = input_controls.begin();
GenericPluginUI::build ()
{
std::vector<ControlUI *> control_uis;
- bool grid = plugin->parameter_count() > 0;
+ bool grid_avail = false;
+ bool grid_veto = false;
// Build a ControlUI for each control port
for (size_t i = 0; i < plugin->parameter_count(); ++i) {
ControlUI* cui;
Plugin::UILayoutHint hint;
- if (!plugin->get_layout(i, hint)) {
- grid = false;
+ if (plugin->get_layout(i, hint)) {
+ grid_avail = true;
+ } else {
+ grid_veto = true;
}
boost::shared_ptr<ARDOUR::AutomationControl> c
continue;
}
- if (grid) {
+ if (grid_avail && !grid_veto) {
cui->x0 = hint.x0;
cui->x1 = hint.x1;
cui->y0 = hint.y0;
}
}
+ bool grid = grid_avail && !grid_veto;
+
// Build a ControlUI for each property
const Plugin::PropertyDescriptors& descs = plugin->get_supported_properties();
for (Plugin::PropertyDescriptors::const_iterator d = descs.begin(); d != descs.end(); ++d) {
automation_play_all_button.signal_clicked.connect(sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::set_all_automation), ARDOUR::Play));
automation_write_all_button.signal_clicked.connect(sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::set_all_automation), ARDOUR::Write));
automation_touch_all_button.signal_clicked.connect(sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::set_all_automation), ARDOUR::Touch));
+ automation_latch_all_button.signal_clicked.connect(sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::set_all_automation), ARDOUR::Latch));
/* XXX This is a workaround for AutomationControl not knowing about preset loads */
plugin->PresetLoaded.connect (*this, invalidator (*this), boost::bind (&GenericPluginUI::update_input_displays, this), gui_context ());
FILL|EXPAND, FILL);
button_row++;
- } else if (cui->controller || cui->clickbox || cui->combo) {
+ } else if (cui->controller || cui->combo) {
// Get all of the controls into a list, so that
// we can lay them out a bit more nicely later.
cui_controls_list.push_back(cui);
box->pack_start (*cui, false, false);
}
- if (is_scrollable) {
+ if (is_scrollable && i > 0) {
prefheight = 30 * i;
}
void
GenericPluginUI::build_midi_table ()
{
- Gtk::Table* pgm_table = manage (new Gtk::Table (8, 2));
+ Gtk::Table* pgm_table = manage (new Gtk::Table (8, 5));
- pgm_table->set_homogeneous (true);
+ pgm_table->set_homogeneous (false);
pgm_table->set_row_spacings (2);
pgm_table->set_col_spacings (2);
pgm_table->set_border_width (5);
+ pgm_table->set_col_spacing (2, 10);
Frame* frame = manage (new Frame);
frame->set_name ("BaseFrame");
if (dynamic_cast<MidiTrack*> (insert->owner())) {
- frame->set_label (_("MIDI Progams (sent to track)"));
+ frame->set_label (_("MIDI Programs (sent to track)"));
} else {
- frame->set_label (_("MIDI Progams (volatile)"));
+ frame->set_label (_("MIDI Programs (volatile)"));
}
frame->add (*pgm_table);
- hpacker.pack_start (*frame, true, true);
+ hpacker.pack_start (*frame, false, false);
for (uint8_t chn = 0; chn < 16; ++chn) {
- int col = chn / 8;
+ int col = 3 * (chn / 8);
int row = chn % 8;
ArdourDropdown* cui = manage (new ArdourWidgets::ArdourDropdown ());
- // TODO set size_request
+ cui->set_sizing_text ("Stereo Grand Piano");
cui->set_text_ellipsize (Pango::ELLIPSIZE_END);
cui->set_layout_ellipsize_width (PANGO_SCALE * 112 * UIConfiguration::instance ().get_ui_scale ());
midi_pgmsel.push_back (cui);
- pgm_table->attach (*cui, col, col + 1, row, row+1, FILL|EXPAND, FILL);
+ pgm_table->attach (*manage (new Label (string_compose ("C%1:", (int)(chn + 1)), ALIGN_RIGHT)), col, col + 1, row, row+1, FILL, SHRINK);
+ pgm_table->attach (*cui, col + 1, col + 2, row, row+1, SHRINK, SHRINK);
}
insert->plugin ()->read_midnam();
for (MIDI::Name::PatchNameList::const_iterator j = patches.begin(); j != patches.end(); ++j) {
const std::string pgm = (*j)->name ();
MIDI::Name::PatchPrimaryKey const& key = (*j)->patch_primary_key ();
- assert ((*i)->number () == key.bank());
const uint32_t bp = (key.bank() << 7) | key.program();
midi_pgmsel[chn]->AddMenuElem (MenuElemNoMnemonic (pgm, sigc::bind (sigc::mem_fun (*this, &GenericPluginUI::midi_bank_patch_select), chn, bp)));
pgm_names[bp] = pgm;
: param(p)
, automate_button (X_("")) // force creation of a label
, combo (0)
- , clickbox (0)
, file_button (0)
, spin_box (0)
, display (0)
return;
}
- switch (state & (ARDOUR::Off|Play|Touch|Write)) {
+ switch (state & (ARDOUR::Off|Play|Touch|Write|Latch)) {
case ARDOUR::Off:
cui->automate_button.set_text (S_("Automation|Manual"));
break;
case Touch:
cui->automate_button.set_text (_("Touch"));
break;
+ case Latch:
+ cui->automate_button.set_text (_("Latch"));
+ break;
default:
cui->automate_button.set_text (_("???"));
break;
Adjustment* adj = control_ui->controller->adjustment();
- if (desc.integer_step && !desc.toggled) {
- 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) {
+ if (desc.toggled) {
ArdourButton* but = dynamic_cast<ArdourButton*> (control_ui->controller->widget());
assert(but);
but->set_tweaks(ArdourButton::Square);
} else {
control_ui->controller->set_size_request (200, -1);
control_ui->controller->set_name (X_("ProcessorControlSlider"));
+ if (desc.integer_step) {
+ AutomationBarController* abc = dynamic_cast <AutomationBarController*> (control_ui->controller->widget ());
+ assert (abc);
+ abc->set_digits (0);
+ }
}
if (!desc.integer_step && !desc.toggled && use_knob) {
if (control_ui->combo) {
control_ui->knobtable->attach (control_ui->label, 0, 1, 0, 1);
control_ui->knobtable->attach (*control_ui->combo, 0, 1, 1, 2);
- } else 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 + ": ");
control_ui->pack_start (control_ui->label, true, true);
if (control_ui->combo) {
control_ui->pack_start(*control_ui->combo, false, true);
- } else 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);
sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Write, cui)));
items.push_back (MenuElem (_("Touch"),
sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Touch, cui)));
+ items.push_back (MenuElem (_("Latch"),
+ sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::set_automation_state), (AutoState) Latch, cui)));
anchored_menu_popup(automation_menu, &cui->automate_button, cui->automate_button.get_text(),
1, ev->time);