s/ParamID/Parameter/

git-svn-id: svn://localhost/ardour2/trunk@2098 d708f5d6-7413-0410-9779-e7cbd77b26cf

16 files changed, 81 insertions, 81 deletions

diff --git a/gtk2_ardour/add_midi_cc_track_dialog.cc b/gtk2_ardour/add_midi_cc_track_dialog.cc
index c80b641358..8402f47ea1 100644
--- a/gtk2_ardour/add_midi_cc_track_dialog.cc
+++ b/gtk2_ardour/add_midi_cc_track_dialog.cc
@@ -62,11 +62,11 @@ AddMidiCCTrackDialog::AddMidiCCTrackDialog ()
 }
 
 
-ARDOUR::ParamID
+ARDOUR::Parameter
 AddMidiCCTrackDialog::parameter ()
 {
 	int cc_num = _cc_num_spinner.get_value_as_int();
 
-	return ParamID(MidiCCAutomation, cc_num);
+	return Parameter(MidiCCAutomation, cc_num);
 }
 
diff --git a/gtk2_ardour/add_midi_cc_track_dialog.h b/gtk2_ardour/add_midi_cc_track_dialog.h
index 1791d22169..f1ca24990f 100644
--- a/gtk2_ardour/add_midi_cc_track_dialog.h
+++ b/gtk2_ardour/add_midi_cc_track_dialog.h
@@ -27,14 +27,14 @@
 #include <gtkmm/spinbutton.h>
 #include <ardour/types.h>
 #include <ardour/data_type.h>
-#include <ardour/param_id.h>
+#include <ardour/parameter.h>
 
 class AddMidiCCTrackDialog : public Gtk::Dialog
 {
   public:
 	AddMidiCCTrackDialog ();
 
-	ARDOUR::ParamID parameter ();
+	ARDOUR::Parameter parameter ();
 
   private:
 	Gtk::Adjustment _cc_num_adjustment;
diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index 6e80c0b636..0b20c007ef 100644
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -279,7 +279,7 @@ AudioTimeAxisView::set_waveform_scale (WaveformScale scale)
 }	
 
 void
-AudioTimeAxisView::create_automation_child (ParamID param)
+AudioTimeAxisView::create_automation_child (Parameter param)
 {
 	if (param.type() == GainAutomation) {
 
@@ -295,9 +295,9 @@ AudioTimeAxisView::create_automation_child (ParamID param)
 				*this,
 				parent_canvas,
 				_route->describe_parameter(param),
-				c->list()->param_id().to_string() /* FIXME: correct state name? */));
+				c->list()->parameter().to_string() /* FIXME: correct state name? */));
 
-		add_automation_child(ParamID(GainAutomation), gain_track);
+		add_automation_child(Parameter(GainAutomation), gain_track);
 
 	} else if (param.type() == PanAutomation) {
 
@@ -338,7 +338,7 @@ AudioTimeAxisView::update_pans ()
 	for (p = _route->panner().begin(); p != _route->panner().end(); ++p) {
 		boost::shared_ptr<AutomationControl> pan_control = (*p)->pan_control();
 		
-		if (pan_control->list()->param_id().type() == NullAutomation) {
+		if (pan_control->list()->parameter().type() == NullAutomation) {
 			error << "Pan control has NULL automation type!" << endmsg;
 			continue;
 		}
@@ -348,9 +348,9 @@ AudioTimeAxisView::update_pans ()
 					editor,
 					*this,
 					parent_canvas,
-					_route->describe_parameter(pan_control->list()->param_id()),
-					pan_control->list()->param_id().to_string()/* FIXME: correct state name? */));
-		add_automation_child(ParamID(PanAutomation, i), pan_track);
+					_route->describe_parameter(pan_control->list()->parameter()),
+					pan_control->list()->parameter().to_string()/* FIXME: correct state name? */));
+		add_automation_child(Parameter(PanAutomation, i), pan_track);
 		++i;
 	}
 }
