summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2013-08-22 17:25:28 +0200
committerFlorian Jung <flo@windfisch.org>2013-08-22 17:25:28 +0200
commit42373397c2e2fbb14e965db6945def6c4a0f03c4 (patch)
tree777f995e9733c01bebbe0044b62c10eb7e39a661
parentd1689a28f1f2f92f4653e42c88b5ebc5b2e49140 (diff)
more applyOperation. MusE compiles again, still does not link
-rw-r--r--muse2/muse/song.cpp6
-rw-r--r--muse2/muse/steprec.cpp2
2 files changed, 3 insertions, 5 deletions
diff --git a/muse2/muse/song.cpp b/muse2/muse/song.cpp
index be913b78..6085b1ba 100644
--- a/muse2/muse/song.cpp
+++ b/muse2/muse/song.cpp
@@ -2360,15 +2360,13 @@ void Song::recordEvent(MidiTrack* mt, Event& event)
{
if(ev.dataB() == event.dataB()) // Don't bother if already set.
return;
- // Indicate do undo, and do port controller values and clone parts.
- MusEGlobal::audio->msgChangeEvent(ev, event, part, true, true, true);
+ MusEGlobal::song->applyOperation(UndoOp(UndoOp::ModifyEvent,event,ev,part,true,true));
return;
}
}
}
- // Indicate do undo, and do port controller values and clone parts.
- MusEGlobal::audio->msgAddEvent(event, part, true, true, true);
+ MusEGlobal::song->applyOperation(UndoOp(UndoOp::AddEvent, event, part, true,true));
}
//---------------------------------------------------------
diff --git a/muse2/muse/steprec.cpp b/muse2/muse/steprec.cpp
index 5bbc38c6..ab4893d0 100644
--- a/muse2/muse/steprec.cpp
+++ b/muse2/muse/steprec.cpp
@@ -112,7 +112,7 @@ void StepRec::record(Part* part, int pitch, int len, int step, int velo, bool ct
const Event& ev = i->second;
if (ev.isNote() && ev.pitch() == pitch)
{
- MusEGlobal::audio->msgDeleteEvent(ev, part, true, false, false);
+ MusEGlobal::song->applyOperation(UndoOp(UndoOp::DeleteEvent,ev, part, true,true));
if (!shift)
{