mirror of
https://github.com/Ardour/ardour.git
synced 2026-01-24 06:07:29 +01:00
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
This commit is contained in:
David Robillard
parent
8c4ce1e2ce
commit
bb9cc45cd2
730 changed files with 14946 additions and 14948 deletions
|
|
@ -1,16 +1,16 @@
|
|||
/* This file is part of Evoral.
|
||||
* Copyright (C) 2008 Dave Robillard <http://drobilla.net>
|
||||
* Copyright (C) 2000-2008 Paul Davis
|
||||
*
|
||||
*
|
||||
* Evoral 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 Software
|
||||
* Foundation; either version 2 of the License, or (at your option) any later
|
||||
* version.
|
||||
*
|
||||
*
|
||||
* Evoral is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
||||
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for details.
|
||||
*
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
|
@ -38,7 +38,7 @@ ControlList::ControlList (const Parameter& id)
|
|||
: _parameter(id)
|
||||
, _interpolation(Linear)
|
||||
, _curve(0)
|
||||
{
|
||||
{
|
||||
_frozen = 0;
|
||||
_changed_when_thawed = false;
|
||||
_min_yval = id.min();
|
||||
|
|
@ -72,7 +72,7 @@ ControlList::ControlList (const ControlList& other)
|
|||
for (const_iterator i = other._events.begin(); i != other._events.end(); ++i) {
|
||||
_events.push_back (new ControlEvent (**i));
|
||||
}
|
||||
|
||||
|
||||
mark_dirty ();
|
||||
}
|
||||
|
||||
|
|
@ -101,7 +101,7 @@ ControlList::ControlList (const ControlList& other, double start, double end)
|
|||
_events.push_back (new ControlEvent ((*i)->when, (*i)->value));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
mark_dirty ();
|
||||
}
|
||||
|
||||
|
|
@ -130,18 +130,18 @@ ControlList&
|
|||
ControlList::operator= (const ControlList& other)
|
||||
{
|
||||
if (this != &other) {
|
||||
|
||||
|
||||
_events.clear ();
|
||||
|
||||
|
||||
for (const_iterator i = other._events.begin(); i != other._events.end(); ++i) {
|
||||
_events.push_back (new 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 ();
|
||||
}
|
||||
|
|
@ -166,7 +166,7 @@ void
|
|||
ControlList::maybe_signal_changed ()
|
||||
{
|
||||
mark_dirty ();
|
||||
|
||||
|
||||
if (_frozen)
|
||||
_changed_when_thawed = true;
|
||||
}
|
||||
|
|
@ -265,16 +265,16 @@ ControlList::rt_add (double when, double value)
|
|||
where = after;
|
||||
|
||||
}
|
||||
|
||||
|
||||
iterator previous = _rt_insertion_point;
|
||||
--previous;
|
||||
|
||||
|
||||
if (_rt_insertion_point != _events.begin() && (*_rt_insertion_point)->value == value && (*previous)->value == value) {
|
||||
(*_rt_insertion_point)->when = when;
|
||||
done = true;
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
} else {
|
||||
|
||||
where = lower_bound (_events.begin(), _events.end(), &cp, time_comparator);
|
||||
|
|
@ -290,7 +290,7 @@ ControlList::rt_add (double when, double value)
|
|||
if (!done) {
|
||||
_rt_insertion_point = _events.insert (where, new ControlEvent (when, value));
|
||||
}
|
||||
|
||||
|
||||
_new_value = false;
|
||||
mark_dirty ();
|
||||
}
|
||||
|
|
@ -325,7 +325,7 @@ ControlList::add (double when, double value)
|
|||
(*insertion_point)->value = value;
|
||||
insert = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if ((*insertion_point)->when >= when) {
|
||||
break;
|
||||
|
|
@ -333,11 +333,11 @@ ControlList::add (double when, double value)
|
|||
}
|
||||
|
||||
if (insert) {
|
||||
|
||||
|
||||
_events.insert (insertion_point, new ControlEvent (when, value));
|
||||
reposition_for_rt_add (0);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
mark_dirty ();
|
||||
}
|
||||
|
|
@ -367,7 +367,7 @@ ControlList::erase (iterator start, iterator end)
|
|||
mark_dirty ();
|
||||
}
|
||||
maybe_signal_changed ();
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
ControlList::reset_range (double start, double endt)
|
||||
|
|
@ -379,7 +379,7 @@ ControlList::reset_range (double start, double endt)
|
|||
ControlEvent cp (start, 0.0f);
|
||||
iterator s;
|
||||
iterator e;
|
||||
|
||||
|
||||
if ((s = lower_bound (_events.begin(), _events.end(), &cp, time_comparator)) != _events.end()) {
|
||||
|
||||
cp.when = endt;
|
||||
|
|
@ -388,7 +388,7 @@ ControlList::reset_range (double start, double endt)
|
|||
for (iterator i = s; i != e; ++i) {
|
||||
(*i)->value = _default_value;
|
||||
}
|
||||
|
||||
|
||||
reset = true;
|
||||
|
||||
mark_dirty ();
|
||||
|
|
@ -413,7 +413,7 @@ ControlList::erase_range (double start, double endt)
|
|||
reposition_for_rt_add (0);
|
||||
mark_dirty ();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
if (erased) {
|
||||
|
|
@ -448,7 +448,7 @@ ControlList::slide (iterator before, double distance)
|
|||
if (before == _events.end()) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
while (before != _events.end()) {
|
||||
(*before)->when += distance;
|
||||
++before;
|
||||
|
|
@ -500,7 +500,7 @@ ControlList::control_points_adjacent (double xval)
|
|||
ret.second = _events.end();
|
||||
|
||||
for (i = lower_bound (_events.begin(), _events.end(), &cp, time_comparator); i != _events.end(); ++i) {
|
||||
|
||||
|
||||
if (ret.first == _events.end()) {
|
||||
if ((*i)->when >= xval) {
|
||||
if (i != _events.begin()) {
|
||||
|
|
@ -510,8 +510,8 @@ ControlList::control_points_adjacent (double xval)
|
|||
return ret;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if ((*i)->when > xval) {
|
||||
ret.second = i;
|
||||
break;
|
||||
|
|
@ -552,7 +552,7 @@ ControlList::thaw ()
|
|||
}
|
||||
}
|
||||
|
||||
void
|
||||
void
|
||||
ControlList::mark_dirty () const
|
||||
{
|
||||
_lookup_cache.left = -1;
|
||||
|
|
@ -579,7 +579,7 @@ ControlList::truncate_end (double last_coordinate)
|
|||
}
|
||||
|
||||
if (last_coordinate > _events.back()->when) {
|
||||
|
||||
|
||||
/* extending end:
|
||||
*/
|
||||
|
||||
|
|
@ -607,7 +607,7 @@ ControlList::truncate_end (double last_coordinate)
|
|||
iterator penultimate = _events.end();
|
||||
--penultimate; /* points at last point */
|
||||
--penultimate; /* points at the penultimate point */
|
||||
|
||||
|
||||
if (_events.back()->value == (*penultimate)->value) {
|
||||
_events.back()->when = last_coordinate;
|
||||
} else {
|
||||
|
|
@ -622,13 +622,13 @@ ControlList::truncate_end (double last_coordinate)
|
|||
last_val = unlocked_eval (last_coordinate);
|
||||
last_val = max ((double) _min_yval, last_val);
|
||||
last_val = min ((double) _max_yval, last_val);
|
||||
|
||||
|
||||
i = _events.rbegin();
|
||||
|
||||
|
||||
/* make i point to the last control point */
|
||||
|
||||
|
||||
++i;
|
||||
|
||||
|
||||
/* now go backwards, removing control points that are
|
||||
beyond the new last coordinate.
|
||||
*/
|
||||
|
|
@ -636,23 +636,23 @@ ControlList::truncate_end (double last_coordinate)
|
|||
// FIXME: SLOW! (size() == O(n))
|
||||
|
||||
uint32_t sz = _events.size();
|
||||
|
||||
|
||||
while (i != _events.rend() && sz > 2) {
|
||||
ControlList::reverse_iterator tmp;
|
||||
|
||||
|
||||
tmp = i;
|
||||
++tmp;
|
||||
|
||||
|
||||
if ((*i)->when < last_coordinate) {
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
_events.erase (i.base());
|
||||
--sz;
|
||||
|
||||
i = tmp;
|
||||
}
|
||||
|
||||
|
||||
_events.back()->when = last_coordinate;
|
||||
_events.back()->value = last_val;
|
||||
}
|
||||
|
|
@ -674,14 +674,14 @@ ControlList::truncate_start (double overall_length)
|
|||
double first_legal_coordinate;
|
||||
|
||||
assert(!_events.empty());
|
||||
|
||||
|
||||
if (overall_length == _events.back()->when) {
|
||||
/* no change in overall length */
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if (overall_length > _events.back()->when) {
|
||||
|
||||
|
||||
/* growing at front: duplicate first point. shift all others */
|
||||
|
||||
double shift = overall_length - _events.back()->when;
|
||||
|
|
@ -705,7 +705,7 @@ ControlList::truncate_start (double overall_length)
|
|||
|
||||
iterator second = _events.begin();
|
||||
++second; /* points at the second point */
|
||||
|
||||
|
||||
if (_events.front()->value == (*second)->value) {
|
||||
/* first segment is flat, just move start point back to zero */
|
||||
_events.front()->when = 0;
|
||||
|
|
@ -718,7 +718,7 @@ ControlList::truncate_start (double overall_length)
|
|||
} else {
|
||||
|
||||
/* shrinking at front */
|
||||
|
||||
|
||||
first_legal_coordinate = _events.back()->when - overall_length;
|
||||
first_legal_value = unlocked_eval (first_legal_coordinate);
|
||||
first_legal_value = max (_min_yval, first_legal_value);
|
||||
|
|
@ -727,35 +727,35 @@ ControlList::truncate_start (double overall_length)
|
|||
/* remove all events earlier than the new "front" */
|
||||
|
||||
i = _events.begin();
|
||||
|
||||
|
||||
while (i != _events.end() && !_events.empty()) {
|
||||
ControlList::iterator tmp;
|
||||
|
||||
|
||||
tmp = i;
|
||||
++tmp;
|
||||
|
||||
|
||||
if ((*i)->when > first_legal_coordinate) {
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
_events.erase (i);
|
||||
|
||||
|
||||
i = tmp;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* shift all remaining points left to keep their same
|
||||
relative position
|
||||
*/
|
||||
|
||||
|
||||
for (i = _events.begin(); i != _events.end(); ++i) {
|
||||
(*i)->when -= first_legal_coordinate;
|
||||
}
|
||||
|
||||
/* add a new point for the interpolated new value */
|
||||
|
||||
|
||||
_events.push_front (new ControlEvent (0, first_legal_value));
|
||||
}
|
||||
}
|
||||
|
||||
reposition_for_rt_add (0);
|
||||
|
||||
|
|
@ -787,7 +787,7 @@ ControlList::unlocked_eval (double x) const
|
|||
|
||||
case 1:
|
||||
return _events.front()->value;
|
||||
|
||||
|
||||
case 2:
|
||||
if (x >= _events.back()->when) {
|
||||
return _events.back()->value;
|
||||
|
|
@ -799,7 +799,7 @@ ControlList::unlocked_eval (double x) const
|
|||
lval = _events.front()->value;
|
||||
upos = _events.back()->when;
|
||||
uval = _events.back()->value;
|
||||
|
||||
|
||||
if (_interpolation == Discrete) {
|
||||
return lval;
|
||||
}
|
||||
|
|
@ -828,7 +828,7 @@ ControlList::multipoint_eval (double x) const
|
|||
double upos, lpos;
|
||||
double uval, lval;
|
||||
double fraction;
|
||||
|
||||
|
||||
/* "Stepped" lookup (no interpolation) */
|
||||
/* FIXME: no cache. significant? */
|
||||
if (_interpolation == Discrete) {
|
||||
|
|
@ -847,15 +847,15 @@ ControlList::multipoint_eval (double x) const
|
|||
/* Only do the range lookup if x is in a different range than last time
|
||||
* this was called (or if the lookup cache has been marked "dirty" (left<0) */
|
||||
if ((_lookup_cache.left < 0) ||
|
||||
((_lookup_cache.left > x) ||
|
||||
(_lookup_cache.range.first == _events.end()) ||
|
||||
((_lookup_cache.left > x) ||
|
||||
(_lookup_cache.range.first == _events.end()) ||
|
||||
((*_lookup_cache.range.second)->when < x))) {
|
||||
|
||||
const ControlEvent cp (x, 0);
|
||||
|
||||
|
||||
_lookup_cache.range = equal_range (_events.begin(), _events.end(), &cp, time_comparator);
|
||||
}
|
||||
|
||||
|
||||
pair<const_iterator,const_iterator> range = _lookup_cache.range;
|
||||
|
||||
if (range.first == range.second) {
|
||||
|
|
@ -873,7 +873,7 @@ ControlList::multipoint_eval (double x) const
|
|||
// return _default_value;
|
||||
return _events.front()->value;
|
||||
}
|
||||
|
||||
|
||||
if (range.second == _events.end()) {
|
||||
/* we're after the last point */
|
||||
return _events.back()->value;
|
||||
|
|
@ -881,7 +881,7 @@ ControlList::multipoint_eval (double x) const
|
|||
|
||||
upos = (*range.second)->when;
|
||||
uval = (*range.second)->value;
|
||||
|
||||
|
||||
/* linear interpolation betweeen the two points
|
||||
on either side of x
|
||||
*/
|
||||
|
|
@ -889,7 +889,7 @@ ControlList::multipoint_eval (double x) const
|
|||
fraction = (double) (x - lpos) / (double) (upos - lpos);
|
||||
return lval + (fraction * (uval - lval));
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
/* x is a control point in the data */
|
||||
_lookup_cache.left = -1;
|
||||
|
|
@ -936,7 +936,7 @@ ControlList::rt_safe_earliest_event(double start, double end, double& x, double&
|
|||
}
|
||||
|
||||
return rt_safe_earliest_event_unlocked(start, end, x, y, inclusive);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/** Get the earliest event between \a start and \a end, using the current interpolation style.
|
||||
|
|
@ -953,7 +953,7 @@ ControlList::rt_safe_earliest_event_unlocked(double start, double end, double& x
|
|||
return rt_safe_earliest_event_discrete_unlocked(start, end, x, y, inclusive);
|
||||
else
|
||||
return rt_safe_earliest_event_linear_unlocked(start, end, x, y, inclusive);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/** Get the earliest event between \a start and \a end (Discrete (lack of) interpolation)
|
||||
|
|
@ -993,7 +993,7 @@ ControlList::rt_safe_earliest_event_discrete_unlocked (double start, double end,
|
|||
} else {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
/* No points in range */
|
||||
} else {
|
||||
return false;
|
||||
|
|
@ -1021,7 +1021,7 @@ ControlList::rt_safe_earliest_event_linear_unlocked (double start, double end, d
|
|||
|
||||
// Hack to avoid infinitely repeating the same event
|
||||
build_search_cache_if_necessary(start, end);
|
||||
|
||||
|
||||
pair<const_iterator,const_iterator> range = _search_cache.range;
|
||||
|
||||
if (range.first != _events.end()) {
|
||||
|
|
@ -1046,7 +1046,7 @@ ControlList::rt_safe_earliest_event_linear_unlocked (double start, double end, d
|
|||
first = *prev;
|
||||
next = *range.first;
|
||||
}
|
||||
|
||||
|
||||
if (inclusive && first->when == start) {
|
||||
x = first->when;
|
||||
y = first->value;
|
||||
|
|
@ -1057,7 +1057,7 @@ ControlList::rt_safe_earliest_event_linear_unlocked (double start, double end, d
|
|||
assert(x >= start);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
if (fabs(first->value - next->value) <= 1) {
|
||||
if (next->when <= end && (next->when > start)) {
|
||||
x = next->when;
|
||||
|
|
@ -1085,9 +1085,9 @@ ControlList::rt_safe_earliest_event_linear_unlocked (double start, double end, d
|
|||
y = floor(y);
|
||||
|
||||
x = first->when + (y - first->value) / (double)slope;
|
||||
|
||||
|
||||
while ((inclusive && x < start) || (x <= start && y != next->value)) {
|
||||
|
||||
|
||||
if (first->value < next->value) // ramping up
|
||||
y += 1.0;
|
||||
else // ramping down
|
||||
|
|
@ -1103,7 +1103,7 @@ ControlList::rt_safe_earliest_event_linear_unlocked (double start, double end, d
|
|||
assert( (y >= first->value && y <= next->value)
|
||||
|| (y <= first->value && y >= next->value) );
|
||||
|
||||
|
||||
|
||||
const bool past_start = (inclusive ? x >= start : x > start);
|
||||
if (past_start && x < end) {
|
||||
/* Move left of cache to this point
|
||||
|
|
@ -1114,7 +1114,7 @@ ControlList::rt_safe_earliest_event_linear_unlocked (double start, double end, d
|
|||
} else {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
/* No points in the future, so no steps (towards them) in the future */
|
||||
} else {
|
||||
return false;
|
||||
|
|
@ -1131,13 +1131,13 @@ ControlList::cut (iterator start, iterator end)
|
|||
|
||||
for (iterator x = start; x != end; ) {
|
||||
iterator tmp;
|
||||
|
||||
|
||||
tmp = x;
|
||||
++tmp;
|
||||
|
||||
|
||||
nal->_events.push_back (new ControlEvent (**x));
|
||||
_events.erase (x);
|
||||
|
||||
|
||||
reposition_for_rt_add (0);
|
||||
|
||||
x = tmp;
|
||||
|
|
@ -1158,7 +1158,7 @@ ControlList::cut_copy_clear (double start, double end, int op)
|
|||
iterator s, e;
|
||||
ControlEvent cp (start, 0.0);
|
||||
bool changed = false;
|
||||
|
||||
|
||||
{
|
||||
Glib::Mutex::Lock lm (_lock);
|
||||
|
||||
|
|
@ -1175,16 +1175,16 @@ ControlList::cut_copy_clear (double start, double end, int op)
|
|||
|
||||
for (iterator x = s; x != e; ) {
|
||||
iterator tmp;
|
||||
|
||||
|
||||
tmp = x;
|
||||
++tmp;
|
||||
|
||||
changed = true;
|
||||
|
||||
|
||||
/* adjust new points to be relative to start, which
|
||||
has been set to zero.
|
||||
*/
|
||||
|
||||
|
||||
if (op != 2) {
|
||||
nal->_events.push_back (new ControlEvent ((*x)->when - start, (*x)->value));
|
||||
}
|
||||
|
|
@ -1192,7 +1192,7 @@ ControlList::cut_copy_clear (double start, double end, int op)
|
|||
if (op != 1) {
|
||||
_events.erase (x);
|
||||
}
|
||||
|
||||
|
||||
x = tmp;
|
||||
}
|
||||
|
||||
|
|
@ -1220,15 +1220,15 @@ ControlList::copy (iterator start, iterator end)
|
|||
|
||||
{
|
||||
Glib::Mutex::Lock lm (_lock);
|
||||
|
||||
|
||||
for (iterator x = start; x != end; ) {
|
||||
iterator tmp;
|
||||
|
||||
|
||||
tmp = x;
|
||||
++tmp;
|
||||
|
||||
|
||||
nal->_events.push_back (new ControlEvent (**x));
|
||||
|
||||
|
||||
x = tmp;
|
||||
}
|
||||
}
|
||||
|
|
@ -1274,9 +1274,9 @@ ControlList::paste (ControlList& alist, double pos, float /*times*/)
|
|||
_events.insert (where, new ControlEvent( (*i)->when+pos,( *i)->value));
|
||||
end = (*i)->when + pos;
|
||||
}
|
||||
|
||||
|
||||
/* move all points after the insertion along the timeline by
|
||||
|
||||
|
||||
/* move all points after the insertion along the timeline by
|
||||
the correct amount.
|
||||
*/
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue