s/ParamID/Parameter/

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

11 files changed, 61 insertions, 60 deletions

diff --git a/libs/ardour/ardour/automatable.h b/libs/ardour/ardour/automatable.h
index c0d80dbb85..6100f60b80 100644
--- a/libs/ardour/ardour/automatable.h
+++ b/libs/ardour/ardour/automatable.h
@@ -26,7 +26,7 @@
 #include <ardour/session_object.h>
 #include <ardour/automation_event.h>
 #include <ardour/automation_control.h>
-#include <ardour/param_id.h>
+#include <ardour/parameter.h>
 
 namespace ARDOUR {
 
@@ -43,13 +43,13 @@ public:
 	// shorthand for gain, pan, etc
 	inline boost::shared_ptr<AutomationControl>
 	control(AutomationType type, bool create_if_missing=false) {
-		return control(ParamID(type), create_if_missing);
+		return control(Parameter(type), create_if_missing);
 	}
 
-	virtual boost::shared_ptr<AutomationControl> control(ParamID id, bool create_if_missing=false);
-	virtual boost::shared_ptr<const AutomationControl> control(ParamID id) const;
+	virtual boost::shared_ptr<AutomationControl> control(Parameter id, bool create_if_missing=false);
+	virtual boost::shared_ptr<const AutomationControl> control(Parameter id) const;
 	
-	typedef std::map<ParamID,boost::shared_ptr<AutomationControl> > Controls;
+	typedef std::map<Parameter,boost::shared_ptr<AutomationControl> > Controls;
 	Controls controls() { return _controls; }
 
 	virtual void add_control(boost::shared_ptr<AutomationControl>);
@@ -59,32 +59,32 @@ public:
 
 	virtual bool find_next_event(nframes_t start, nframes_t end, ControlEvent& ev) const;
 	
-	virtual string describe_parameter(ParamID param);
-	virtual float  default_parameter_value(ParamID param) { return 1.0f; }
+	virtual string describe_parameter(Parameter param);
+	virtual float  default_parameter_value(Parameter param) { return 1.0f; }
 	
 	virtual void clear_automation();
 
-	AutoState get_parameter_automation_state (ParamID param, bool lock = true);
-	virtual void set_parameter_automation_state (ParamID param, AutoState);
+	AutoState get_parameter_automation_state (Parameter param, bool lock = true);
+	virtual void set_parameter_automation_state (Parameter param, AutoState);
 	
-	AutoStyle get_parameter_automation_style (ParamID param);
-	void set_parameter_automation_style (ParamID param, AutoStyle);
+	AutoStyle get_parameter_automation_style (Parameter param);
+	void set_parameter_automation_style (Parameter param, AutoStyle);
 
 	void protect_automation ();
 
-	void what_has_automation(std::set<ParamID>&) const;
-	void what_has_visible_automation(std::set<ParamID>&) const;
-	const std::set<ParamID>& what_can_be_automated() const { return _can_automate_list; }
+	void what_has_automation(std::set<Parameter>&) const;
+	void what_has_visible_automation(std::set<Parameter>&) const;
+	const std::set<Parameter>& what_can_be_automated() const { return _can_automate_list; }
 
-	void mark_automation_visible(ParamID, bool);
+	void mark_automation_visible(Parameter, bool);
 
 protected:
 
-	void can_automate(ParamID);
+	void can_automate(Parameter);
 
-	virtual void auto_state_changed (ParamID which) {}
+	virtual void auto_state_changed (Parameter which) {}
 
-	int set_automation_state(const XMLNode&, ParamID default_param);
+	int set_automation_state(const XMLNode&, Parameter default_param);
 	XMLNode& get_automation_state();
 	
 	int load_automation (const std::string& path);
@@ -93,8 +93,8 @@ protected:
 	mutable Glib::Mutex _automation_lock;
 	
 	Controls          _controls;
-	std::set<ParamID> _visible_controls;
-	std::set<ParamID> _can_automate_list;
+	std::set<Parameter> _visible_controls;
+	std::set<Parameter> _can_automate_list;
 	
 	nframes_t _last_automation_snapshot;
 };
diff --git a/libs/ardour/ardour/automation_event.h b/libs/ardour/ardour/automation_event.h
index f76b12f41d..b8213efc36 100644
--- a/libs/ardour/ardour/automation_event.h
+++ b/libs/ardour/ardour/automation_event.h
@@ -32,7 +32,7 @@
 #include <pbd/statefuldestructible.h> 
 
 #include <ardour/ardour.h>