diff --git a/gtk2_ardour/audio_time_axis.h b/gtk2_ardour/audio_time_axis.h
index 9354895f47..f903559e98 100644
--- a/gtk2_ardour/audio_time_axis.h
+++ b/gtk2_ardour/audio_time_axis.h
@@ -82,7 +82,7 @@ class AudioTimeAxisView : public RouteTimeAxisView
 	guint32 show_at (double y, int& nth, Gtk::VBox *parent);
 	void hide ();
 	
-	void create_automation_child (ARDOUR::ParamID param);
+	void create_automation_child (ARDOUR::Parameter param);
 	
   private:
 	friend class AudioStreamView;
diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc
index 3cb4cc5a1e..56ace4db32 100644
--- a/gtk2_ardour/automation_controller.cc
+++ b/gtk2_ardour/automation_controller.cc
@@ -65,7 +65,7 @@ AutomationController::create(Session& s, boost::shared_ptr<AutomationList> al, b
 {
 	Gtk::Adjustment* adjustment = manage(new Gtk::Adjustment(al->default_value(), al->get_min_y(), al->get_max_y()));
 	if (!ac) {
-		PBD::warning << "Creating AutomationController for " << al->param_id().to_string() << endmsg;
+		PBD::warning << "Creating AutomationController for " << al->parameter().to_string() << endmsg;
 		ac = boost::shared_ptr<AutomationControl>(new AutomationControl(s, al));
 	}
 	return boost::shared_ptr<AutomationController>(new AutomationController(ac, adjustment));
@@ -76,7 +76,7 @@ AutomationController::update_label(char* label, int label_len)
 {
 	if (label && label_len)
 		// Hack to display CC rounded to int
-		if (_controllable->list()->param_id().type() == MidiCCAutomation)
+		if (_controllable->list()->parameter().type() == MidiCCAutomation)
 			snprintf(label, label_len, "%d", (int)_controllable->get_value());
 		else
 			snprintf(label, label_len, "%.3f", _controllable->get_value());
diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
index bbbed006c5..77f9adb757 100644
--- a/gtk2_ardour/automation_line.cc
+++ b/gtk2_ardour/automation_line.cc
@@ -249,7 +249,7 @@ AutomationLine::AutomationLine (const string & name, TimeAxisView& tv, ArdourCan
 
 	trackview.session().register_with_memento_command_factory(alist->id(), this);
 
-	if (alist->param_id().type() == GainAutomation)
+	if (alist->parameter().type() == GainAutomation)
 		set_verbose_cursor_uses_gain_mapping (true);
 }
 
@@ -1297,14 +1297,14 @@ AutomationLine::set_state (const XMLNode &node)
 void
 AutomationLine::view_to_model_y (double& y)
 {
-	if (alist->param_id().type() == GainAutomation) {
+	if (alist->parameter().type() == GainAutomation) {
 		y = slider_position_to_gain (y);
 		y = max (0.0, y);
 		y = min (2.0, y);
-	} else if (alist->param_id().type() == PanAutomation) {
+	} else if (alist->parameter().type() == PanAutomation) {
 		// vertical coordinate axis reversal
 		y = 1.0 - y;
-	} else if (alist->param_id().type() == MidiCCAutomation) {
+	} else if (alist->parameter().type() == MidiCCAutomation) {
 		y = (int)(y * 127.0);
 	}
 }
@@ -1312,14 +1312,14 @@ AutomationLine::view_to_model_y (double& y)
 void
 AutomationLine::model_to_view_y (double& y)
 {
-	if (alist->param_id().type() == GainAutomation) {
+	if (alist->parameter().type() == GainAutomation) {
 		y = gain_to_slider_position (y);
-	} else if (alist->param_id().type() == PanAutomation) {
+	} else if (alist->parameter().type() == PanAutomation) {
 		// vertical coordinate axis reversal
 		y = 1.0 - y;
-	} else if (alist->param_id().type() == MidiCCAutomation) {
+	} else if (alist->parameter().type() == MidiCCAutomation) {
 		y = y / 127.0;
-	} else if (alist->param_id().type() == PluginAutomation) {
+	} else if (alist->parameter().type() == PluginAutomation) {
 		y = (y - alist->get_min_y()) / (double)(alist->get_max_y()- alist->get_min_y());
 	}
 }
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index 465945fadf..855b34ffc6 100644
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -194,7 +194,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 	} 
 		
 	boost::shared_ptr<AutomationLine> line(new AutomationLine (
-				_control->list()->param_id().to_string(),
+				_control->list()->parameter().to_string(),
 				*this,
 				*canvas_display,
 				_control->list()));
@@ -247,7 +247,7 @@ AutomationTimeAxisView::set_automation_state (AutoState state)
 	if (!ignore_state_request) {
 		if (_route == _automatable) { // FIXME: ew
 			_route->set_parameter_automation_state (
-					_control->list()->param_id(),
+					_control->list()->parameter(),
 					state);
 		}
 
@@ -869,7 +869,7 @@ AutomationTimeAxisView::set_state (const XMLNode& node)
 	//snprintf (buf, sizeof(buf), "Port_%" PRIu32, param.id());
 		
 	for (iter = kids.begin(); iter != kids.end(); ++iter) {
-		if ((*iter)->name() == _control->list()->param_id().to_string()) {
+		if ((*iter)->name() == _control->list()->parameter().to_string()) {
 		
 			XMLProperty *shown = (*iter)->property("shown_editor");
 			
@@ -929,7 +929,7 @@ AutomationTimeAxisView::update_extra_xml_shown (bool editor_shown)
 
 	for (i = nlist.begin(); i != nlist.end(); ++i) {
 		/* FIXME: legacy session loading */
-		if ((*i)->name() == _control->list()->param_id().to_string()) {
+		if ((*i)->name() == _control->list()->parameter().to_string()) {
 			port_node = (*i);
 			break;
 		}
diff --git a/gtk2_ardour/crossfade_edit.cc b/gtk2_ardour/crossfade_edit.cc
index 971abbe3ae..8e9c4f07dd 100644
--- a/gtk2_ardour/crossfade_edit.cc
+++ b/gtk2_ardour/crossfade_edit.cc
@@ -65,8 +65,8 @@ CrossfadeEditor::Presets* CrossfadeEditor::fade_out_presets = 0;
 
 CrossfadeEditor::Half::Half ()
 	: line (0), 
-	  normative_curve (ParamID(GainAutomation), 0.0, 1.0, 1.0), // FIXME: GainAutomation?
-	  gain_curve (ParamID(GainAutomation), 0.0, 2.0, 1.0)
+	  normative_curve (Parameter(GainAutomation), 0.0, 1.0, 1.0), // FIXME: GainAutomation?
+	  gain_curve (Parameter(GainAutomation), 0.0, 2.0, 1.0)
 {
 }
 
diff --git a/gtk2_ardour/curvetest.cc b/gtk2_ardour/curvetest.cc
index 71f0600f32..48650c0353 100644
--- a/gtk2_ardour/curvetest.cc
+++ b/gtk2_ardour/curvetest.cc
@@ -33,7 +33,7 @@ curvetest (string filename)
 {
 	ifstream in (filename.c_str());
 	stringstream line;
-	AutomationList al (ParamID(), -1.0, +1.0, 0);
+	AutomationList al (Parameter(), -1.0, +1.0, 0);
 	double minx = DBL_MAX;
 	double maxx = DBL_MIN;
 
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index d365066774..a1ecd8586d 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -167,16 +167,16 @@ GainMeter::GainMeter (boost::shared_ptr<IO> io, Session& s)
 	
 		gain_astate_menu.items().push_back (MenuElem (_("Manual"), 
 						      bind (mem_fun (*_io, &IO::set_parameter_automation_state),
-								  ParamID(GainAutomation), (AutoState) Off)));
+								  Parameter(GainAutomation), (AutoState) Off)));
 		gain_astate_menu.items().push_back (MenuElem (_("Play"),
 						      bind (mem_fun (*_io, &IO::set_parameter_automation_state),
-								  ParamID(GainAutomation), (AutoState) Play)));
+								  Parameter(GainAutomation), (AutoState) Play)));
 		gain_astate_menu.items().push_back (MenuElem (_("Write"),
 						      bind (mem_fun (*_io, &IO::set_parameter_automation_state),
-								  ParamID(GainAutomation), (AutoState) Write)));
+								  Parameter(GainAutomation), (AutoState) Write)));
 		gain_astate_menu.items().push_back (MenuElem (_("Touch"),
 						      bind (mem_fun (*_io, &IO::set_parameter_automation_state),
-								  ParamID(GainAutomation), (AutoState) Touch)));
+								  Parameter(GainAutomation), (AutoState) Touch)));
 	
 		gain_astyle_menu.items().push_back (MenuElem (_("Trim")));
 		gain_astyle_menu.items().push_back (MenuElem (_("Abs")));
