diff options
| author | Carl Hetherington <carl@carlh.net> | 2012-03-21 16:38:53 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2012-03-21 16:38:53 +0000 |
| commit | 6238ca5e727871626e3c3c80b14a537702800e6d (patch) | |
| tree | 7bb6a8420001df04fef4a2ad363f0cf24e13b251 /gtk2_ardour | |
| parent | ed12f85c88f460c1fc64d8616a630168ee2e8d49 (diff) | |
Rename combo_map variable to scale_points.
git-svn-id: svn://localhost/ardour2/branches/3.0@11742 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/generic_pluginui.cc | 16 | ||||
| -rw-r--r-- | gtk2_ardour/plugin_ui.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc index 52e583a4f8..bc5403099e 100644 --- a/gtk2_ardour/generic_pluginui.cc +++ b/gtk2_ardour/generic_pluginui.cc @@ -496,13 +496,13 @@ GenericPluginUI::build_control_ui (guint32 port_index, boost::shared_ptr<Automat /* Build a combo box */ - control_ui->combo_map = plugin->get_scale_points (port_index); + control_ui->scale_points = plugin->get_scale_points (port_index); - if (control_ui->combo_map) { + if (control_ui->scale_points) { std::vector<std::string> labels; for ( - ARDOUR::Plugin::ScalePoints::const_iterator i = control_ui->combo_map->begin(); - i != control_ui->combo_map->end(); + ARDOUR::Plugin::ScalePoints::const_iterator i = control_ui->scale_points->begin(); + i != control_ui->scale_points->end(); ++i) { labels.push_back(i->first); @@ -744,8 +744,8 @@ GenericPluginUI::update_control_display (ControlUI* cui) cui->ignore_change++; - if (cui->combo && cui->combo_map) { - for (ARDOUR::Plugin::ScalePoints::iterator it = cui->combo_map->begin(); it != cui->combo_map->end(); ++it) { + if (cui->combo && cui->scale_points) { + for (ARDOUR::Plugin::ScalePoints::iterator it = cui->scale_points->begin(); it != cui->scale_points->end(); ++it) { if (it->second == val) { cui->combo->set_active_text(it->first); break; @@ -787,9 +787,9 @@ GenericPluginUI::control_port_toggled (ControlUI* cui) void GenericPluginUI::control_combo_changed (ControlUI* cui) { - if (!cui->ignore_change && cui->combo_map) { + if (!cui->ignore_change && cui->scale_points) { string value = cui->combo->get_active_text(); - insert->automation_control (cui->parameter())->set_value ((*cui->combo_map)[value]); + insert->automation_control (cui->parameter())->set_value ((*cui->scale_points)[value]); } } diff --git a/gtk2_ardour/plugin_ui.h b/gtk2_ardour/plugin_ui.h index 92af891803..00caf6da9a 100644 --- a/gtk2_ardour/plugin_ui.h +++ b/gtk2_ardour/plugin_ui.h @@ -228,7 +228,7 @@ class GenericPluginUI : public PlugUIBase, public Gtk::VBox /* input */ Gtk::ComboBoxText* combo; - boost::shared_ptr<ARDOUR::Plugin::ScalePoints> combo_map; + boost::shared_ptr<ARDOUR::Plugin::ScalePoints> scale_points; Gtk::ToggleButton* button; boost::shared_ptr<AutomationController> controller; Gtkmm2ext::ClickBox* clickbox; |