diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-14 16:42:40 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-14 16:42:40 -0400 |
| commit | 7a30e63eaad66ded1c47f5cdb2e0f28c3b0a1d4a (patch) | |
| tree | 25e1b01865e76193f3c88483d4f9de1c8abf2f9d /gtk2_ardour/lv2_plugin_ui.h | |
| parent | e6521bb0434d88802aa28e75235bc8c19ebb9262 (diff) | |
| parent | f5191e62578bd2ba2b3e2adf8cfc3634aa4b929c (diff) | |
fix merge conflicts with master
Diffstat (limited to 'gtk2_ardour/lv2_plugin_ui.h')
| -rw-r--r-- | gtk2_ardour/lv2_plugin_ui.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gtk2_ardour/lv2_plugin_ui.h b/gtk2_ardour/lv2_plugin_ui.h index edb90cb154..a39386a7e0 100644 --- a/gtk2_ardour/lv2_plugin_ui.h +++ b/gtk2_ardour/lv2_plugin_ui.h @@ -71,6 +71,7 @@ class LV2PluginUI : public PlugUIBase, public Gtk::VBox boost::shared_ptr<ARDOUR::LV2Plugin> _lv2; std::vector<int> _output_ports; sigc::connection _screen_update_connection; + sigc::connection _message_update_connection; Gtk::Widget* _gui_widget; /** a box containing the focus, bypass, delete, save / add preset buttons etc. */ Gtk::HBox _ardour_buttons_box; @@ -78,6 +79,7 @@ class LV2PluginUI : public PlugUIBase, public Gtk::VBox std::vector<ControllableRef> _controllables; struct lv2_external_ui_host _external_ui_host; LV2_Feature _external_ui_feature; + LV2_Feature _external_kxui_feature; struct lv2_external_ui* _external_ui_ptr; LV2_Feature _parent_feature; Gtk::Window* _win_ptr; |