From 8ee7ac503d93d7a0b6cf3b49c3255d389ba59c17 Mon Sep 17 00:00:00 2001
From: "Tim E. Real" <termtech@rogers.com>
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/song.h | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'muse2/muse/song.h')

diff --git a/muse2/muse/song.h b/muse2/muse/song.h
index 6570ad8d..44d5efa6 100644
--- a/muse2/muse/song.h
+++ b/muse2/muse/song.h
@@ -129,6 +129,7 @@ class Song : public QObject {
       TempoFifo _tempoFifo; // External tempo changes, processed in heartbeat.
       
       int updateFlags;
+      int updateFlags2;  // Extra room for more flags
 
       TrackList _tracks;      // tracklist as seen by arranger
       MidiTrackList  _midis;
@@ -345,7 +346,7 @@ class Song : public QObject {
       //-----------------------------------------
 
       void startUndo();
-      void endUndo(int);
+      void endUndo(int /*flags*/, int /*flags2*/ = 0);
 
       void undoOp(UndoOp::UndoType type, const char* changedFile, const char* changeData, int startframe, int endframe);
 
@@ -371,7 +372,7 @@ class Song : public QObject {
       //-----------------------------------------
 
       void dumpMaster();
-      void addUpdateFlags(int f)  { updateFlags |= f; }
+      void addUpdateFlags(int f, int f2 = 0)  { updateFlags |= f; updateFlags2 |= f2; }
 
       //-----------------------------------------
       //   Python bridge related
@@ -383,9 +384,9 @@ class Song : public QObject {
 
    public slots:
       void seekTo(int tick);
-      void update(int flags = -1, bool allowRecursion=false); // use allowRecursion with care! this
-                                                              // could lock up muse if you aren't sure
-                                                              // that your recursion will be finite!
+      // use allowRecursion with care! this could lock up muse if you 
+      //  aren't sure that your recursion will be finite!
+      void update(int flags = -1, int flags2 = 0, bool allowRecursion=false); 
       void beat();
 
       void undo();
@@ -419,7 +420,7 @@ class Song : public QObject {
       void populateScriptMenu(QMenu* menuPlugins, QObject* receiver);
 
    signals:
-      void songChanged(int);
+      void songChanged(int /*flags*/, int /*flags2*/ = 0); 
       void posChanged(int, unsigned, bool);
       void loopChanged(bool);
       void recordChanged(bool);
-- 
cgit v1.2.3