diff options
| author | Florian Jung <flo@windfisch.org> | 2012-07-01 16:42:16 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2012-07-01 16:42:16 +0000 |
| commit | 9c4664d162c537ba4dd4fd8220971c0fb727103a (patch) | |
| tree | 37a28b7cd4e4d8984ad4934a4884cd7b4da0505c /muse2/muse/song.h | |
| parent | e87fedf1be804f7ec774071d844b1f163be30b96 (diff) | |
final merge
Diffstat (limited to 'muse2/muse/song.h')
| -rw-r--r-- | muse2/muse/song.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/muse2/muse/song.h b/muse2/muse/song.h index 82b8cf18..6570ad8d 100644 --- a/muse2/muse/song.h +++ b/muse2/muse/song.h @@ -126,6 +126,8 @@ class Song : public QObject { int noteFifoWindex; int noteFifoRindex; + TempoFifo _tempoFifo; // External tempo changes, processed in heartbeat. + int updateFlags; TrackList _tracks; // tracklist as seen by arranger @@ -263,7 +265,7 @@ class Song : public QObject { // event manipulations //----------------------------------------- - void cmdAddRecordedWave(WaveTrack* track, Pos, Pos); + void cmdAddRecordedWave(WaveTrack* track, Pos, Pos); void cmdAddRecordedEvents(MidiTrack*, EventList*, unsigned); bool addEvent(Event&, Part*); void changeEvent(Event&, Event&, Part*); @@ -274,8 +276,8 @@ class Song : public QObject { void addACEvent(AudioTrack* t, int acid, int frame, double val); void changeACEvent(AudioTrack* t, int acid, int frame, int newFrame, double val); - void controllerChange(Track* t); - + void addExternalTempo(const TempoRecEvent& e) { _tempoFifo.put(e); } + //----------------------------------------- // part manipulations //----------------------------------------- @@ -332,6 +334,7 @@ class Song : public QObject { void msgInsertTrack(Track* track, int idx, bool u = true); void clearRecAutomation(bool clearList); void processAutomationEvents(); + void processMasterRec(); int execAutomationCtlPopup(AudioTrack*, const QPoint&, int); int execMidiAutomationCtlPopup(MidiTrack*, MidiPart*, const QPoint&, int); void connectJackRoutes(AudioTrack* track, bool disconnect); @@ -428,7 +431,7 @@ class Song : public QObject { void markerChanged(int); void midiPortsChanged(); void midiNote(int pitch, int velo); - void controllerChanged(MusECore::Track* t); // maybe DELETETHIS: this only triggers a redraw in pcanvas.cpp; what is this for? + void controllerChanged(MusECore::Track*, int); void newPartsCreated(const std::map< MusECore::Part*, std::set<MusECore::Part*> >&); }; |