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

Merge branch 'stable-1.2'

Browse Source 
# Conflicts:
#	src/gui/widgets/EffectView.cpp
This commit is contained in:
Lukas W
2018-06-17 11:51:50 +02:00
parent d11966a7ea 407973ad6f
commit a87aa7e356
19 changed files with 342 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/src/tracks/AutomationTrackTest.cpp
View File

@@ -193,6 +193,30 @@ private slots:
QCOMPARE(song->automatedValuesAt(5)[&model], 0.5f);
QCOMPARE(song->automatedValuesAt(MidiTime::ticksPerTact() + 5)[&model], 0.5f);
}
void testGlobalAutomation()
{
// Global automation should not have priority, see https://github.com/LMMS/lmms/issues/4268
// Tests regression caused by 75077f6200a5aee3a5821aae48a3b8466ed8714a
auto song = Engine::getSong();
auto globalTrack = song->globalAutomationTrack();
AutomationPattern globalPattern(globalTrack);
AutomationTrack localTrack(song);
AutomationPattern localPattern(&localTrack);
FloatModel model;
globalPattern.setProgressionType(AutomationPattern::DiscreteProgression);
localPattern.setProgressionType(AutomationPattern::DiscreteProgression);
globalPattern.addObject(&model);
localPattern.addObject(&model);
globalPattern.putValue(0, 100.0f, false);
localPattern.putValue(0, 50.0f, false);
QCOMPARE(song->automatedValuesAt(0)[&model], 50.0f);
}
} AutomationTrackTest;
#include "AutomationTrackTest.moc"