diff options
| author | Tim E. Real <termtech@rogers.com> | 2012-08-04 08:56:37 +0000 |
|---|---|---|
| committer | Tim E. Real <termtech@rogers.com> | 2012-08-04 08:56:37 +0000 |
| commit | 8ee7ac503d93d7a0b6cf3b49c3255d389ba59c17 (patch) | |
| tree | d21dd823d8365f08924525dfb0457c5b82b8193f /muse2/muse/undo.cpp | |
| parent | 79d44ac604c41d431c36bf8a6422e4d5899e68dd (diff) | |
Introducing: More bits for Song Changed SC_* flags.
Added member Song::updateFlags2. Song::update() now takes an extra 'flags2' param.
Please see ChangeLog for important information.
Diffstat (limited to 'muse2/muse/undo.cpp')
| -rw-r--r-- | muse2/muse/undo.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/muse2/muse/undo.cpp b/muse2/muse/undo.cpp index b81de33d..38582d58 100644 --- a/muse2/muse/undo.cpp +++ b/muse2/muse/undo.cpp @@ -217,6 +217,7 @@ void Song::startUndo() undoList->push_back(Undo()); updateFlags = 0; + updateFlags2 = 0; undoMode = true; } @@ -224,9 +225,10 @@ void Song::startUndo() // endUndo //--------------------------------------------------------- -void Song::endUndo(int flags) +void Song::endUndo(int flags, int flags2) { updateFlags |= flags; + updateFlags2 |= flags2; endMsgCmd(); undoMode = false; } @@ -396,7 +398,8 @@ void Song::doUndo2() break; case UndoOp::ModifySongLen: _len=i->b; - updateFlags = -1; // set all flags + updateFlags = -1; // set all flags // TODO Refine this! Too many flags. // REMOVE Tim. + updateFlags2 = -1; // set all flags break; case UndoOp::ModifyClip: case UndoOp::ModifyMarker: @@ -506,7 +509,8 @@ void Song::doRedo2() break; case UndoOp::ModifySongLen: _len=i->a; - updateFlags = -1; // set all flags + updateFlags = -1; // set all flags // TODO Refine this! Too many flags. // REMOVE Tim. + updateFlags2 = -1; // set all flags break; case UndoOp::ModifyClip: case UndoOp::ModifyMarker: |