diff options
| author | David Robillard <d@drobilla.net> | 2009-10-14 16:10:01 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2009-10-14 16:10:01 +0000 |
| commit | bb9cc45cd22af67ac275a5e73accbe14fee664d8 (patch) | |
| tree | e52977d3eae6ff07b856088041a080a2fa3e5b79 /libs/evoral/src/ControlSet.cpp | |
| parent | 8c4ce1e2ce35571aed5a686671431fdfffae7f8c (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/evoral/src/ControlSet.cpp')
| -rw-r--r-- | libs/evoral/src/ControlSet.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libs/evoral/src/ControlSet.cpp b/libs/evoral/src/ControlSet.cpp index 4a583b5a55..0ccefdc284 100644 --- a/libs/evoral/src/ControlSet.cpp +++ b/libs/evoral/src/ControlSet.cpp @@ -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 @@ -72,22 +72,22 @@ ControlSet::control (const Parameter& parameter, bool create_if_missing) bool ControlSet::find_next_event (FrameTime now, FrameTime end, ControlEvent& next_event) const { - Controls::const_iterator li; + Controls::const_iterator li; next_event.when = std::numeric_limits<FrameTime>::max(); - + for (li = _controls.begin(); li != _controls.end(); ++li) { ControlList::const_iterator i; boost::shared_ptr<const ControlList> alist (li->second->list()); ControlEvent cp (now, 0.0f); - + for (i = lower_bound (alist->begin(), alist->end(), &cp, ControlList::time_comparator); i != alist->end() && (*i)->when < end; ++i) { if ((*i)->when > now) { - break; + break; } } - + if (i != alist->end() && (*i)->when < end) { if ((*i)->when < next_event.when) { next_event.when = (*i)->when; |