summaryrefslogtreecommitdiff
path: root/muse2/muse/song.h
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2012-03-15 18:21:23 +0000
committerFlorian Jung <flo@windfisch.org>2012-03-15 18:21:23 +0000
commit27b7bf6815cda7abb67026c37b3e44daee1803cb (patch)
tree0b9d1c0bc84ac7ff8032e707f2b5fb4e0aaabb5c /muse2/muse/song.h
parent2d6f113a10eb485694e20a78500f650776d701e3 (diff)
merged with trunk
Diffstat (limited to 'muse2/muse/song.h')
-rw-r--r--muse2/muse/song.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/muse2/muse/song.h b/muse2/muse/song.h
index 22a3a86c..7f0aae70 100644
--- a/muse2/muse/song.h
+++ b/muse2/muse/song.h
@@ -33,7 +33,6 @@
#include "pos.h"
#include "globaldefs.h"
#include "tempo.h"
-///#include "sig.h"
#include "al/sig.h"
#include "undo.h"
#include "track.h"
@@ -264,7 +263,6 @@ class Song : public QObject {
// event manipulations
//-----------------------------------------
- //void cmdAddRecordedWave(WaveTrack* track, const Pos&, const Pos&);
void cmdAddRecordedWave(WaveTrack* track, Pos, Pos);
void cmdAddRecordedEvents(MidiTrack*, EventList*, unsigned);
bool addEvent(Event&, Part*);
@@ -293,7 +291,6 @@ class Song : public QObject {
PartList* getSelectedWaveParts() const;
bool msgRemoveParts();
- //void cmdChangePart(Part* oldPart, Part* newPart);
void cmdChangePart(Part* oldPart, Part* newPart, bool doCtrls, bool doClones);
void cmdRemovePart(Part* part);
void cmdAddPart(Part* part);
@@ -319,7 +316,7 @@ class Song : public QObject {
void removeTrack2(Track* track);
void removeTrack3(Track* track);
void removeMarkedTracks();
- //void changeTrack(Track* oldTrack, Track* newTrack);
+ //void changeTrack(Track* oldTrack, Track* newTrack); DELETETHIS
MidiTrack* findTrack(const Part* part) const;
Track* findTrack(const QString& name) const;
void swapTracks(int i1, int i2);
@@ -339,7 +336,6 @@ class Song : public QObject {
int execMidiAutomationCtlPopup(MidiTrack*, MidiPart*, const QPoint&, int);
void connectJackRoutes(AudioTrack* track, bool disconnect);
void updateSoloStates();
- //void chooseMidiRoutes(QButton* /*parent*/, MidiTrack* /*track*/, bool /*dst*/);
//-----------------------------------------
// undo, redo