ardour/livetrax
13
0
Fork 0
Code

Replace remaining references to 'param_id' (with 'parameter').

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@2109 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2007-07-05 01:43:30 +00:00
parent 912346057c
commit 0c3944f7dd
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/ardour/ardour/automation_event.h
View File

@ -72,8 +72,8 @@ class AutomationList : public PBD::StatefulDestructible
AutomationList& operator= (const AutomationList&); AutomationList& operator= (const AutomationList&);
bool operator== (const AutomationList&); bool operator== (const AutomationList&);
Parameter parameter() const { return _param_id; } Parameter parameter() const { return _parameter; }
void set_param_id(Parameter id) { _param_id = id; } void set_parameter(Parameter p) { _parameter = p; }
void freeze(); void freeze();
void thaw (); void thaw ();
@ -232,7 +232,7 @@ class AutomationList : public PBD::StatefulDestructible
mutable LookupCache _lookup_cache; mutable LookupCache _lookup_cache;
Parameter _param_id; Parameter _parameter;
EventList _events; EventList _events;
mutable Glib::Mutex _lock; mutable Glib::Mutex _lock;
int8_t _frozen; int8_t _frozen;

2
libs/ardour/automatable.cc
View File

@ -294,7 +294,7 @@ Automatable::set_automation_state (const XMLNode& node, Parameter legacy_param)
if (!id_prop) { if (!id_prop) {
warning << "AutomationList node without automation-id property, " warning << "AutomationList node without automation-id property, "
<< "using default: " << legacy_param.to_string() << endmsg; << "using default: " << legacy_param.to_string() << endmsg;
al->set_param_id(legacy_param); al->set_parameter(legacy_param);
} }
boost::shared_ptr<AutomationControl> existing = control(param); boost::shared_ptr<AutomationControl> existing = control(param);

28
libs/ardour/automation_event.cc
View File

@ -55,10 +55,10 @@ static void dumpit (const AutomationList& al, string prefix = "")
#endif #endif
AutomationList::AutomationList (Parameter id, double min_val, double max_val, double default_val) AutomationList::AutomationList (Parameter id, double min_val, double max_val, double default_val)
: _param_id(id) : _parameter(id)
, _curve(new Curve(*this)) , _curve(new Curve(*this))
{ {
_param_id = id; _parameter = id;
_frozen = 0; _frozen = 0;
_changed_when_thawed = false; _changed_when_thawed = false;
_state = Off; _state = Off;
@ -73,12 +73,12 @@ AutomationList::AutomationList (Parameter id, double min_val, double max_val, do
_lookup_cache.range.first = _events.end(); _lookup_cache.range.first = _events.end();
_sort_pending = false; _sort_pending = false;
assert(_param_id.type() != NullAutomation); assert(_parameter.type() != NullAutomation);
AutomationListCreated(this); AutomationListCreated(this);
} }
AutomationList::AutomationList (const AutomationList& other) AutomationList::AutomationList (const AutomationList& other)
: _param_id(other._param_id) : _parameter(other._parameter)
, _curve(new Curve(*this)) , _curve(new Curve(*this))
{ {
_frozen = 0; _frozen = 0;
@ -100,12 +100,12 @@ AutomationList::AutomationList (const AutomationList& other)
} }
mark_dirty (); mark_dirty ();
assert(_param_id.type() != NullAutomation); assert(_parameter.type() != NullAutomation);
AutomationListCreated(this); AutomationListCreated(this);
} }
AutomationList::AutomationList (const AutomationList& other, double start, double end) AutomationList::AutomationList (const AutomationList& other, double start, double end)
: _param_id(other._param_id) : _parameter(other._parameter)
, _curve(new Curve(*this)) , _curve(new Curve(*this))
{ {
_frozen = 0; _frozen = 0;
@ -136,7 +136,7 @@ AutomationList::AutomationList (const AutomationList& other, double start, doubl
mark_dirty (); mark_dirty ();
assert(_param_id.type() != NullAutomation); assert(_parameter.type() != NullAutomation);
AutomationListCreated(this); AutomationListCreated(this);
} }
@ -162,9 +162,9 @@ AutomationList::AutomationList (const XMLNode& node, Parameter id)
set_state (node); set_state (node);
if (id) if (id)
_param_id = id; _parameter = id;
assert(_param_id.type() != NullAutomation); assert(_parameter.type() != NullAutomation);
AutomationListCreated(this); AutomationListCreated(this);
} }
@ -1010,7 +1010,7 @@ AutomationList::multipoint_eval (double x) const
AutomationList* AutomationList*
AutomationList::cut (iterator start, iterator end) AutomationList::cut (iterator start, iterator end)
{ {
AutomationList* nal = new AutomationList (_param_id, _min_yval, _max_yval, _default_value); AutomationList* nal = new AutomationList (_parameter, _min_yval, _max_yval, _default_value);
{ {
Glib::Mutex::Lock lm (_lock); Glib::Mutex::Lock lm (_lock);
@ -1040,7 +1040,7 @@ AutomationList::cut (iterator start, iterator end)
AutomationList* AutomationList*
AutomationList::cut_copy_clear (double start, double end, int op) AutomationList::cut_copy_clear (double start, double end, int op)
{ {
AutomationList* nal = new AutomationList (_param_id, _min_yval, _max_yval, _default_value); AutomationList* nal = new AutomationList (_parameter, _min_yval, _max_yval, _default_value);
iterator s, e; iterator s, e;
ControlEvent cp (start, 0.0); ControlEvent cp (start, 0.0);
TimeComparator cmp; TimeComparator cmp;
@ -1103,7 +1103,7 @@ AutomationList::cut_copy_clear (double start, double end, int op)
AutomationList* AutomationList*
AutomationList::copy (iterator start, iterator end) AutomationList::copy (iterator start, iterator end)
{ {
AutomationList* nal = new AutomationList (_param_id, _min_yval, _max_yval, _default_value); AutomationList* nal = new AutomationList (_parameter, _min_yval, _max_yval, _default_value);
{ {
Glib::Mutex::Lock lm (_lock); Glib::Mutex::Lock lm (_lock);
@ -1202,7 +1202,7 @@ AutomationList::state (bool full)
char buf[64]; char buf[64];
LocaleGuard lg (X_("POSIX")); LocaleGuard lg (X_("POSIX"));
root->add_property ("automation-id", _param_id.to_string()); root->add_property ("automation-id", _parameter.to_string());
root->add_property ("id", _id.to_s()); root->add_property ("id", _id.to_s());
@ -1368,7 +1368,7 @@ AutomationList::set_state (const XMLNode& node)
} }
if ((prop = node.property (X_("automation-id"))) != 0){ if ((prop = node.property (X_("automation-id"))) != 0){
_param_id = Parameter(prop->value()); _parameter = Parameter(prop->value());
} else { } else {
warning << "Legacy session: automation list has no automation-id property."; warning << "Legacy session: automation list has no automation-id property.";
} }