Skip to content

Include past automation patterns in processing #3382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lukas-w merged 11 commits into from
Mar 26, 2017
Merged

Include past automation patterns in processing #3382

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b2bda9e
Include past automation tracks in processing
lukas-w Feb 23, 2017
c42eb2e
Process automation tracks globally
lukas-w Mar 7, 2017
b0ecb59
Do not ignore unexpected error
Mar 19, 2017
0e5b66f
Automation: Don't record when play position is outside of pattern
lukas-w Mar 21, 2017
554f901
Track::getTCOsInRange: Use binary search, fix doc
lukas-w Mar 21, 2017
42fcaed
Automation refactorings & record fix
lukas-w Mar 21, 2017
b23041b
Add automation tests
lukas-w Mar 21, 2017
03740fd
Merge branch 'master' into iss-662
lukas-w Mar 22, 2017
429da92
No C++11 in headers (breaks plugins)
lukas-w Mar 22, 2017
e280883
Automation: Fix empty patterns (regression from 42fcaedbfd745d353a7)
lukas-w Mar 23, 2017
54d2126
Automation: Fix processing with tcoNum
lukas-w Mar 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Automation: Fix empty patterns (regression from 42fcaed)
  • Loading branch information
@lukas-w
lukas-w committed Mar 23, 2017
commit e2808837d2010091317351c5c9c54de73975f852
4 changes: 4 additions & 0 deletions src/core/Song.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,6 +863,10 @@ AutomatedValueMap Song::automatedValuesAt(const Track::tcoVector &tcos, MidiTime
continue;
}

if (! p->hasAutomation()) {
continue;
}

MidiTime relTime = time - p->startPosition();
float value = p->valueAt(relTime);

Expand Down
17 changes: 11 additions & 6 deletions tests/src/tracks/AutomationTrackTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,17 @@ private slots:
p2.movePosition(100);
p2.addObject(&model);

QCOMPARE(Song::automatedValuesAt({&p1, &p2}, 0)[&model], 0.0f);
QCOMPARE(Song::automatedValuesAt({&p1, &p2}, 5)[&model], 0.5f);
QCOMPARE(Song::automatedValuesAt({&p1, &p2}, 10)[&model], 1.0f);
QCOMPARE(Song::automatedValuesAt({&p1, &p2}, 50)[&model], 1.0f);
QCOMPARE(Song::automatedValuesAt({&p1, &p2}, 100)[&model], 0.0f);
QCOMPARE(Song::automatedValuesAt({&p1, &p2}, 150)[&model], 0.5f);
AutomationPattern p3(nullptr);
p3.addObject(&model);
//XXX: Why is this even necessary?
p3.clear();

QCOMPARE(Song::automatedValuesAt({&p1, &p2, &p3}, 0)[&model], 0.0f);
QCOMPARE(Song::automatedValuesAt({&p1, &p2, &p3}, 5)[&model], 0.5f);
QCOMPARE(Song::automatedValuesAt({&p1, &p2, &p3}, 10)[&model], 1.0f);
QCOMPARE(Song::automatedValuesAt({&p1, &p2, &p3}, 50)[&model], 1.0f);
QCOMPARE(Song::automatedValuesAt({&p1, &p2, &p3}, 100)[&model], 0.0f);
QCOMPARE(Song::automatedValuesAt({&p1, &p2, &p3}, 150)[&model], 0.5f);
}
} AutomationTrackTest;

Expand Down