X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fplugin_ui.h;h=16ecc4bd15fe5123b266db7f0924f201923db8c8;hb=9b17f35576a74d971b2c86558cf1cf1dec2750e0;hp=b2e0504538ae38b2ce6d8f062e949935680f0adc;hpb=aae367b63c9b619db1e40f27dc334c6987219481;p=ardour.git

diff --git a/gtk2_ardour/plugin_ui.h b/gtk2_ardour/plugin_ui.h
index b2e0504538..16ecc4bd15 100644
--- a/gtk2_ardour/plugin_ui.h
+++ b/gtk2_ardour/plugin_ui.h
@@ -72,7 +72,7 @@ namespace Gtkmm2ext {
 class LatencyGUI;
 class ArdourDialog;
 
-class PlugUIBase : public virtual sigc::trackable
+class PlugUIBase : public virtual sigc::trackable, public PBD::ScopedConnectionList
 {
   public:
 	PlugUIBase (boost::shared_ptr<ARDOUR::PluginInsert>);
@@ -86,18 +86,28 @@ class PlugUIBase : public virtual sigc::trackable
 	virtual void activate () {}
 	virtual void deactivate () {}
 
-	virtual void update_presets ();
+	void update_preset_list ();
+	void update_preset ();
 
 	void latency_button_clicked ();
 
-	virtual bool on_window_show(const Glib::ustring& /*title*/) { return true; }
+	virtual bool on_window_show(const std::string& /*title*/) { return true; }
 	virtual void on_window_hide() {}
 
+	virtual void forward_key_event (GdkEventKey*) {}
+        virtual bool non_gtk_gui() const { return false; }
+
+	sigc::signal<void,bool> KeyboardFocused;
+
   protected:
 	boost::shared_ptr<ARDOUR::PluginInsert> insert;
 	boost::shared_ptr<ARDOUR::Plugin> plugin;
-	Gtk::ComboBoxText preset_combo;
+	Gtk::HBox _preset_box;
+	Gtk::ComboBoxText _preset_combo;
+	Gtk::Label _preset_modified;
+	Gtk::Button add_button;
 	Gtk::Button save_button;
+	Gtk::Button delete_button;
 	Gtk::ToggleButton bypass_button;
 	Gtk::EventBox focus_button;
 
@@ -112,18 +122,25 @@ class PlugUIBase : public virtual sigc::trackable
 
 	Gtk::Image* focus_out_image;
 	Gtk::Image* focus_in_image;
-	bool no_load_preset;
+	int _no_load_preset;
 
-	void setting_selected();
-	void save_plugin_setting (void);
+	virtual void preset_selected ();
+	void add_plugin_setting ();
+	void save_plugin_setting ();
+	void delete_plugin_setting ();
 	bool focus_toggled(GdkEventButton*);
 	void bypass_toggled();
 	void toggle_plugin_analysis ();
 	void processor_active_changed (boost::weak_ptr<ARDOUR::Processor> p);
 	void plugin_going_away ();
+	virtual void parameter_changed (uint32_t, float);
+	void preset_added_or_removed ();
+	void update_preset_modified ();
 
 	PBD::ScopedConnection death_connection;
 	PBD::ScopedConnection active_connection;
+	PBD::ScopedConnection preset_added_connection;
+	PBD::ScopedConnection preset_removed_connection;
 	PBD::ScopedConnectionList control_connections;
 };
 
@@ -176,7 +193,7 @@ class GenericPluginUI : public PlugUIBase, public Gtk::VBox
 		}
 	};
 
-	static const int32_t initial_button_rows = 6;
+	static const int32_t initial_button_rows = 12;
 	static const int32_t initial_button_cols = 1;
 	static const int32_t initial_output_rows = 1;
 	static const int32_t initial_output_cols = 4;
@@ -214,6 +231,7 @@ class GenericPluginUI : public PlugUIBase, public Gtk::VBox
 	    ~ControlUI();
 	};
 
+	std::vector<ControlUI*>   input_controls;
 	std::vector<ControlUI*>   output_controls;
 	sigc::connection screen_update_connection;
 	void output_update();
@@ -221,7 +239,7 @@ class GenericPluginUI : public PlugUIBase, public Gtk::VBox
 	void build ();
 	ControlUI* build_control_ui (guint32 port_index, boost::shared_ptr<ARDOUR::AutomationControl>);
 	std::vector<std::string> setup_scale_values(guint32 port_index, ControlUI* cui);
-	void parameter_changed (ControlUI* cui);
+	void ui_parameter_changed (ControlUI* cui);
 	void toggle_parameter_changed (ControlUI* cui);
 	void update_control_display (ControlUI* cui);
 	void control_port_toggled (ControlUI* cui);
@@ -248,7 +266,7 @@ class PluginUIWindow : public Gtk::Window
 
 	void resize_preferred();
 	void set_parent (Gtk::Window*);
-	void set_title(const Glib::ustring& title);
+	void set_title(const std::string& title);
 
 
 	bool on_enter_notify_event (GdkEventCrossing*);
@@ -262,13 +280,14 @@ class PluginUIWindow : public Gtk::Window
 	void on_map ();
 
   private:
-	Glib::ustring _title;
+	std::string _title;
 	PlugUIBase* _pluginui;
-	boost::signals2::scoped_connection death_connection;
+	PBD::ScopedConnection death_connection;
 	Gtk::Window* parent;
 	Gtk::VBox vbox;
-	bool non_gtk_gui;
 	bool was_visible;
+	bool _keyboard_focused;
+	void keyboard_focused (bool yn);
 
 	void app_activated (bool);
 	void plugin_going_away ();
@@ -278,32 +297,7 @@ class PluginUIWindow : public Gtk::Window
 	bool create_lv2_editor (boost::shared_ptr<ARDOUR::PluginInsert>);
 };
 
-#ifdef VST_SUPPORT
-class VSTPluginUI : public PlugUIBase, public Gtk::VBox
-{
-  public:
-	VSTPluginUI (boost::shared_ptr<ARDOUR::PluginInsert>, boost::shared_ptr<ARDOUR::VSTPlugin>);
-	~VSTPluginUI ();
-
-	gint get_preferred_height ();
-	gint get_preferred_width ();
-	bool start_updating(GdkEventAny*) {return false;}
-	bool stop_updating(GdkEventAny*) {return false;}
-
-	int package (Gtk::Window&);
-
-  private:
-	boost::shared_ptr<ARDOUR::VSTPlugin>  vst;
-	Gtk::Socket socket;
-	Gtk::HBox   preset_box;
-	Gtk::VBox   vpacker;
-
-	bool configure_handler (GdkEventConfigure*, Gtk::Socket*);
-	void save_plugin_setting ();
-};
-#endif // VST_SUPPORT
-
-#ifdef HAVE_AUDIOUNITS
+#ifdef AUDIOUNITS
 /* this function has to be in a .mm file */
 extern PlugUIBase* create_au_gui (boost::shared_ptr<ARDOUR::PluginInsert>, Gtk::VBox**);
 #endif