X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgeneric_pluginui.cc;h=2a8738f8188cdd7ab40aa7e1ba9738fee0ca3b31;hb=cc15fb071f3c327f17bbe1b0613974d5060b7f90;hp=7e111f9c1a9bdcbf8deb5c6917fb00ed0bd1ac21;hpb=1fca71fd283c912bbb0d88fcb95fb8e3b330c09e;p=ardour.git diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc index 7e111f9c1a..2a8738f818 100644 --- a/gtk2_ardour/generic_pluginui.cc +++ b/gtk2_ardour/generic_pluginui.cc @@ -38,6 +38,9 @@ #include #include #include +#ifdef HAVE_LV2 +#include +#endif #include @@ -70,24 +73,29 @@ GenericPluginUI::GenericPluginUI (boost::shared_ptr pi, bool scrol set_border_width (10); set_homogeneous (false); - settings_box.set_homogeneous (false); - HBox* constraint_hbox = manage (new HBox); HBox* smaller_hbox = manage (new HBox); Label* combo_label = manage (new Label (_("Presets"))); combo_label->set_use_markup (true); smaller_hbox->pack_start (*combo_label, false, false, 10); - smaller_hbox->pack_start (combo, false, false); + smaller_hbox->pack_start (preset_combo, false, false); smaller_hbox->pack_start (save_button, false, false); + smaller_hbox->pack_start (bypass_button, false, true); constraint_hbox->set_spacing (5); - constraint_hbox->pack_start (*smaller_hbox, true, false); - constraint_hbox->pack_end (bypass_button, false, false); + constraint_hbox->set_homogeneous (false); + + VBox* v1_box = manage (new VBox); + VBox* v2_box = manage (new VBox); - settings_box.pack_end (*constraint_hbox, false, false); + v1_box->pack_start (*smaller_hbox, false, true); + v2_box->pack_start (focus_button, false, true); - pack_start (settings_box, false, false); + constraint_hbox->pack_end (*v2_box, false, false); + constraint_hbox->pack_end (*v1_box, false, false); + + pack_start (*constraint_hbox, false, false); if ( is_scrollable ) { scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC); @@ -103,9 +111,6 @@ GenericPluginUI::GenericPluginUI (boost::shared_ptr pi, bool scrol pack_start (hpacker, false, false); } - insert->active_changed.connect (mem_fun(*this, &GenericPluginUI::redirect_active_changed)); - bypass_button.set_active (!insert->active()); - build (); } @@ -186,7 +191,7 @@ GenericPluginUI::build () /* if we are scrollable, just use one long column */ if (!is_scrollable) { - if (x++ > 7){ + if (x++ > 20){ frame = manage (new Frame); frame->set_name ("BaseFrame"); box = manage (new VBox); @@ -299,7 +304,7 @@ GenericPluginUI::ControlUI::ControlUI () below). be sure to include a descender. */ - set_size_request_to_display_given_text (*automate_button.get_child(), _("Mgnual"), 5, 5); + set_size_request_to_display_given_text (automate_button, _("Mgnual"), 15, 10); ignore_change = 0; display = 0; @@ -384,7 +389,9 @@ GenericPluginUI::build_control_ui (guint32 port_index, PBD::Controllable* mcontr if (plugin->parameter_is_input (port_index)) { boost::shared_ptr lp; - +#ifdef HAVE_LV2 + boost::shared_ptr lv2p; +#endif if ((lp = boost::dynamic_pointer_cast(plugin)) != 0) { // all LADPSA plugins have a numeric unique ID @@ -407,6 +414,28 @@ GenericPluginUI::build_control_ui (guint32 port_index, PBD::Controllable* mcontr lrdf_free_setting_values(defaults); return control_ui; } + +#ifdef HAVE_LV2 + } else if ((lv2p = boost::dynamic_pointer_cast(plugin)) != 0) { + + SLV2Port port = lv2p->slv2_port(port_index); + SLV2ScalePoints points = slv2_port_get_scale_points(lv2p->slv2_plugin(), port); + + if (points) { + control_ui->combo = new Gtk::ComboBoxText; + //control_ui->combo->set_value_in_list(true, false); + set_popdown_strings (*control_ui->combo, setup_scale_values(port_index, control_ui)); + control_ui->combo->signal_changed().connect (bind (mem_fun(*this, &GenericPluginUI::control_combo_changed), control_ui)); + plugin->ParameterChanged.connect (bind (mem_fun (*this, &GenericPluginUI::parameter_changed), control_ui)); + control_ui->pack_start(control_ui->label, true, true); + control_ui->pack_start(*control_ui->combo, false, true); + + update_control_display(control_ui); + + slv2_scale_points_free(points); + return control_ui; + } +#endif } if (desc.toggled) { @@ -421,12 +450,19 @@ GenericPluginUI::build_control_ui (guint32 port_index, PBD::Controllable* mcontr control_ui->pack_start (*control_ui->button, false, true); control_ui->pack_start (control_ui->automate_button, false, false); - control_ui->button->signal_clicked().connect (bind (mem_fun(*this, &GenericPluginUI::control_port_toggled), control_ui)); - - if(plugin->get_parameter (port_index) == 1){ + if(plugin->get_parameter (port_index) > 0.5){ control_ui->button->set_active(true); } + control_ui->button->signal_clicked().connect (bind (mem_fun(*this, &GenericPluginUI::control_port_toggled), control_ui)); + + plugin->ParameterChanged.connect (bind (mem_fun(*this, &GenericPluginUI::toggle_parameter_changed), control_ui)); + + control_ui->automate_button.signal_clicked().connect (bind (mem_fun(*this, &GenericPluginUI::astate_clicked), control_ui, (uint32_t) port_index)); + automation_state_changed (control_ui); + insert->automation_list (port_index).automation_state_changed.connect + (bind (mem_fun(*this, &GenericPluginUI::automation_state_changed), control_ui)); + return control_ui; } @@ -448,9 +484,6 @@ GenericPluginUI::build_control_ui (guint32 port_index, PBD::Controllable* mcontr control_ui->adjustment->set_lower (log(control_ui->adjustment->get_lower())); } - float delta = desc.upper - desc.lower; - - control_ui->adjustment->set_page_size (delta/100.0); control_ui->adjustment->set_step_increment (desc.step); control_ui->adjustment->set_page_increment (desc.largestep); @@ -466,6 +499,7 @@ GenericPluginUI::build_control_ui (guint32 port_index, PBD::Controllable* mcontr control_ui->control->set_name (X_("PluginSlider")); control_ui->control->set_style (BarController::LeftToRight); control_ui->control->set_use_parent (true); + control_ui->control->set_logarithmic (control_ui->logarithmic); control_ui->control->StartGesture.connect (bind (mem_fun(*this, &GenericPluginUI::start_touch), control_ui)); control_ui->control->StopGesture.connect (bind (mem_fun(*this, &GenericPluginUI::stop_touch), control_ui)); @@ -545,9 +579,10 @@ GenericPluginUI::build_control_ui (guint32 port_index, PBD::Controllable* mcontr control_ui->meterinfo->packed = true; output_controls.push_back (control_ui); + + plugin->ParameterChanged.connect (bind (mem_fun(*this, &GenericPluginUI::parameter_changed), control_ui)); } - plugin->ParameterChanged.connect (bind (mem_fun(*this, &GenericPluginUI::parameter_changed), control_ui)); return control_ui; } @@ -610,6 +645,18 @@ GenericPluginUI::control_adjustment_changed (ControlUI* cui) insert->set_parameter (cui->port_index, (float) value); } +void +GenericPluginUI::toggle_parameter_changed (uint32_t abs_port_id, float val, ControlUI* cui) +{ + if (!cui->ignore_change && cui->port_index == abs_port_id) { + if (val > 0.5) { + cui->button->set_active (true); + } else { + cui->button->set_active (false); + } + } +} + void GenericPluginUI::parameter_changed (uint32_t abs_port_id, float val, ControlUI* cui) { @@ -639,14 +686,6 @@ GenericPluginUI::update_control_display (ControlUI* cui) break; } } - } else if (cui->adjustment == 0) { - - if (val > 0.5) { - cui->button->set_active (true); - } else { - cui->button->set_active (false); - } - } else { if (cui->logarithmic) { val = log(val); @@ -661,9 +700,9 @@ GenericPluginUI::update_control_display (ControlUI* cui) void GenericPluginUI::control_port_toggled (ControlUI* cui) { - if (!cui->ignore_change) { - insert->set_parameter (cui->port_index, cui->button->get_active()); - } + cui->ignore_change++; + insert->set_parameter (cui->port_index, cui->button->get_active()); + cui->ignore_change--; } void @@ -677,14 +716,6 @@ GenericPluginUI::control_combo_changed (ControlUI* cui) } -void -GenericPluginUI::redirect_active_changed (Redirect* r, void* src) -{ - ENSURE_GUI_THREAD(bind (mem_fun(*this, &GenericPluginUI::redirect_active_changed), r, src)); - - bypass_button.set_active (!r->active()); -} - bool GenericPluginUI::start_updating (GdkEventAny* ignored) { @@ -743,28 +774,53 @@ vector GenericPluginUI::setup_scale_values(guint32 port_index, ControlUI* cui) { vector enums; - boost::shared_ptr lp = boost::dynamic_pointer_cast (plugin); + boost::shared_ptr lp; +#ifdef HAVE_LV2 + boost::shared_ptr lv2p; +#endif + + if ((lp = boost::dynamic_pointer_cast(plugin)) != 0) { + // all LADPSA plugins have a numeric unique ID + uint32_t id = atol (lp->unique_id().c_str()); + + cui->combo_map = new std::map; + lrdf_defaults* defaults = lrdf_get_scale_values(id, port_index); + if (defaults) { + for (uint32_t i = 0; i < defaults->count; ++i) { + enums.push_back(defaults->items[i].label); + pair newpair; + newpair.first = defaults->items[i].label; + newpair.second = defaults->items[i].value; + cui->combo_map->insert(newpair); + } - if (!lp) { - return enums; - } + lrdf_free_setting_values(defaults); + } + +#ifdef HAVE_LV2 + } else if ((lv2p = boost::dynamic_pointer_cast(plugin)) != 0) { + + SLV2Port port = lv2p->slv2_port(port_index); + SLV2ScalePoints points = slv2_port_get_scale_points(lv2p->slv2_plugin(), port); + cui->combo_map = new std::map; - // all LADPSA plugins have a numeric unique ID - uint32_t id = atol (lp->unique_id().c_str()); - - cui->combo_map = new std::map; - lrdf_defaults* defaults = lrdf_get_scale_values(id, port_index); - if (defaults) { - for (uint32_t i = 0; i < defaults->count; ++i) { - enums.push_back(defaults->items[i].label); - pair newpair; - newpair.first = defaults->items[i].label; - newpair.second = defaults->items[i].value; - cui->combo_map->insert(newpair); + for (unsigned i=0; i < slv2_scale_points_size(points); ++i) { + SLV2ScalePoint p = slv2_scale_points_get_at(points, i); + SLV2Value label = slv2_scale_point_get_label(p); + SLV2Value value = slv2_scale_point_get_value(p); + if (label && (slv2_value_is_float(value) || slv2_value_is_int(value))) { + enums.push_back(slv2_value_as_string(label)); + pair newpair; + newpair.first = slv2_value_as_string(label); + newpair.second = slv2_value_as_float(value); + cui->combo_map->insert(newpair); + } } - lrdf_free_setting_values(defaults); + slv2_scale_points_free(points); +#endif } + return enums; }