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/widgets/utils.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/widgets/utils.cpp')
| -rw-r--r-- | muse2/muse/widgets/utils.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/muse2/muse/widgets/utils.cpp b/muse2/muse/widgets/utils.cpp index ab1d74fd..687c76e4 100644 --- a/muse2/muse/widgets/utils.cpp +++ b/muse2/muse/widgets/utils.cpp @@ -532,7 +532,7 @@ int get_paste_len() if (tag == "part") { Part* p = 0; - p = readXmlPart(xml, NULL, false, false); + p = Part::readFromXml(xml, NULL, false, false); if (p) { @@ -542,7 +542,7 @@ int get_paste_len() if (p->endTick() > end_tick) end_tick=p->endTick(); - unchainClone(p); + p->unchainClone(); // just for safety; shouldn't be chained anyway. delete p; } } |