/* This file is part of Evoral.
- * Copyright (C) 2008 Dave Robillard <http://drobilla.net>
+ * Copyright (C) 2008 David Robillard <http://drobilla.net>
* Copyright (C) 2000-2008 Paul Davis
*
* Evoral is free software; you can redistribute it and/or modify it under the
{
}
-ControlSet::ControlSet (const ControlSet& other)
- : noncopyable ()
+ControlSet::ControlSet (const ControlSet&)
+ : noncopyable ()
{
- /* derived class must copy controls */
+ /* derived class must copy controls */
}
void
ac->list()->InterpolationChanged.connect_same_thread (
_list_connections, boost::bind (&ControlSet::control_list_interpolation_changed, this, ac->parameter(), _1)
- );
+ );
}
void
ControlSet::what_has_data (set<Parameter>& s) const
{
Glib::Mutex::Lock lm (_control_lock);
+
for (Controls::const_iterator li = _controls.begin(); li != _controls.end(); ++li) {
- s.insert(li->first);
+ if (li->second->list() && !li->second->list()->empty()) {
+ s.insert (li->first);
+ }
}
}
}
bool
-ControlSet::find_next_event (FrameTime now, FrameTime end, ControlEvent& next_event) const
+ControlSet::find_next_event (double now, double end, ControlEvent& next_event) const
{
Controls::const_iterator li;
- next_event.when = std::numeric_limits<FrameTime>::max();
+ 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<FrameTime>::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