X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fau_pluginui.h;h=41f15a80ba30711a71f725bd990580e79321fb40;hb=ae6dbb836cc1ab1bcbc21883f282361c43f10883;hp=e15d48b922689fe4822bc8c45355b233e06d9927;hpb=7295d8e9f675f4441ab626c0655b2d2e6663e47e;p=ardour.git

diff --git a/gtk2_ardour/au_pluginui.h b/gtk2_ardour/au_pluginui.h
index e15d48b922..41f15a80ba 100644
--- a/gtk2_ardour/au_pluginui.h
+++ b/gtk2_ardour/au_pluginui.h
@@ -1,8 +1,12 @@
 #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>
 #include <AudioUnit/AudioUnit.h>
 
 /* fix up stupid apple macros */
@@ -12,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 {
@@ -31,9 +39,10 @@ class AUPluginUI : public PlugUIBase, public Gtk::VBox
 	bool start_updating(GdkEventAny*);
 	bool stop_updating(GdkEventAny*);
 	
-	virtual void activate ();
-	virtual void deactivate ();
+	void activate ();
+	void deactivate ();
 
+	void lower_box_realized ();
 	void on_realize ();
 	void on_show ();
 	void on_hide ();
@@ -49,10 +58,18 @@ class AUPluginUI : public PlugUIBase, public Gtk::VBox
 	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 */
 
 	NSWindow*           cocoa_window;
-	NSScrollView*       scroll_view;
 	NSView*             au_view;
 
 	/* Carbon */
@@ -62,14 +79,12 @@ 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;
+	NSView*              packView;
 
-	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 ();