merged experimental branch into trunk, adding:

- new style drummaps
- drummaps stored in idf files
- auto-assigning drummaps
- some fixes

1 files changed, 3 insertions, 1 deletions

diff --git a/muse2/muse/song.h b/muse2/muse/song.h
index ce5aadeb..22a3a86c 100644
--- a/muse2/muse/song.h
+++ b/muse2/muse/song.h
@@ -384,7 +384,9 @@ class Song : public QObject {
 
    public slots:
       void seekTo(int tick);
-      void update(int flags = -1);
+      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!
       void beat();
 
       void undo();