diff --git a/gtk2_ardour/ladspa_pluginui.cc b/gtk2_ardour/ladspa_pluginui.cc
index c6b878287e..ffab3c18f9 100644
--- a/gtk2_ardour/ladspa_pluginui.cc
+++ b/gtk2_ardour/ladspa_pluginui.cc
@@ -182,7 +182,7 @@ LadspaPluginUI::build ()
 			
 			/* Don't show latency control ports */
 
-			if (plugin->describe_parameter (ParamID(PluginAutomation, i)) == X_("latency")) {
+			if (plugin->describe_parameter (Parameter(PluginAutomation, i)) == X_("latency")) {
 				continue;
 			}
 
@@ -206,7 +206,7 @@ LadspaPluginUI::build ()
 				}
 			}
 
-			if ((cui = build_control_ui (i, insert->control(ParamID(PluginAutomation, i)))) == 0) {
+			if ((cui = build_control_ui (i, insert->control(Parameter(PluginAutomation, i)))) == 0) {
 				error << string_compose(_("Plugin Editor: could not build control element for port %1"), i) << endmsg;
 				continue;
 			}
@@ -325,7 +325,7 @@ LadspaPluginUI::automation_state_changed (ControlUI* cui)
 
 	// don't lock to avoid deadlock because we're triggered by
 	// AutomationControl::Changed() while the automation lock is taken
-	switch (insert->get_parameter_automation_state (cui->param_id(), false)
+	switch (insert->get_parameter_automation_state (cui->parameter(), false)
 			& (Off|Play|Touch|Write)) {
 	case Off:
 		cui->automate_button.set_label (_("Manual"));
@@ -586,7 +586,7 @@ LadspaPluginUI::astate_clicked (ControlUI* cui, uint32_t port)
 void
 LadspaPluginUI::set_automation_state (AutoState state, ControlUI* cui)
 {
-	insert->set_parameter_automation_state (cui->param_id(), state);
+	insert->set_parameter_automation_state (cui->parameter(), state);
 }
 
 void
@@ -643,7 +643,7 @@ void
 LadspaPluginUI::control_port_toggled (ControlUI* cui)
 {
 	if (!cui->ignore_change) {
-		insert->set_parameter (cui->param_id(), cui->button->get_active());
+		insert->set_parameter (cui->parameter(), cui->button->get_active());
 	}
 }
 
@@ -653,7 +653,7 @@ LadspaPluginUI::control_combo_changed (ControlUI* cui)
 	if (!cui->ignore_change) {
 		string value = cui->combo->get_active_text();
 		std::map<string,float> mapping = *cui->combo_map;
-		insert->set_parameter (cui->param_id(), mapping[value]);
+		insert->set_parameter (cui->parameter(), mapping[value]);
 	}
 
 }
@@ -692,7 +692,7 @@ void
 LadspaPluginUI::output_update ()
 {
 	for (vector<ControlUI*>::iterator i = output_controls.begin(); i != output_controls.end(); ++i) {
-		float val = plugin->get_parameter ((*i)->param_id().id());
+		float val = plugin->get_parameter ((*i)->parameter().id());
 		char buf[32];
 		snprintf (buf, sizeof(buf), "%.2f", val);
 		(*i)->display_label->set_text (buf);
diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc
index 09bda6a2d7..62eec3661a 100644
--- a/gtk2_ardour/midi_time_axis.cc
+++ b/gtk2_ardour/midi_time_axis.cc
@@ -167,7 +167,7 @@ void
 MidiTimeAxisView::add_controller_track()
 {
 	int response;
-	ParamID param;
+	Parameter param;
 
 	{
 		AddMidiCCTrackDialog dialog;
@@ -183,7 +183,7 @@ MidiTimeAxisView::add_controller_track()
 }
 
 void
-MidiTimeAxisView::create_automation_child (ParamID param)
+MidiTimeAxisView::create_automation_child (Parameter param)
 {
 	if (param.type() == MidiCCAutomation) {
 	
@@ -203,7 +203,7 @@ MidiTimeAxisView::create_automation_child (ParamID param)
 				*this,
 				parent_canvas,
 				_route->describe_parameter(param),
-				c->list()->param_id().to_string() /* FIXME: correct state name? */));
+				c->list()->parameter().to_string() /* FIXME: correct state name? */));
 		
 		add_automation_child(param, track);
 
diff --git a/gtk2_ardour/midi_time_axis.h b/gtk2_ardour/midi_time_axis.h
index b41ca852fe..34074b15d9 100644
--- a/gtk2_ardour/midi_time_axis.h
+++ b/gtk2_ardour/midi_time_axis.h
@@ -61,7 +61,7 @@ class MidiTimeAxisView : public RouteTimeAxisView
 	void hide ();
 
 	void add_controller_track ();
-	void create_automation_child (ARDOUR::ParamID param);
+	void create_automation_child (ARDOUR::Parameter param);
 
   private:
 	
diff --git a/gtk2_ardour/plugin_ui.h b/gtk2_ardour/plugin_ui.h
index 2229c1b01f..6b1ead881e 100644
--- a/gtk2_ardour/plugin_ui.h
+++ b/gtk2_ardour/plugin_ui.h
@@ -144,7 +144,7 @@ class LadspaPluginUI : public PlugUIBase, public Gtk::VBox
 
 		boost::shared_ptr<ARDOUR::AutomationControl> control;
 
-		ARDOUR::ParamID param_id() { return control->list()->param_id(); }
+		ARDOUR::Parameter parameter() { return control->list()->parameter(); }
 	    
 	    /* input */
 	    
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index e4c285f7ac..596f84c249 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -51,7 +51,7 @@
 #include <ardour/session.h>
 #include <ardour/session_playlist.h>
 #include <ardour/utils.h>
-#include <ardour/param_id.h>
+#include <ardour/parameter.h>
 
 #include "ardour_ui.h"
 #include "route_time_axis.h"
@@ -277,7 +277,7 @@ RouteTimeAxisView::set_state (const XMLNode& node)
 	for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
 		child_node = *niter;
 		
-		ParamID param(child_node->name());
+		Parameter param(child_node->name());
 
 		if (param) {
 		
@@ -287,7 +287,7 @@ RouteTimeAxisView::set_state (const XMLNode& node)
 				create_automation_child(param);
 
 			if (prop != 0 && prop->value() == "yes")
-				_show_automation.insert(ParamID(GainAutomation));
+				_show_automation.insert(Parameter(GainAutomation));
 
 		} else {
 			warning << "GUI info exists, but no parameter " << child_node->name() << " found." << endmsg;
@@ -439,7 +439,7 @@ RouteTimeAxisView::build_automation_action_menu ()
 
 	automation_items.push_back (MenuElem (_("Plugins"), subplugin_menu));
 	
-	map<ARDOUR::ParamID, RouteAutomationNode*>::iterator i;
+	map<ARDOUR::Parameter, RouteAutomationNode*>::iterator i;
 	for (i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
 
 		automation_items.push_back (SeparatorElem());
@@ -1162,7 +1162,7 @@ RouteTimeAxisView::get_inverted_selectables (Selection& sel, list<Selectable*>&
 }
 
 bool
-RouteTimeAxisView::show_automation(ParamID param)
+RouteTimeAxisView::show_automation(Parameter param)
 {
 	return (_show_automation.find(param) != _show_automation.end());
 }
@@ -1170,9 +1170,9 @@ RouteTimeAxisView::show_automation(ParamID param)
 /** Retuns NULL if track for \a param doesn't exist.
  */
 RouteTimeAxisView::RouteAutomationNode*
-RouteTimeAxisView::automation_track(ParamID param)
+RouteTimeAxisView::automation_track(Parameter param)
 {
-	map<ARDOUR::ParamID, RouteAutomationNode*>::iterator i = _automation_tracks.find(param);
+	map<ARDOUR::Parameter, RouteAutomationNode*>::iterator i = _automation_tracks.find(param);
 
 	if (i != _automation_tracks.end())
 		return i->second;
@@ -1185,7 +1185,7 @@ RouteTimeAxisView::automation_track(ParamID param)
 RouteTimeAxisView::RouteAutomationNode*
 RouteTimeAxisView::automation_track(AutomationType type)
 {
-	return automation_track(ParamID(type));
+	return automation_track(Parameter(type));
 }
 
 RouteGroup*
@@ -1476,7 +1476,7 @@ RouteTimeAxisView::color_handler ()
 }
 
 void
-RouteTimeAxisView::toggle_automation_track (ParamID param)
+RouteTimeAxisView::toggle_automation_track (Parameter param)
 {
 	RouteAutomationNode* node = automation_track(param);
 
@@ -1505,7 +1505,7 @@ RouteTimeAxisView::toggle_automation_track (ParamID param)
 }
 
 void
-RouteTimeAxisView::automation_track_hidden (ParamID param)
+RouteTimeAxisView::automation_track_hidden (Parameter param)
 {
 	RouteAutomationNode* ran = automation_track(param);
 	if (!ran)
@@ -1529,7 +1529,7 @@ RouteTimeAxisView::show_all_automation ()
 	
 	/* Show our automation */
 
-	map<ARDOUR::ParamID, RouteAutomationNode*>::iterator i;
+	map<ARDOUR::Parameter, RouteAutomationNode*>::iterator i;
 	for (i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
 		i->second->track->set_marked_for_display (true);
 		i->second->track->canvas_display->show();
@@ -1565,7 +1565,7 @@ RouteTimeAxisView::show_existing_automation ()
 	
 	/* Show our automation */
 
-	map<ARDOUR::ParamID, RouteAutomationNode*>::iterator i;
+	map<ARDOUR::Parameter, RouteAutomationNode*>::iterator i;
 	for (i = _automation_tracks.begin(); i != _automation_tracks.end(); ++i) {
 		if (i->second->track->line() && i->second->track->line()->npoints() > 0) {
 			i->second->track->set_marked_for_display (true);
@@ -1649,7 +1649,7 @@ RouteTimeAxisView::remove_processor_automation_node (ProcessorAutomationNode* pa
 }
 
 RouteTimeAxisView::ProcessorAutomationNode*
-RouteTimeAxisView::find_processor_automation_node (boost::shared_ptr<Processor> processor, ParamID what)
+RouteTimeAxisView::find_processor_automation_node (boost::shared_ptr<Processor> processor, Parameter what)
 {
 	for (list<ProcessorAutomationInfo*>::iterator i = processor_automation.begin(); i != processor_automation.end(); ++i) {
 
@@ -1686,7 +1686,7 @@ legalize_for_xml_node (string str)
 
 
 void
-RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr<Processor> processor, ParamID what)
+RouteTimeAxisView::add_processor_automation_curve (boost::shared_ptr<Processor> processor, Parameter what)
 {
 	string name;
 	ProcessorAutomationNode* pan;
@@ -1751,12 +1751,12 @@ RouteTimeAxisView::processor_automation_track_hidden (RouteTimeAxisView::Process
 void
 RouteTimeAxisView::add_existing_processor_automation_curves (boost::shared_ptr<Processor> processor)
 {
-	set<ParamID> s;
+	set<Parameter> s;
 	boost::shared_ptr<AutomationLine> al;
 
 	processor->what_has_visible_automation (s);
 
-	for (set<ParamID>::iterator i = s.begin(); i != s.end(); ++i) {
+	for (set<Parameter>::iterator i = s.begin(); i != s.end(); ++i) {
 		
 		if ((al = find_processor_automation_curve (processor, *i)) != 0) {
 			al->queue_reset ();
@@ -1767,7 +1767,7 @@ RouteTimeAxisView::add_existing_processor_automation_curves (boost::shared_ptr<P
 }
 
 void
-RouteTimeAxisView::add_automation_child(ParamID param, boost::shared_ptr<AutomationTimeAxisView> track)
+RouteTimeAxisView::add_automation_child(Parameter param, boost::shared_ptr<AutomationTimeAxisView> track)
 {
 	using namespace Menu_Helpers;
 
@@ -1809,8 +1809,8 @@ RouteTimeAxisView::add_processor_to_subplugin_menu (boost::shared_ptr<Processor>
 	ProcessorAutomationInfo *rai;
 	list<ProcessorAutomationInfo*>::iterator x;
 	
-	const std::set<ParamID>& automatable = processor->what_can_be_automated ();
-	std::set<ParamID> has_visible_automation;
+	const std::set<Parameter>& automatable = processor->what_can_be_automated ();
+	std::set<Parameter> has_visible_automation;
 
 	processor->what_has_visible_automation(has_visible_automation);
 
@@ -1845,7 +1845,7 @@ RouteTimeAxisView::add_processor_to_subplugin_menu (boost::shared_ptr<Processor>
 
 	items.clear ();
 
-	for (std::set<ParamID>::const_iterator i = automatable.begin(); i != automatable.end(); ++i) {
+	for (std::set<Parameter>::const_iterator i = automatable.begin(); i != automatable.end(); ++i) {
 
 		ProcessorAutomationNode* pan;
 		CheckMenuItem* mitem;
@@ -1959,7 +1959,7 @@ RouteTimeAxisView::processors_changed ()
 }
 
 boost::shared_ptr<AutomationLine>
-RouteTimeAxisView::find_processor_automation_curve (boost::shared_ptr<Processor> processor, ParamID what)
+RouteTimeAxisView::find_processor_automation_curve (boost::shared_ptr<Processor> processor, Parameter what)
 {
 	ProcessorAutomationNode* pan;
 
diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h
index 28296507a6..c412374fbd 100644
--- a/gtk2_ardour/route_time_axis.h
+++ b/gtk2_ardour/route_time_axis.h
@@ -78,7 +78,7 @@ public:
 	void set_selected_regionviews (RegionSelection&);
 	void get_selectables (nframes_t start, nframes_t end, double top, double bot, list<Selectable *>&);
 	void get_inverted_selectables (Selection&, list<Selectable*>&);
-	bool show_automation(ARDOUR::ParamID param);
+	bool show_automation(ARDOUR::Parameter param);
 		
 	boost::shared_ptr<ARDOUR::Region> find_next_region (nframes_t pos, ARDOUR::RegionPoint, int32_t dir);
 
@@ -95,7 +95,7 @@ public:
 	
 	void build_playlist_menu (Gtk::Menu *);
 
-	virtual void create_automation_child (ARDOUR::ParamID param) = 0;
+	virtual void create_automation_child (ARDOUR::Parameter param) = 0;
 	
 	string              name() const;
 	StreamView*         view() const { return _view; }
@@ -106,21 +106,21 @@ protected:
 	friend class StreamView;
 	
 	struct RouteAutomationNode {
-		ARDOUR::ParamID                           param;
+		ARDOUR::Parameter                           param;
 	    Gtk::CheckMenuItem*                       menu_item;
 		boost::shared_ptr<AutomationTimeAxisView> track;
 	    
-		RouteAutomationNode (ARDOUR::ParamID par, Gtk::CheckMenuItem* mi, boost::shared_ptr<AutomationTimeAxisView> tr)
+		RouteAutomationNode (ARDOUR::Parameter par, Gtk::CheckMenuItem* mi, boost::shared_ptr<AutomationTimeAxisView> tr)
 		    : param (par), menu_item (mi), track (tr) {}
 	};
 
 	struct ProcessorAutomationNode {
-		ARDOUR::ParamID                           what;
+		ARDOUR::Parameter                           what;
 	    Gtk::CheckMenuItem*                       menu_item;
 		boost::shared_ptr<AutomationTimeAxisView> view;
 	    RouteTimeAxisView&                        parent;
 
-	    ProcessorAutomationNode (ARDOUR::ParamID w, Gtk::CheckMenuItem* mitem, RouteTimeAxisView& p)
+	    ProcessorAutomationNode (ARDOUR::Parameter w, Gtk::CheckMenuItem* mitem, RouteTimeAxisView& p)
 		    : what (w), menu_item (mitem), parent (p) {}
 
 	    ~ProcessorAutomationNode ();
@@ -155,21 +155,21 @@ protected:
 	void processor_automation_track_hidden (ProcessorAutomationNode*,
 	                                       boost::shared_ptr<ARDOUR::Processor>);
 	
-	void automation_track_hidden (ARDOUR::ParamID param);
+	void automation_track_hidden (ARDOUR::Parameter param);
 
-	RouteAutomationNode* automation_track(ARDOUR::ParamID param);
+	RouteAutomationNode* automation_track(ARDOUR::Parameter param);
 	RouteAutomationNode* automation_track(ARDOUR::AutomationType type);
 
 	ProcessorAutomationNode*
-	find_processor_automation_node (boost::shared_ptr<ARDOUR::Processor> i, ARDOUR::ParamID);
+	find_processor_automation_node (boost::shared_ptr<ARDOUR::Processor> i, ARDOUR::Parameter);
 	
 	boost::shared_ptr<AutomationLine>
-	find_processor_automation_curve (boost::shared_ptr<ARDOUR::Processor> i, ARDOUR::ParamID);
+	find_processor_automation_curve (boost::shared_ptr<ARDOUR::Processor> i, ARDOUR::Parameter);
 
-	void add_processor_automation_curve (boost::shared_ptr<ARDOUR::Processor> r, ARDOUR::ParamID);
+	void add_processor_automation_curve (boost::shared_ptr<ARDOUR::Processor> r, ARDOUR::Parameter);
 	void add_existing_processor_automation_curves (boost::shared_ptr<ARDOUR::Processor>);
 
-	void add_automation_child(ARDOUR::ParamID param, boost::shared_ptr<AutomationTimeAxisView> track);
+	void add_automation_child(ARDOUR::Parameter param, boost::shared_ptr<AutomationTimeAxisView> track);
 	
 	void reset_processor_automation_curves ();
 
@@ -204,7 +204,7 @@ protected:
 	void rename_current_playlist ();
 	
 	void         automation_click ();
-	void         toggle_automation_track (ARDOUR::ParamID param);
+	void         toggle_automation_track (ARDOUR::Parameter param);
 	virtual void show_all_automation ();
 	virtual void show_existing_automation ();
 	virtual void hide_all_automation ();
@@ -262,9 +262,9 @@ protected:
 	ProcessorAutomationCurves processor_automation_curves;
 	
 	// Set from XML so context menu automation buttons can be correctly initialized
-	set<ARDOUR::ParamID> _show_automation;
+	set<ARDOUR::Parameter> _show_automation;
 
-	typedef map<ARDOUR::ParamID, RouteAutomationNode*> AutomationTracks;
+	typedef map<ARDOUR::Parameter, RouteAutomationNode*> AutomationTracks;
 	AutomationTracks _automation_tracks;
 
 	sigc::connection modified_connection;