New Route dialog: add fallback default selection

[ardour.git] / gtk2_ardour / generic_pluginui.cc

diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc
index 8be90cfa3ff37704d2d874f69f8e8e0e027e8d2e..055129b704220b5953b8bedd97695daf73edaf6a 100644 (file)
--- a/gtk2_ardour/generic_pluginui.cc
+++ b/gtk2_ardour/generic_pluginui.cc
@@ -51,7 +51,6 @@
 #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"
@@ -157,6 +156,9 @@ GenericPluginUI::GenericPluginUI (boost::shared_ptr<PluginInsert> pi, bool scrol
        } else {
                pack_end (plugin_analysis_expander, false, false);
        }
+
+       pack_end (cpuload_expander, false, false);
+
        if (!plugin->get_docs().empty()) {
                pack_end (description_expander, false, false);
        }
@@ -224,22 +226,27 @@ GenericPluginUI::~GenericPluginUI ()
 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 (get_window());
+       Glib::RefPtr<Gdk::Screen> screen;
+
+       if (window) {
+               screen = get_screen();
        }
 
-       GtkRequisition request = hpacker.size_request();
+       if (!screen) {
+               a->width = 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();
@@ -495,7 +502,7 @@ GenericPluginUI::automatic_layout (const std::vector<ControlUI*>& control_uis)
                                             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);
@@ -663,9 +670,9 @@ GenericPluginUI::build_midi_table ()
        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, false, false);
@@ -725,7 +732,6 @@ GenericPluginUI::midi_refill_patches ()
                                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;
@@ -792,7 +798,6 @@ GenericPluginUI::ControlUI::ControlUI (const Evoral::Parameter& p)
        : param(p)
        , automate_button (X_("")) // force creation of a label
        , combo (0)
-       , clickbox (0)
        , file_button (0)
        , spin_box (0)
        , display (0)
@@ -1009,16 +1014,7 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter&             param,
 
                        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);
@@ -1029,6 +1025,11 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter&             param,
                        } 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) {
@@ -1049,10 +1050,6 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter&             param,
                        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 + ": ");
@@ -1078,8 +1075,6 @@ GenericPluginUI::build_control_ui (const Evoral::Parameter&             param,
                        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);