diff options
Diffstat (limited to 'gtk2_ardour/generic_pluginui.cc')
-rw-r--r-- | gtk2_ardour/generic_pluginui.cc | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc index 7347e001f8..1e48986a28 100644 --- a/gtk2_ardour/generic_pluginui.cc +++ b/gtk2_ardour/generic_pluginui.cc @@ -436,8 +436,8 @@ GenericPluginUI::automatic_layout (const std::vector<ControlUI*>& control_uis) Gtk::Table* button_table = manage (new Gtk::Table (initial_button_rows, initial_button_cols)); Gtk::Table* output_table = manage (new Gtk::Table (initial_output_rows, initial_output_cols)); - Frame* sample; - Frame* bt_sample; + Frame* frame; + Frame* bt_frame; VBox* box; int output_row, output_col; int button_row, button_col; @@ -467,21 +467,21 @@ GenericPluginUI::automatic_layout (const std::vector<ControlUI*>& control_uis) output_table->set_border_width (5); - bt_sample = manage (new Frame); - bt_sample->set_name ("BaseFrame"); - bt_sample->set_label (_("Switches")); - bt_sample->add (*button_table); - hpacker.pack_start(*bt_sample, true, true); + bt_frame = manage (new Frame); + bt_frame->set_name ("BaseFrame"); + bt_frame->set_label (_("Switches")); + bt_frame->add (*button_table); + hpacker.pack_start(*bt_frame, true, true); box = manage (new VBox); box->set_border_width (5); box->set_spacing (1); - sample = manage (new Frame); - sample->set_name ("BaseFrame"); - sample->set_label (_("Controls")); - sample->add (*box); - hpacker.pack_start(*sample, true, true); + frame = manage (new Frame); + frame->set_name ("BaseFrame"); + frame->set_label (_("Controls")); + frame->add (*box); + hpacker.pack_start(*frame, true, true); // Add special controls to UI, and build list of normal controls to be layed out later std::vector<ControlUI *> cui_controls_list; @@ -583,14 +583,14 @@ GenericPluginUI::automatic_layout (const std::vector<ControlUI*>& control_uis) if (x > max_controls_per_column || similarity_scores[i] <= similarity_threshold) { if (x > min_controls_per_column) { - sample = manage (new Frame); - sample->set_name ("BaseFrame"); - sample->set_label (_("Controls")); + frame = manage (new Frame); + frame->set_name ("BaseFrame"); + frame->set_label (_("Controls")); box = manage (new VBox); box->set_border_width (5); box->set_spacing (1); - sample->add (*box); - hpacker.pack_start(*sample, true, true); + frame->add (*box); + hpacker.pack_start(*frame, true, true); x = 0; } else { HSeparator *split = new HSeparator(); @@ -607,22 +607,22 @@ GenericPluginUI::automatic_layout (const std::vector<ControlUI*>& control_uis) } if (box->children().empty()) { - hpacker.remove (*sample); + hpacker.remove (*frame); } if (button_table->children().empty()) { - hpacker.remove (*bt_sample); + hpacker.remove (*bt_frame); delete button_table; } else { button_table->show_all (); } if (!output_table->children().empty()) { - sample = manage (new Frame); - sample->set_name ("BaseFrame"); - sample->set_label(_("Meters")); - sample->add (*output_table); - hpacker.pack_end (*sample, true, true); + frame = manage (new Frame); + frame->set_name ("BaseFrame"); + frame->set_label(_("Meters")); + frame->add (*output_table); + hpacker.pack_end (*frame, true, true); output_table->show_all (); } else { delete output_table; @@ -667,15 +667,15 @@ GenericPluginUI::build_midi_table () pgm_table->set_border_width (5); pgm_table->set_col_spacing (2, 10); - Frame* sample = manage (new Frame); - sample->set_name ("BaseFrame"); + Frame* frame = manage (new Frame); + frame->set_name ("BaseFrame"); if (dynamic_cast<MidiTrack*> (insert->owner())) { - sample->set_label (_("MIDI Programs (sent to track)")); + frame->set_label (_("MIDI Programs (sent to track)")); } else { - sample->set_label (_("MIDI Programs (volatile)")); + frame->set_label (_("MIDI Programs (volatile)")); } - sample->add (*pgm_table); - hpacker.pack_start (*sample, false, false); + frame->add (*pgm_table); + hpacker.pack_start (*frame, false, false); for (uint8_t chn = 0; chn < 16; ++chn) { int col = 3 * (chn / 8); |