unify BarController with Slider/Pixfader.

[ardour.git] / gtk2_ardour / generic_pluginui.cc

diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc
index ef29c01d465f0521ae7d56f2cce3da64c188b77c..ffdbfb3bf2576ca85570859b5a83e9648b38f1f0 100644 (file)
--- a/gtk2_ardour/generic_pluginui.cc
+++ b/gtk2_ardour/generic_pluginui.cc
@@ -25,6 +25,7 @@
 #include <cerrno>
 #include <cmath>
 #include <string>
+#include <vector>
 
 #include "pbd/stl_delete.h"
 #include "pbd/xml++.h"
@@ -41,12 +42,9 @@
 #include "ardour/plugin_insert.h"
 #include "ardour/session.h"
 
-#include <lrdf.h>
-
 #include "ardour_ui.h"
 #include "prompter.h"
 #include "plugin_ui.h"
-#include "utils.h"
 #include "gui_thread.h"
 #include "automation_controller.h"
 
@@ -311,9 +309,9 @@ GenericPluginUI::build ()
        // are similar enough to be grouped together.
        
        string label, previous_label = "";
-       int numbers_in_labels[cui_controls_list.size()];
+       std::vector<int> numbers_in_labels(cui_controls_list.size());
        
-       float similarity_scores[cui_controls_list.size()];
+       std::vector<float> similarity_scores(cui_controls_list.size());
        float most_similar = 0.0, least_similar = 1.0;
        
        i = 0;
@@ -637,7 +635,6 @@ GenericPluginUI::build_control_ui (guint32 port_index, boost::shared_ptr<Automat
                        control_ui->clickbox = new ClickBox (adj, "PluginUIClickBox");
                        Gtkmm2ext::set_size_request_to_display_given_text (*control_ui->clickbox, "g9999999", 2, 2);
                        if (desc.midinote) {
-                               printf("MIDI NOTE\n");
                                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));
@@ -647,8 +644,6 @@ GenericPluginUI::build_control_ui (guint32 port_index, boost::shared_ptr<Automat
 
                        control_ui->controller->set_size_request (200, req.height);
                        control_ui->controller->set_name (X_("PluginSlider"));
-                       control_ui->controller->set_style (BarController::LeftToRight);
-                       control_ui->controller->set_use_parent (true);
                        control_ui->controller->set_logarithmic (desc.logarithmic);
 
                        control_ui->controller->StartGesture.connect (sigc::bind (sigc::mem_fun(*this, &GenericPluginUI::start_touch), control_ui));