summaryrefslogtreecommitdiff
path: root/muse2/muse/eventlist.cpp
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2013-08-19 22:10:22 +0200
committerFlorian Jung <flo@windfisch.org>2013-08-19 22:10:22 +0200
commit013294f58a6433671da3b34775de5a3a7ea91464 (patch)
tree7a1135f74c798f78c802c8c4e4ca4f9b0c293baa /muse2/muse/eventlist.cpp
parent67c0ed979d4dd05c1d51b688c2fb02ebc681afd1 (diff)
some const-correctness. Part interface overhaul.
various fixes.
Diffstat (limited to 'muse2/muse/eventlist.cpp')
-rw-r--r--muse2/muse/eventlist.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/muse2/muse/eventlist.cpp b/muse2/muse/eventlist.cpp
index 50ba2652..f499fd2d 100644
--- a/muse2/muse/eventlist.cpp
+++ b/muse2/muse/eventlist.cpp
@@ -129,11 +129,22 @@ void EventList::move(Event& event, unsigned tick)
//---------------------------------------------------------
iEvent EventList::find(const Event& event)
+{
+ std::pair<iEvent,iEvent> range = equal_range(event.type() == Wave ? event.frame() : event.tick());
+
+ for (iEvent i = range.first; i != range.second; ++i) {
+ if (i->second == event)
+ return i;
+ }
+ return end();
+}
+
+ciEvent EventList::find(const Event& event) const
{
EventRange range = equal_range(event.type() == Wave ? event.frame() : event.tick());
- for (iEvent i = range.first; i != range.second; ++i) {
+ for (ciEvent i = range.first; i != range.second; ++i) {
if (i->second == event)
return i;
}