X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fplugin_ui.h;h=e65abbac59d33a8741988d6d1c441aa943f426c1;hb=49f28513f5f3f343ee9d51b0df25c7bd78478542;hp=19c2774be0773bbced67db82bfc98e925aa3e76a;hpb=c86210a9d5bdb7b36ad58552a1f99f53d48781b3;p=ardour.git

diff --git a/gtk2_ardour/plugin_ui.h b/gtk2_ardour/plugin_ui.h
index 19c2774be0..e65abbac59 100644
--- a/gtk2_ardour/plugin_ui.h
+++ b/gtk2_ardour/plugin_ui.h
@@ -34,15 +34,15 @@
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/label.h>
 #include <gtkmm/menu.h>
+#include <gtkmm/image.h>
+#include <gtkmm/adjustment.h>
 #include <gtkmm/togglebutton.h>
 #include <gtkmm/socket.h>
 #include <gtkmm/comboboxtext.h>
 #include <gtkmm/socket.h>
 
-#include <ardour/types.h>
+#include "ardour/types.h"
 
-#include "ardour_dialog.h"
-#include "latency_gui.h"
 #include "automation_controller.h"
 
 namespace ARDOUR {
@@ -65,11 +65,14 @@ namespace Gtkmm2ext {
 	class PixmapButton;
 }
 
+class LatencyGUI;
+class ArdourDialog;
+
 class PlugUIBase : public virtual sigc::trackable
 {
   public:
 	PlugUIBase (boost::shared_ptr<ARDOUR::PluginInsert>);
-	virtual ~PlugUIBase() {}
+	virtual ~PlugUIBase();
 
 	virtual gint get_preferred_height () = 0;
 	virtual gint get_preferred_width () = 0;
@@ -81,21 +84,38 @@ class PlugUIBase : public virtual sigc::trackable
 
 	virtual void update_presets ();
 
+	void latency_button_clicked ();
+
   protected:
 	boost::shared_ptr<ARDOUR::PluginInsert> insert;
 	boost::shared_ptr<ARDOUR::Plugin> plugin;
 	Gtk::ComboBoxText preset_combo;
 	Gtk::Button save_button;
 	Gtk::ToggleButton bypass_button;
-	LatencyGUI latency_gui;
+	Gtk::EventBox focus_button;
+
+	Gtk::Label latency_label;
+	Gtk::Button latency_button;
+	void set_latency_label ();
+
+	LatencyGUI* latency_gui;
+	ArdourDialog* latency_dialog;
+
+	Gtk::Expander plugin_eq_bin;
+	Gtk::ToggleButton eqgui_toggle;
+
+	Gtk::Image* focus_out_image;
+	Gtk::Image* focus_in_image;
 
 	void setting_selected();
 	void save_plugin_setting (void);
+	bool focus_toggled(GdkEventButton*);
 	void bypass_toggled();
+	void toggle_plugin_analysis ();
 	void processor_active_changed (boost::weak_ptr<ARDOUR::Processor> p);
 };
 
-class GenericPluginUI : public PlugUIBase, public Gtk::VBox 
+class GenericPluginUI : public PlugUIBase, public Gtk::HPaned
 {
   public:
 	GenericPluginUI (boost::shared_ptr<ARDOUR::PluginInsert> plug, bool scrollable=false);
@@ -108,6 +128,8 @@ class GenericPluginUI : public PlugUIBase, public Gtk::VBox
 	bool stop_updating(GdkEventAny*);
 
   private:
+	Gtk::VBox main_contents;
+
 	Gtk::HBox settings_box;
 	Gtk::HBox hpacker;
 	
@@ -152,7 +174,7 @@ class GenericPluginUI : public PlugUIBase, public Gtk::VBox
 
 		boost::shared_ptr<ARDOUR::AutomationControl> control;
 
-		ARDOUR::Parameter parameter() { return control->parameter(); }
+		Evoral::Parameter parameter() { return control->parameter(); }
 	    
 	    /* input */
 	    
@@ -188,6 +210,7 @@ class GenericPluginUI : public PlugUIBase, public Gtk::VBox
 	ControlUI* build_control_ui (guint32 port_index, boost::shared_ptr<ARDOUR::AutomationControl>);
 	std::vector<string> setup_scale_values(guint32 port_index, ControlUI* cui);
 	void parameter_changed (ControlUI* cui);
+	void toggle_parameter_changed (ControlUI* cui);
 	void update_control_display (ControlUI* cui);
 	void control_port_toggled (ControlUI* cui);
 	void control_combo_changed (ControlUI* cui);
@@ -216,6 +239,8 @@ class PluginUIWindow : public Gtk::Window
 
 	bool on_enter_notify_event (GdkEventCrossing*);
 	bool on_leave_notify_event (GdkEventCrossing*);
+	bool on_focus_in_event (GdkEventFocus*);
+	bool on_focus_out_event (GdkEventFocus*);
 	bool on_key_press_event (GdkEventKey*);
 	bool on_key_release_event (GdkEventKey*);
 	void on_show ();
@@ -224,6 +249,7 @@ class PluginUIWindow : public Gtk::Window
 
   private:
 	PlugUIBase* _pluginui;
+	sigc::connection death_connection;
 	Gtk::Window* parent;
 	Gtk::VBox vbox;
 	bool non_gtk_gui;