Move ParameterDescriptor from Plugin to its own header.

This fixes circular dependency issues that arise when using ParameterDescriptor more widely.

2 files changed, 13 insertions, 13 deletions

diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc
index b50d888f2f..459c8d54d9 100644
--- a/gtk2_ardour/generic_pluginui.cc
+++ b/gtk2_ardour/generic_pluginui.cc
@@ -262,7 +262,7 @@ GenericPluginUI::build ()
 				= boost::dynamic_pointer_cast<ARDOUR::AutomationControl>(
 					insert->control(Evoral::Parameter(PluginAutomation, 0, i)));
 
-			Plugin::ParameterDescriptor desc;
+			ParameterDescriptor desc;
 			plugin->get_parameter_descriptor(i, desc);
 			if ((cui = build_control_ui (desc, c, plugin->parameter_is_input(i))) == 0) {
 				error << string_compose(_("Plugin Editor: could not build control element for port %1"), i) << endmsg;
@@ -308,7 +308,7 @@ GenericPluginUI::build ()
 	}
 
 	// Add property controls (currently file chooser button for paths only)
-	typedef std::vector<Plugin::ParameterDescriptor> Descs;
+	typedef std::vector<ParameterDescriptor> Descs;
 	Descs descs;
 	plugin->get_supported_properties(descs);
 	for (Descs::const_iterator d = descs.begin(); d != descs.end(); ++d) {
@@ -514,7 +514,7 @@ GenericPluginUI::integer_printer (char buf[32], Adjustment &adj, ControlUI* cui)
 	float const v = adj.get_value ();
 	
 	if (cui->scale_points) {
-		Plugin::ScalePoints::const_iterator i = cui->scale_points->begin ();
+		ScalePoints::const_iterator i = cui->scale_points->begin ();
 		while (i != cui->scale_points->end() && i->second != v) {
 			++i;
 		}
@@ -535,7 +535,7 @@ GenericPluginUI::midinote_printer (char buf[32], Adjustment &adj, ControlUI* cui
 	float const v = adj.get_value ();
 
 	if (cui->scale_points) {
-		Plugin::ScalePoints::const_iterator i = cui->scale_points->begin ();
+		ScalePoints::const_iterator i = cui->scale_points->begin ();
 		while (i != cui->scale_points->end() && i->second != v) {
 			++i;
 		}
@@ -562,7 +562,7 @@ GenericPluginUI::print_parameter (char *buf, uint32_t len, uint32_t param)
 }
 
 GenericPluginUI::ControlUI*
-GenericPluginUI::build_control_ui (const Plugin::ParameterDescriptor&   desc,
+GenericPluginUI::build_control_ui (const ParameterDescriptor&           desc,
                                    boost::shared_ptr<AutomationControl> mcontrol,
                                    bool                                 is_input)
 {
@@ -601,7 +601,7 @@ GenericPluginUI::build_control_ui (const Plugin::ParameterDescriptor&   desc,
 
 			std::vector<std::string> labels;
 			for (
-				ARDOUR::Plugin::ScalePoints::const_iterator i = control_ui->scale_points->begin();
+				ARDOUR::ScalePoints::const_iterator i = control_ui->scale_points->begin();
 				i != control_ui->scale_points->end();
 				++i) {
 				
@@ -855,7 +855,7 @@ GenericPluginUI::update_control_display (ControlUI* cui)
 	cui->ignore_change++;
 
 	if (cui->combo && cui->scale_points) {
-		for (ARDOUR::Plugin::ScalePoints::iterator it = cui->scale_points->begin(); it != cui->scale_points->end(); ++it) {
+		for (ARDOUR::ScalePoints::iterator it = cui->scale_points->begin(); it != cui->scale_points->end(); ++it) {
 			if (it->second == val) {
 				cui->combo->set_active_text(it->first);
 				break;
@@ -969,8 +969,8 @@ GenericPluginUI::output_update ()
 }
 
 void
-GenericPluginUI::set_property (const Plugin::ParameterDescriptor& desc,
-                               Gtk::FileChooserButton*            widget)
+GenericPluginUI::set_property (const ParameterDescriptor& desc,
+                               Gtk::FileChooserButton*    widget)
 {
 	plugin->set_property(desc.key, Variant(Variant::PATH, widget->get_filename()));
 }
diff --git a/gtk2_ardour/plugin_ui.h b/gtk2_ardour/plugin_ui.h
index 1f2a390373..9ebd56436e 100644
--- a/gtk2_ardour/plugin_ui.h
+++ b/gtk2_ardour/plugin_ui.h
@@ -233,7 +233,7 @@ class GenericPluginUI : public PlugUIBase, public Gtk::VBox
 		/* input */
 
 		Gtk::ComboBoxText*                      combo;
-		boost::shared_ptr<ARDOUR::Plugin::ScalePoints> scale_points;
+		boost::shared_ptr<ARDOUR::ScalePoints>  scale_points;
 		Gtk::ToggleButton*                      button;
 		boost::shared_ptr<AutomationController> controller;
 		Gtkmm2ext::ClickBox*                    clickbox;
@@ -261,7 +261,7 @@ class GenericPluginUI : public PlugUIBase, public Gtk::VBox
 	void output_update();
 
 	void build ();
-	ControlUI* build_control_ui (const ARDOUR::Plugin::ParameterDescriptor&   desc,
+	ControlUI* build_control_ui (const ARDOUR::ParameterDescriptor&           desc,
 	                             boost::shared_ptr<ARDOUR::AutomationControl> mcontrol,
 	                             bool                                         is_input);
 
@@ -282,8 +282,8 @@ class GenericPluginUI : public PlugUIBase, public Gtk::VBox
 	bool integer_printer (char* buf, Gtk::Adjustment &, ControlUI *);
 	bool midinote_printer(char* buf, Gtk::Adjustment &, ControlUI *);
 
-	void set_property (const ARDOUR::Plugin::ParameterDescriptor& desc,
-	                   Gtk::FileChooserButton*                    widget);
+	void set_property (const ARDOUR::ParameterDescriptor& desc,
+	                   Gtk::FileChooserButton*            widget);
 	void property_changed (uint32_t key, const ARDOUR::Variant& value);
 
 	typedef std::map<uint32_t, Gtk::FileChooserButton*> PropertyControls;