X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fplugin_ui.h;h=92af891803b8649a4bd22c3af2aa4e11f8026b8a;hb=75a3964c1073832249d1d8776f46fedbd9f97035;hp=743234f16af5e1d116f83d894552371a0081664e;hpb=041c8821438b2c6a83e1513fa2aedf7bbb8cbffd;p=ardour.git

diff --git a/gtk2_ardour/plugin_ui.h b/gtk2_ardour/plugin_ui.h
index 743234f16a..92af891803 100644
--- a/gtk2_ardour/plugin_ui.h
+++ b/gtk2_ardour/plugin_ui.h
@@ -46,15 +46,19 @@
 #include <gtkmm/socket.h>
 
 #include "ardour/types.h"
+#include "ardour/plugin.h"
 
 #include "automation_controller.h"
+#include "ardour_button.h"
 
 namespace ARDOUR {
 	class PluginInsert;
 	class Plugin;
-	class VSTPlugin;
+	class WindowsVSTPlugin;
+	class LXVSTPlugin;
 	class IOProcessor;
 	class AUPlugin;
+	class Processor;
 }
 
 namespace PBD {
@@ -70,7 +74,7 @@ namespace Gtkmm2ext {
 }
 
 class LatencyGUI;
-class ArdourDialog;
+class ArdourWindow;
 class PluginEqGui;
 
 class PlugUIBase : public virtual sigc::trackable, public PBD::ScopedConnectionList
@@ -103,23 +107,35 @@ class PlugUIBase : public virtual sigc::trackable, public PBD::ScopedConnectionL
   protected:
 	boost::shared_ptr<ARDOUR::PluginInsert> insert;
 	boost::shared_ptr<ARDOUR::Plugin> plugin;
-	Gtk::HBox _preset_box;
+
+	/* UI elements that can subclasses can add to their widgets */
+
+	/** a ComboBoxText which lists presets and manages their selection */
 	Gtk::ComboBoxText _preset_combo;
+	/** a label which has a * in if the current settings are different from the preset being shown */
 	Gtk::Label _preset_modified;
+	/** a button to add a preset */
 	Gtk::Button add_button;
+	/** a button to save the current settings as a new user preset */
 	Gtk::Button save_button;
+	/** a button to delete the current preset (if it is a user one) */
 	Gtk::Button delete_button;
-	Gtk::ToggleButton bypass_button;
+	/** a button to bypass the plugin */
+	ArdourButton bypass_button;
+	/** a button to acquire keyboard focus */
 	Gtk::EventBox focus_button;
-
+	/** an expander containing the plugin analysis graph */
+	Gtk::Expander plugin_analysis_expander;
+	/** a label indicating the plugin latency */
 	Gtk::Label latency_label;
+	/** a button which, when clicked, opens the latency GUI */
 	Gtk::Button latency_button;
+	
 	void set_latency_label ();
 
 	LatencyGUI* latency_gui;
-	ArdourDialog* latency_dialog;
+	ArdourWindow* latency_dialog;
 
-	Gtk::Expander plugin_analysis_expander;
 	PluginEqGui* eqgui;
 	Gtk::Requisition pre_eq_size;
 
@@ -132,7 +148,7 @@ class PlugUIBase : public virtual sigc::trackable, public PBD::ScopedConnectionL
 	void save_plugin_setting ();
 	void delete_plugin_setting ();
 	bool focus_toggled(GdkEventButton*);
-	void bypass_toggled();
+	bool bypass_button_release(GdkEventButton*);
 	void toggle_plugin_analysis ();
 	void processor_active_changed (boost::weak_ptr<ARDOUR::Processor> p);
 	void plugin_going_away ();
@@ -210,9 +226,9 @@ class GenericPluginUI : public PlugUIBase, public Gtk::VBox
 		Evoral::Parameter parameter() { return control->parameter(); }
 
 		/* input */
-		
+
 		Gtk::ComboBoxText*                      combo;
-		std::map<std::string, float>*           combo_map;
+		boost::shared_ptr<ARDOUR::Plugin::ScalePoints> combo_map;
 		Gtk::ToggleButton*                      button;
 		boost::shared_ptr<AutomationController> controller;
 		Gtkmm2ext::ClickBox*                    clickbox;
@@ -220,9 +236,9 @@ class GenericPluginUI : public PlugUIBase, public Gtk::VBox
 		bool                                    update_pending;
 		char                                    ignore_change;
 		Gtk::Button                             automate_button;
-		
+
 		/* output */
-		
+
 		Gtk::EventBox* display;
 		Gtk::Label*    display_label;
 
@@ -247,8 +263,6 @@ class GenericPluginUI : public PlugUIBase, public Gtk::VBox
 	void control_port_toggled (ControlUI* cui);
 	void control_combo_changed (ControlUI* cui);
 
-	void processor_active_changed (boost::weak_ptr<ARDOUR::Processor>);
-
 	void astate_clicked (ControlUI*, uint32_t parameter);
 	void automation_state_changed (ControlUI*);
 	void set_automation_state (ARDOUR::AutoState state, ControlUI* cui);
@@ -297,12 +311,13 @@ class PluginUIWindow : public Gtk::Window
 	void app_activated (bool);
 	void plugin_going_away ();
 
-	bool create_vst_editor (boost::shared_ptr<ARDOUR::PluginInsert>);
+	bool create_windows_vst_editor (boost::shared_ptr<ARDOUR::PluginInsert>);
+	bool create_lxvst_editor(boost::shared_ptr<ARDOUR::PluginInsert>);
 	bool create_audiounit_editor (boost::shared_ptr<ARDOUR::PluginInsert>);
 	bool create_lv2_editor (boost::shared_ptr<ARDOUR::PluginInsert>);
 };
 
-#ifdef AUDIOUNITS
+#ifdef AUDIOUNIT_SUPPORT
 /* this function has to be in a .mm file */
 extern PlugUIBase* create_au_gui (boost::shared_ptr<ARDOUR::PluginInsert>, Gtk::VBox**);
 #endif