diff options
| author | David Robillard <d@drobilla.net> | 2008-10-13 02:43:14 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-10-13 02:43:14 +0000 |
| commit | 1514039689555915c4cb1f17cc09dec43f6ea1e5 (patch) | |
| tree | ca8c0bd5c3893a3fb2a4164d10c0d5e6b484edd0 /libs/evoral/src/ControlSet.cpp | |
| parent | 8b951bb9ee65f3d530848c3c08b8b54e6571317f (diff) | |
Fix pollution of global namespace by Evoral.
git-svn-id: svn://localhost/ardour2/branches/3.0@3947 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/evoral/src/ControlSet.cpp')
| -rw-r--r-- | libs/evoral/src/ControlSet.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/evoral/src/ControlSet.cpp b/libs/evoral/src/ControlSet.cpp index 837810c727..06046347a6 100644 --- a/libs/evoral/src/ControlSet.cpp +++ b/libs/evoral/src/ControlSet.cpp @@ -70,11 +70,11 @@ ControlSet::control (const Parameter& parameter, bool create_if_missing) } bool -ControlSet::find_next_event (nframes_t now, nframes_t end, ControlEvent& next_event) const +ControlSet::find_next_event (FrameTime now, FrameTime end, ControlEvent& next_event) const { Controls::const_iterator li; - next_event.when = std::numeric_limits<nframes_t>::max(); + next_event.when = std::numeric_limits<FrameTime>::max(); for (li = _controls.begin(); li != _controls.end(); ++li) { ControlList::const_iterator i; @@ -95,7 +95,7 @@ ControlSet::find_next_event (nframes_t now, nframes_t end, ControlEvent& next_ev } } - return next_event.when != std::numeric_limits<nframes_t>::max(); + return next_event.when != std::numeric_limits<FrameTime>::max(); } void |