hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix automation processing in BB tracks (#3481)

Browse Source 
Fixes #3464
This commit is contained in:
Lukas W
2017-04-06 23:10:00 +02:00
committed by GitHub
parent b5ac3161c9
commit 96a00300e8
7 changed files with 201 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/BBTrackContainer.h
View File

@@ -48,7 +48,7 @@ public:
return "bbtrackcontainer";
}
tact_t lengthOfBB( int _bb );
tact_t lengthOfBB( int _bb ) const;
inline tact_t lengthOfCurrentBB()
{
return lengthOfBB( currentBB() );
@@ -62,6 +62,7 @@ public:
void fixIncorrectPositions();
void createTCOsForBB( int _bb );
AutomatedValueMap automatedValuesAt(MidiTime time, int tcoNum) const override;
public slots:
void play();

5
include/Song.h
View File

@@ -204,7 +204,8 @@ public:
return m_globalAutomationTrack;
}
static AutomatedValueMap automatedValuesAt(const Track::tcoVector& tcos, MidiTime time);
//TODO: Add Q_DECL_OVERRIDE when Qt4 is dropped
AutomatedValueMap automatedValuesAt(MidiTime time, int tcoNum = -1) const;
// file management
void createNewProject();
@@ -326,7 +327,7 @@ private:
void removeAllControllers();
void processAutomations(const TrackList& tracks, MidiTime timeStart, fpp_t frames, int tcoNum);
void processAutomations(const TrackList& tracks, MidiTime timeStart, fpp_t frames);
AutomationTrack * m_globalAutomationTrack;

3
include/TrackContainer.h
View File

@@ -93,11 +93,14 @@ public:
return m_TrackContainerType;
}
virtual AutomatedValueMap automatedValuesAt(MidiTime time, int tcoNum = -1) const;
signals:
void trackAdded( Track * _track );
protected:
static AutomatedValueMap automatedValuesFromTracks(const TrackList &tracks, MidiTime timeStart, int tcoNum = -1);
mutable QReadWriteLock m_tracksMutex;
private: