diff options
| author | Florian Jung <flo@windfisch.org> | 2011-06-27 18:23:39 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-06-27 18:23:39 +0000 |
| commit | 933aeb536f3d90eb38bc96308de628eeedd81755 (patch) | |
| tree | 471aba95c16c939c696a4301ce2be45a7e583789 /muse2/muse/song.h | |
| parent | d1b2d6ec4fe4206182e0cead1e734adfc3ae6df6 (diff) | |
| parent | 637498c87bf1ac780d8527d0596936fcdd2c6dfc (diff) | |
merged stuff from experimental back to trunk:
- massively speeded up muse by using operation groups
- changed behaviour of mid-click to "delete" in all canvases
Diffstat (limited to 'muse2/muse/song.h')
| -rw-r--r-- | muse2/muse/song.h | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/muse2/muse/song.h b/muse2/muse/song.h index 47fd96d4..fd88b278 100644 --- a/muse2/muse/song.h +++ b/muse2/muse/song.h @@ -147,6 +147,8 @@ class Song : public QObject { Song(const char* name = 0); ~Song(); + bool applyOperationGroup(Undo& group, bool doUndo=true); + void putEvent(int pv); void endMsgCmd(); void processMsg(AudioMsg* msg); @@ -316,21 +318,9 @@ class Song : public QObject { void startUndo(); void endUndo(int); - //void undoOp(UndoOp::UndoType, Track* oTrack, Track* nTrack); - void undoOp(UndoOp::UndoType, int n, Track* oTrack, Track* nTrack); - void undoOp(UndoOp::UndoType, int, Track*); - void undoOp(UndoOp::UndoType, int, int, int = 0); - void undoOp(UndoOp::UndoType, Part*); - //void undoOp(UndoOp::UndoType, Event& nevent, Part*); - void undoOp(UndoOp::UndoType, Event& nevent, Part*, bool doCtrls, bool doClones); - //void undoOp(UndoOp::UndoType, Event& oevent, Event& nevent, Part*); - void undoOp(UndoOp::UndoType, Event& oevent, Event& nevent, Part*, bool doCtrls, bool doClones); - void undoOp(UndoOp::UndoType, SigEvent* oevent, SigEvent* nevent); - void undoOp(UndoOp::UndoType, int channel, int ctrl, int oval, int nval); - //void undoOp(UndoOp::UndoType, Part* oPart, Part* nPart); - void undoOp(UndoOp::UndoType, Part* oPart, Part* nPart, bool doCtrls, bool doClones); + void undoOp(UndoOp::UndoType type, const char* changedFile, const char* changeData, int startframe, int endframe); - void undoOp(UndoOp::UndoType type, Marker* copyMarker, Marker* realMarker); + bool doUndo1(); void doUndo2(); void doUndo3(); @@ -338,7 +328,7 @@ class Song : public QObject { void doRedo2(); void doRedo3(); - void addUndo(UndoOp& i); + void addUndo(UndoOp i); //----------------------------------------- // Configuration |