diff options
author | David Robillard <d@drobilla.net> | 2008-02-16 22:43:18 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2008-02-16 22:43:18 +0000 |
commit | 8aa9508c82f32efcf9c7c00e2c9e76268d4dddce (patch) | |
tree | 1fb1a5e7eef6684c0a5bb49be492612c71796fc4 /gtk2_ardour/au_pluginui.h | |
parent | 1b657585572298d1a69a7b43e611f59b7e185df3 (diff) |
Merge with 2.0-ongoing R3071.
git-svn-id: svn://localhost/ardour2/branches/3.0@3073 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/au_pluginui.h')
-rw-r--r-- | gtk2_ardour/au_pluginui.h | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/gtk2_ardour/au_pluginui.h b/gtk2_ardour/au_pluginui.h index 1ca5dca485..4f27cb1062 100644 --- a/gtk2_ardour/au_pluginui.h +++ b/gtk2_ardour/au_pluginui.h @@ -1,6 +1,9 @@ #ifndef __gtk2_ardour_auplugin_ui_h__ #define __gtk2_ardour_auplugin_ui_h__ +#include <vector> +#include <string> + #include <AppKit/AppKit.h> #include <Carbon/Carbon.h> #include <AudioUnit/AudioUnitCarbonView.h> @@ -13,6 +16,10 @@ #undef verify #include <gtkmm/box.h> +#include <gtkmm/combobox.h> +#include <gtkmm/button.h> +#include <gtkmm/label.h> + #include "plugin_ui.h" namespace ARDOUR { @@ -34,7 +41,8 @@ class AUPluginUI : public PlugUIBase, public Gtk::VBox virtual void activate (); virtual void deactivate (); - + + void lower_box_realized (); void on_realize (); void on_show (); void on_hide (); @@ -49,6 +57,15 @@ class AUPluginUI : public PlugUIBase, public Gtk::VBox boost::shared_ptr<ARDOUR::AUPlugin> au; int prefheight; int prefwidth; + + Gtk::HBox top_box; + Gtk::EventBox low_box; + Gtk::VBox vpacker; + Gtk::Label automation_mode_label; + Gtk::ComboBoxText automation_mode_selector; + Gtk::Label preset_label; + + static std::vector<std::string> automation_mode_strings; /* Cocoa */ @@ -63,14 +80,11 @@ class AUPluginUI : public PlugUIBase, public Gtk::VBox AudioUnitCarbonView editView; WindowRef carbon_window; EventHandlerRef carbon_event_handler; - bool carbon_parented; - bool cocoa_parented; bool _activating_from_app; - void test_view_support (bool&, bool&); bool test_cocoa_view_support (); bool test_carbon_view_support (); - int create_carbon_view (bool generic); + int create_carbon_view (); int create_cocoa_view (); int parent_carbon_window (); |