summaryrefslogtreecommitdiff
path: root/libs/ardour/automation_list.cc
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2009-10-14 16:10:01 +0000
committerDavid Robillard <d@drobilla.net>2009-10-14 16:10:01 +0000
commitbb9cc45cd22af67ac275a5e73accbe14fee664d8 (patch)
treee52977d3eae6ff07b856088041a080a2fa3e5b79 /libs/ardour/automation_list.cc
parent8c4ce1e2ce35571aed5a686671431fdfffae7f8c (diff)
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only.
Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/automation_list.cc')
-rw-r--r--libs/ardour/automation_list.cc54
1 files changed, 27 insertions, 27 deletions
diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc
index 08cf69308f..2f06f267c1 100644
--- a/libs/ardour/automation_list.cc
+++ b/libs/ardour/automation_list.cc
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002 Paul Davis
+ Copyright (C) 2002 Paul Davis
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
@@ -70,9 +70,9 @@ AutomationList::AutomationList (const AutomationList& other)
_style = other._style;
_state = other._state;
_touching = other._touching;
-
+
create_curve_if_necessary();
-
+
assert(_parameter.type() != NullAutomation);
AutomationListCreated(this);
}
@@ -83,7 +83,7 @@ AutomationList::AutomationList (const AutomationList& other, double start, doubl
_style = other._style;
_state = other._state;
_touching = other._touching;
-
+
create_curve_if_necessary();
assert(_parameter.type() != NullAutomation);
@@ -99,13 +99,13 @@ AutomationList::AutomationList (const XMLNode& node, Evoral::Parameter id)
_touching = false;
_state = Off;
_style = Absolute;
-
+
set_state (node);
if (id) {
_parameter = id;
}
-
+
create_curve_if_necessary();
assert(_parameter.type() != NullAutomation);
@@ -149,18 +149,18 @@ AutomationList&
AutomationList::operator= (const AutomationList& other)
{
if (this != &other) {
-
+
_events.clear ();
-
+
for (const_iterator i = other._events.begin(); i != other._events.end(); ++i) {
_events.push_back (new Evoral::ControlEvent (**i));
}
-
+
_min_yval = other._min_yval;
_max_yval = other._max_yval;
_max_xval = other._max_xval;
_default_value = other._default_value;
-
+
mark_dirty ();
maybe_signal_changed ();
}
@@ -226,7 +226,7 @@ AutomationList::thaw ()
}
}
-void
+void
AutomationList::mark_dirty () const
{
ControlList::mark_dirty ();
@@ -317,13 +317,13 @@ AutomationList::deserialize_events (const XMLNode& node)
freeze ();
clear ();
-
+
stringstream str (content_node->content());
-
+
double x;
double y;
bool ok = true;
-
+
while (str) {
str >> x;
if (!str) {
@@ -336,7 +336,7 @@ AutomationList::deserialize_events (const XMLNode& node)
}
fast_simple_add (x, y);
}
-
+
if (!ok) {
clear ();
error << _("automation list: cannot load coordinates from XML, all points ignored") << endmsg;
@@ -363,7 +363,7 @@ AutomationList::set_state (const XMLNode& node)
/* partial state setting*/
return deserialize_events (node);
}
-
+
if (node.name() == X_("Envelope") || node.name() == X_("FadeOut") || node.name() == X_("FadeIn")) {
if ((nsos = node.child (X_("AutomationList")))) {
@@ -378,27 +378,27 @@ AutomationList::set_state (const XMLNode& node)
XMLProperty* prop;
nframes_t x;
double y;
-
+
freeze ();
clear ();
-
+
for (i = elist.begin(); i != elist.end(); ++i) {
-
+
if ((prop = (*i)->property ("x")) == 0) {
error << _("automation list: no x-coordinate stored for control point (point ignored)") << endmsg;
continue;
}
x = atoi (prop->value().c_str());
-
+
if ((prop = (*i)->property ("y")) == 0) {
error << _("automation list: no y-coordinate stored for control point (point ignored)") << endmsg;
continue;
}
y = atof (prop->value().c_str());
-
+
fast_simple_add (x, y);
}
-
+
thaw ();
return 0;
@@ -414,20 +414,20 @@ AutomationList::set_state (const XMLNode& node)
/* update session AL list */
AutomationListCreated(this);
}
-
- if ((prop = node.property (X_("automation-id"))) != 0){
+
+ if ((prop = node.property (X_("automation-id"))) != 0){
_parameter = EventTypeMap::instance().new_parameter(prop->value());
} else {
warning << "Legacy session: automation list has no automation-id property.";
}
-
+
if ((prop = node.property (X_("interpolation-style"))) != 0) {
_interpolation = (InterpolationStyle)string_2_enum(prop->value(), _interpolation);
} else {
_interpolation = Linear;
}
-
- if ((prop = node.property (X_("default"))) != 0){
+
+ if ((prop = node.property (X_("default"))) != 0){
_default_value = atof (prop->value().c_str());
} else {
_default_value = 0.0;