diff options
| author | Florian Jung <flo@windfisch.org> | 2013-09-18 23:54:35 +0200 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2013-09-18 23:54:35 +0200 |
| commit | b3fc353a09496ee0aea7099d72e6963f4c2fc774 (patch) | |
| tree | 83ab91e988c59076d81ebddc09e8ff274dee8af5 /muse2/muse/event.cpp | |
| parent | 48a93993cfce160fb7d4cf0b67b4b77e22db19e5 (diff) | |
| parent | 85a51421d44f3893a1010f77e0418caf6be70235 (diff) | |
Merge branch 'audiomsg_overhaul' (nonshared eventlists and more)
This introduces the following changes:
- Clone Parts no more share their eventlist. Instead, all changes
made to one clone are replicated to the other clones' eventlists
- audio/song->msg{Add,Delete,Change}{Part,Event,Track} have been
replaced by the corresponding UndoOp operations.
- Enforcing of const-correctness: No GUI code may ever gain
writable access to audio/midi/song data structures. Access
must *always* go through applyOperationGroup. This is now
enforced.
- Removed a bunch of DELETETHIS or REMOVE or otherwise commented
out code
- Removed dead code
- Removed unused Audio Messages (that should go through applyOpGroup
anyway.)
Diffstat (limited to 'muse2/muse/event.cpp')
| -rw-r--r-- | muse2/muse/event.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/muse2/muse/event.cpp b/muse2/muse/event.cpp index 1a2d3c6e..32b72277 100644 --- a/muse2/muse/event.cpp +++ b/muse2/muse/event.cpp @@ -74,7 +74,7 @@ void EventBase::dump(int n) const // clone //--------------------------------------------------------- -Event Event::clone() +Event Event::clone() const { #ifdef USE_SAMPLERATE return Event(ev->clone(), _audConv); @@ -179,6 +179,10 @@ Event& Event::operator=(const Event& e) { bool Event::operator==(const Event& e) const { return ev == e.ev; } +bool Event::isSimilarTo(const Event& other) const +{ + return ev->isSimilarTo(*other.ev); +} int Event::getRefCount() const { return ev->getRefCount(); } bool Event::selected() const { return ev->_selected; } @@ -203,7 +207,7 @@ void Event::read(Xml& xml) void Event::write(int a, Xml& xml, const Pos& o, bool forceWavePaths) const { ev->write(a, xml, o, forceWavePaths); } void Event::dump(int n) const { ev->dump(n); } -Event Event::mid(unsigned a, unsigned b) { return Event(ev->mid(a, b)); } +Event Event::mid(unsigned a, unsigned b) const { return Event(ev->mid(a, b)); } bool Event::isNote() const { return ev->isNote(); } bool Event::isNoteOff() const { return ev->isNoteOff(); } |