merged with release_2_0

1 files changed, 13 insertions, 0 deletions

diff --git a/muse2/muse/undo.h b/muse2/muse/undo.h
index ce73ac9a..61604d6f 100644
--- a/muse2/muse/undo.h
+++ b/muse2/muse/undo.h
@@ -51,6 +51,7 @@ struct UndoOp {
             AddTempo, DeleteTempo,
             AddSig,   DeleteSig,
             AddKey,   DeleteKey,
+            ModifyTrackName, ModifyTrackChannel,
             SwapTrack,
             ModifyClip,
             ModifyMarker,
@@ -97,6 +98,16 @@ struct UndoOp {
                   Marker* realMarker;
                   Marker* copyMarker;
                 };
+            struct {
+                  Track* _renamedTrack;
+                  char* _oldName;
+                  char* _newName;
+                };
+            struct {
+                  Track* _propertyTrack;
+                  int _oldPropValue;
+                  int _newPropValue;
+                };
             };
       Event oEvent;
       Event nEvent;
@@ -118,6 +129,8 @@ struct UndoOp {
       UndoOp(UndoType type, SigEvent* oevent, SigEvent* nevent);
       UndoOp(UndoType type, const char* changedFile, const char* changeData, int startframe, int endframe);
       UndoOp(UndoType type, Marker* copyMarker, Marker* realMarker);
+      UndoOp(UndoType type, Track* track, const char* old_name, const char* new_name);
+      UndoOp(UndoType type, Track* track, int old_chan, int new_chan);
       UndoOp(UndoType type);
       };