mp4chaps Lua script: don't clutter global environment

[ardour.git] / gtk2_ardour / generic_pluginui.cc

diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc
index bcc91a673d6a8af43febb1b510f55f496fc784aa..2578a39184077a1205860dedcfd2aae6f71ff730 100644 (file)
--- a/gtk2_ardour/generic_pluginui.cc
+++ b/gtk2_ardour/generic_pluginui.cc
@@ -27,31 +27,33 @@
 #include <string>
 #include <vector>
 
+#include <gtkmm/separator.h>
+
 #include "pbd/stl_delete.h"
 #include "pbd/unwind.h"
 #include "pbd/xml++.h"
 #include "pbd/failed_constructor.h"
 
-#include <gtkmm2ext/click_box.h>
-#include <gtkmm2ext/fastmeter.h>
-#include <gtkmm2ext/barcontroller.h>
-#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/doi.h>
-#include <gtkmm2ext/slider_controller.h>
-
 #include "ardour/plugin.h"
 #include "ardour/plugin_insert.h"
 #include "ardour/session.h"
 #include "ardour/value_as_string.h"
 
-#include "prompter.h"
+#include "gtkmm2ext/utils.h"
+#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"
+
 #include "plugin_ui.h"
+#include "plugin_display.h"
 #include "gui_thread.h"
 #include "automation_controller.h"
-#include "ardour_knob.h"
 #include "gain_meter.h"
 #include "timers.h"
-#include "tooltips.h"
 #include "ui_config.h"
 
 #include "pbd/i18n.h"
@@ -60,6 +62,7 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtkmm2ext;
+using namespace ArdourWidgets;
 using namespace Gtk;
 using namespace ARDOUR_UI_UTILS;
 
@@ -525,6 +528,11 @@ GenericPluginUI::automatic_layout (const std::vector<ControlUI*>& control_uis)
        } else {
                delete output_table;
        }
+
+       if (plugin->has_inline_display () && plugin->inline_display_in_gui ()) {
+               PluginDisplay* pd = manage (new PluginDisplay (plugin, 300));
+               hpacker.pack_end (*pd, true, true);
+       }
        show_all();
 
 }
@@ -542,6 +550,11 @@ GenericPluginUI::custom_layout (const std::vector<ControlUI*>& control_uis)
                layout->attach (*cui, cui->x0, cui->x1, cui->y0, cui->y1, FILL, SHRINK, 2, 2);
        }
        hpacker.pack_start (*layout, true, true);
+
+       if (plugin->has_inline_display () && plugin->inline_display_in_gui ()) {
+               PluginDisplay* pd = manage (new PluginDisplay (plugin, 300));
+               hpacker.pack_end (*pd, true, true);
+       }
 }
 
 GenericPluginUI::ControlUI::ControlUI (const Evoral::Parameter& p)
@@ -754,7 +767,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 ClickBox (adj, "PluginUIClickBox", true);
+                               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));