-#include <ardour/param_id.h>
+#include <ardour/parameter.h>
 
 namespace ARDOUR {
 
@@ -63,8 +63,8 @@ class AutomationList : public PBD::StatefulDestructible
 	typedef EventList::iterator iterator;
 	typedef EventList::const_iterator const_iterator;
 
-	AutomationList (ParamID id, double min_val, double max_val, double default_val);
-	AutomationList (const XMLNode&, ParamID id);
+	AutomationList (Parameter id, double min_val, double max_val, double default_val);
+	AutomationList (const XMLNode&, Parameter id);
 	~AutomationList();
 
 	AutomationList (const AutomationList&);
@@ -72,8 +72,8 @@ class AutomationList : public PBD::StatefulDestructible
 	AutomationList& operator= (const AutomationList&);
 	bool operator== (const AutomationList&);
 
-	ParamID param_id() const         { return _param_id; }
-	void    set_param_id(ParamID id) { _param_id = id; }
+	Parameter parameter() const         { return _param_id; }
+	void    set_param_id(Parameter id) { _param_id = id; }
 
 	void freeze();
 	void thaw ();
@@ -232,7 +232,7 @@ class AutomationList : public PBD::StatefulDestructible
 
 	mutable LookupCache _lookup_cache;
 	
-	ParamID             _param_id;
+	Parameter             _param_id;
 	EventList           _events;
 	mutable Glib::Mutex _lock;
 	int8_t              _frozen;
diff --git a/libs/ardour/ardour/curve.h b/libs/ardour/ardour/curve.h
index b96bb5c78e..1010e7ef18 100644
--- a/libs/ardour/ardour/curve.h
+++ b/libs/ardour/ardour/curve.h
@@ -37,7 +37,7 @@ class Curve
 	~Curve ();
 	Curve (const Curve& other);
 	//Curve (const Curve& other, double start, double end);
-	/*Curve (const XMLNode&, ParamID id);*/
+	/*Curve (const XMLNode&, Parameter id);*/
 
 	bool rt_safe_get_vector (double x0, double x1, float *arg, int32_t veclen);
 	void get_vector (double x0, double x1, float *arg, int32_t veclen);
diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h
index 60e1fc25f1..4ab99c5f12 100644
--- a/libs/ardour/ardour/io.h
+++ b/libs/ardour/ardour/io.h
@@ -237,7 +237,7 @@ class IO : public Automatable, public Latent
 
 	void clear_automation ();
 	
-	void set_parameter_automation_state (ParamID, AutoState);
+	void set_parameter_automation_state (Parameter, AutoState);
 
 	virtual void transport_stopped (nframes_t now); // interface: matches Insert
 	void automation_snapshot (nframes_t now); // interface: matches Automatable
diff --git a/libs/ardour/ardour/ladspa_plugin.h b/libs/ardour/ardour/ladspa_plugin.h
index ba51f551c7..a3e43f4cec 100644
--- a/libs/ardour/ardour/ladspa_plugin.h
+++ b/libs/ardour/ardour/ladspa_plugin.h
@@ -63,7 +63,7 @@ class LadspaPlugin : public ARDOUR::Plugin
 	void set_parameter (uint32_t port, float val);
 	float get_parameter (uint32_t port) const;
 	int get_parameter_descriptor (uint32_t which, ParameterDescriptor&) const;
-	std::set<ParamID> automatable() const;
+	std::set<Parameter> automatable() const;
 	uint32_t nth_parameter (uint32_t port, bool& ok) const;
 	void activate () { 
 		if (descriptor->activate) {
@@ -85,7 +85,7 @@ class LadspaPlugin : public ARDOUR::Plugin
 	int connect_and_run (BufferSet& bufs, uint32_t& in, uint32_t& out, nframes_t nframes, nframes_t offset);
 	void store_state (ARDOUR::PluginState&);
 	void restore_state (ARDOUR::PluginState&);
-	string describe_parameter (ParamID);
+	string describe_parameter (Parameter);
 	string state_node_name() const { return "ladspa"; }
 	void print_parameter (uint32_t, char*, uint32_t len) const;
 
diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h
index c437ca73de..8b4706f7b3 100644
--- a/libs/ardour/ardour/midi_track.h
+++ b/libs/ardour/ardour/midi_track.h
@@ -76,7 +76,7 @@ public:
 	
 	struct MidiControl : public AutomationControl {
 	    MidiControl(boost::shared_ptr<MidiTrack> route, boost::shared_ptr<AutomationList> al)
-			: AutomationControl (route->session(), al, al->param_id().to_string())
+			: AutomationControl (route->session(), al, al->parameter().to_string())
 			, _route (route)
 		{}
 	 
diff --git a/libs/ardour/ardour/panner.h b/libs/ardour/ardour/panner.h
index 1852bdd189..2559eed003 100644
--- a/libs/ardour/ardour/panner.h
+++ b/libs/ardour/ardour/panner.h
@@ -47,7 +47,7 @@ class AudioBuffer;
 class StreamPanner : public sigc::trackable, public PBD::Stateful
 {
   public:
-	StreamPanner (Panner& p, ParamID param);
+	StreamPanner (Panner& p, Parameter param);
 	~StreamPanner ();
 
 	void set_muted (bool yn);
@@ -104,7 +104,7 @@ class StreamPanner : public sigc::trackable, public PBD::Stateful
 	bool             _muted;
 
 	struct PanControllable : public AutomationControl {
-	    PanControllable (Session& s, std::string name, StreamPanner& p, ParamID param)
+	    PanControllable (Session& s, std::string name, StreamPanner& p, Parameter param)
 			: AutomationControl (s, boost::shared_ptr<AutomationList>(new AutomationList(
 					param, 0.0, 1.0, 0.5)), name)
 			, panner (p) { assert(param.type() != NullAutomation); }
@@ -125,7 +125,7 @@ class StreamPanner : public sigc::trackable, public PBD::Stateful
 class BaseStereoPanner : public StreamPanner
 {
   public:
-	BaseStereoPanner (Panner&, ParamID param);
+	BaseStereoPanner (Panner&, Parameter param);
 	~BaseStereoPanner ();
 
 	/* this class just leaves the pan law itself to be defined
@@ -152,7 +152,7 @@ class BaseStereoPanner : public StreamPanner
 class EqualPowerStereoPanner : public BaseStereoPanner
 {
   public:
-	EqualPowerStereoPanner (Panner&, ParamID param);
+	EqualPowerStereoPanner (Panner&, Parameter param);
 	~EqualPowerStereoPanner ();
 
 	void distribute_automated (AudioBuffer& src, BufferSet& obufs, 
@@ -161,7 +161,7 @@ class EqualPowerStereoPanner : public BaseStereoPanner
 	void get_current_coefficients (pan_t*) const;
 	void get_desired_coefficients (pan_t*) const;
 
-	static StreamPanner* factory (Panner&, ParamID param);
+	static StreamPanner* factory (Panner&, Parameter param);
 	static string name;
 
 	XMLNode& state (bool full_state); 
@@ -175,14 +175,14 @@ class EqualPowerStereoPanner : public BaseStereoPanner
 class Multi2dPanner : public StreamPanner
 {
   public:
-	Multi2dPanner (Panner& parent, ParamID);
+	Multi2dPanner (Panner& parent, Parameter);
 	~Multi2dPanner ();
 
 	void distribute (AudioBuffer& src, BufferSet& obufs, gain_t gain_coeff, nframes_t nframes);
 	void distribute_automated (AudioBuffer& src, BufferSet& obufs,
 				   nframes_t start, nframes_t end, nframes_t nframes, pan_t** buffers);
 
-	static StreamPanner* factory (Panner&, ParamID);
+	static StreamPanner* factory (Panner&, Parameter);
 	static string name;
 
 	XMLNode& state (bool full_state); 
diff --git a/libs/ardour/ardour/param_id.h b/libs/ardour/ardour/parameter.h
index 954b62894c..42159a2bbb 100644
--- a/libs/ardour/ardour/param_id.h
+++ b/libs/ardour/ardour/parameter.h
@@ -1,5 +1,6 @@
 /*
     Copyright (C) 2007 Paul Davis 
+    Author: Dave Robillard
     
     This program is free software; you can redistribute it and/or modify it
     under the terms of the GNU General Public License as published by the Free
@@ -16,8 +17,8 @@
     675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#ifndef __ardour_param_id_h__
-#define __ardour_param_id_h__
+#ifndef __ardour_parameter_h__
+#define __ardour_parameter_h__
 
 #include <string>
 #include <pbd/compose.h>
@@ -44,15 +45,15 @@ namespace ARDOUR {
  * comparable anything may be added.  ints are best as these should be fast to
  * copy and compare with one another.
  */
-class ParamID
+class Parameter
 {
 public:
-	inline ParamID(AutomationType type = NullAutomation, uint32_t id=0) : _type(type), _id(id) {}
+	inline Parameter(AutomationType type = NullAutomation, uint32_t id=0) : _type(type), _id(id) {}
 	
-	/** Construct an ParamID from a string returned from ParamID::to_string
+	/** Construct an Parameter from a string returned from Parameter::to_string
 	 * (AutomationList automation-id property)
 	 */
-	ParamID(const std::string& str) : _type(NullAutomation), _id(0) {
+	Parameter(const std::string& str) : _type(NullAutomation), _id(0) {
 		if (str == "gain") {
 			_type = GainAutomation;
 		} else if (str == "solo") {
@@ -77,21 +78,21 @@ public:
 			_type = MidiCCAutomation;
 			_id = atoi(str.c_str()+7);
 		} else {
-			PBD::warning << "Unknown ParamID '" << str << "'" << endmsg;
+			PBD::warning << "Unknown Parameter '" << str << "'" << endmsg;
 		}
 	}
 
 	inline AutomationType type() const { return _type; }
 	inline uint32_t       id()   const { return _id; }
 
-	inline bool operator==(const ParamID& id) const
+	inline bool operator==(const Parameter& id) const
 		{ return (_type == id._type && _id == id._id); }
 	
 	/** Arbitrary but fixed ordering, so we're comparable (usable in std::map) */
-	inline bool operator<(const ParamID& id) const {
+	inline bool operator<(const Parameter& id) const {
 		// FIXME: branch a performance problem?  #ifdef DEBUG?
 		if (_type == NullAutomation)
-			PBD::warning << "Uninitialized ParamID compared." << endmsg;
+			PBD::warning << "Uninitialized Parameter compared." << endmsg;
 		return (_type < id._type || _id < id._id);
 	}
 	
@@ -121,7 +122,7 @@ public:
 			return string_compose("midicc-%1", _id);
 		} else {
 			assert(false);
-			PBD::warning << "Uninitialized ParamID to_string() called." << endmsg;
+			PBD::warning << "Uninitialized Parameter to_string() called." << endmsg;
 			return "";
 		}
 	}
@@ -135,5 +136,5 @@ private:
 
 } // namespace ARDOUR
 
-#endif // __ardour_param_id_h__
+#endif // __ardour_parameter_h__
 
diff --git a/libs/ardour/ardour/plugin.h b/libs/ardour/ardour/plugin.h
index 5c49069375..0cdcc9bb26 100644
--- a/libs/ardour/ardour/plugin.h
+++ b/libs/ardour/ardour/plugin.h
@@ -32,7 +32,7 @@
 #include <ardour/plugin_state.h>
 #include <ardour/cycles.h>
 #include <ardour/latent.h>
-#include <ardour/param_id.h>
+#include <ardour/parameter.h>
 
 #include <vector>
 #include <set>
@@ -121,10 +121,10 @@ class Plugin : public PBD::StatefulDestructible, public Latent
 
 	virtual int connect_and_run (BufferSet& bufs, uint32_t& in, uint32_t& out, nframes_t nframes, nframes_t offset) = 0;
 	
-	virtual std::set<ParamID> automatable() const = 0;
+	virtual std::set<Parameter> automatable() const = 0;
 	virtual void store_state (ARDOUR::PluginState&) = 0;
 	virtual void restore_state (ARDOUR::PluginState&) = 0;
-	virtual string describe_parameter (ParamID) = 0;
+	virtual string describe_parameter (Parameter) = 0;
 	virtual string state_node_name() const = 0;
 	virtual void print_parameter (uint32_t, char*, uint32_t len) const = 0;
 
diff --git a/libs/ardour/ardour/plugin_insert.h b/libs/ardour/ardour/plugin_insert.h
index 1e2064d991..c78a17b218 100644
--- a/libs/ardour/ardour/plugin_insert.h
+++ b/libs/ardour/ardour/plugin_insert.h
@@ -76,10 +76,10 @@ class PluginInsert : public Processor
 
 	bool is_generator() const;
 
-	void set_parameter (ParamID param, float val);
-	float get_parameter (ParamID param);
+	void set_parameter (Parameter param, float val);
+	float get_parameter (Parameter param);
 
-	float default_parameter_value (ParamID param);
+	float default_parameter_value (Parameter param);
 	
 	struct PluginControl : public AutomationControl {
 	    PluginControl (PluginInsert& p, boost::shared_ptr<AutomationList> list);
@@ -104,13 +104,13 @@ class PluginInsert : public Processor
 
 	PluginType type ();
 
-	string describe_parameter (ParamID param);
+	string describe_parameter (Parameter param);
 
 	nframes_t signal_latency() const;
 
   private:
 
-	void parameter_changed (ParamID, float);
+	void parameter_changed (Parameter, float);
 	
 	std::vector<boost::shared_ptr<Plugin> > _plugins;
 	
@@ -119,7 +119,7 @@ class PluginInsert : public Processor
 
 	void init ();
 	void set_automatable ();
-	void auto_state_changed (ParamID which);
+	void auto_state_changed (Parameter which);
 
 	int32_t count_for_configuration (ChanCount in, ChanCount out) const;
 
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h
index b2f13def81..cfb9dd49b0 100644
--- a/libs/ardour/ardour/types.h
+++ b/libs/ardour/ardour/types.h
@@ -93,7 +93,7 @@ namespace ARDOUR {
 	OverlapType coverage (nframes_t start_a, nframes_t end_a,
 			      nframes_t start_b, nframes_t end_b);
 
-	/** See param_id.h
+	/** See parameter.h
 	 * XXX: I don't think/hope these hex values matter anymore.
 	 */
 	enum AutomationType {