From 8ee7ac503d93d7a0b6cf3b49c3255d389ba59c17 Mon Sep 17 00:00:00 2001 From: "Tim E. Real" Date: Sat, 4 Aug 2012 08:56:37 +0000 Subject: 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. --- muse2/muse/undo.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'muse2/muse/undo.cpp') 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: -- cgit v1.2.3