summaryrefslogtreecommitdiff
path: root/libs/evoral/src/ControlSet.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-11-23 00:17:31 +0000
committerDavid Robillard <d@drobilla.net>2011-11-23 00:17:31 +0000
commitefe14fbd5291fa25e373e2191b04907b679a7e2e (patch)
treef515796f3bfed33eff0ff34c4463e0610524a99e /libs/evoral/src/ControlSet.cpp
parent2929cd1c36fdc033f921bd1fcadabb909cc5e563 (diff)
Fix broken whitespace via merciless application of the emacs hammer.
git-svn-id: svn://localhost/ardour2/branches/3.0@10782 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/evoral/src/ControlSet.cpp')
-rw-r--r--libs/evoral/src/ControlSet.cpp38
1 files changed, 19 insertions, 19 deletions
diff --git a/libs/evoral/src/ControlSet.cpp b/libs/evoral/src/ControlSet.cpp
index bdc73121d2..d4480c2897 100644
--- a/libs/evoral/src/ControlSet.cpp
+++ b/libs/evoral/src/ControlSet.cpp
@@ -33,9 +33,9 @@ ControlSet::ControlSet()
}
ControlSet::ControlSet (const ControlSet&)
- : noncopyable ()
+ : noncopyable ()
{
- /* derived class must copy controls */
+ /* derived class must copy controls */
}
void
@@ -47,7 +47,7 @@ ControlSet::add_control(boost::shared_ptr<Control> ac)
ac->list()->InterpolationChanged.connect_same_thread (
_list_connections, boost::bind (&ControlSet::control_list_interpolation_changed, this, ac->parameter(), _1)
- );
+ );
}
void
@@ -91,26 +91,26 @@ ControlSet::find_next_event (double now, double end, ControlEvent& next_event) c
next_event.when = std::numeric_limits<double>::max();
- for (li = _controls.begin(); li != _controls.end(); ++li) {
+ 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;
- }
- }
-
- if (i != alist->end() && (*i)->when < end) {
- if ((*i)->when < next_event.when) {
- next_event.when = (*i)->when;
- }
- }
- }
-
- return next_event.when != std::numeric_limits<double>::max();
+ for (i = lower_bound (alist->begin(), alist->end(), &cp, ControlList::time_comparator);
+ i != alist->end() && (*i)->when < end; ++i) {
+ if ((*i)->when > now) {
+ break;
+ }
+ }
+
+ if (i != alist->end() && (*i)->when < end) {
+ if ((*i)->when < next_event.when) {
+ next_event.when = (*i)->when;
+ }
+ }
+ }
+
+ return next_event.when != std::numeric_limits<double>::max();
}
void