summaryrefslogtreecommitdiffstats
path: root/src/animation/backend/evaluateblendclipanimatorjob.cpp
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2017-06-15 15:17:04 +0200
committerLaszlo Agocs <laszlo.agocs@qt.io>2017-06-23 10:05:22 +0000
commit6f40494310dab964600375f04391f21b4eccdb44 (patch)
treea2dc6542a70672c3bf901a36723cff35089b6b11 /src/animation/backend/evaluateblendclipanimatorjob.cpp
parent11f092ce7c555814baeffc204f7fadc0f36fdcbb (diff)
Add support for animation callbacks
Let QChannelMapping optionally specify a callback, which then gets invoked either directly on a worker thread or the gui thread. Change-Id: I871776f47cc921ceb254f9dc1a7b89ae5c5618d8 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/animation/backend/evaluateblendclipanimatorjob.cpp')
-rw-r--r--src/animation/backend/evaluateblendclipanimatorjob.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/animation/backend/evaluateblendclipanimatorjob.cpp b/src/animation/backend/evaluateblendclipanimatorjob.cpp
index 76d24a4d3..e0f52765f 100644
--- a/src/animation/backend/evaluateblendclipanimatorjob.cpp
+++ b/src/animation/backend/evaluateblendclipanimatorjob.cpp
@@ -115,6 +115,10 @@ void EvaluateBlendClipAnimatorJob::run()
finalFrame);
// Send the property changes
blendedClipAnimator->sendPropertyChanges(changes);
+
+ // Trigger callbacks either on this thread or by notifying the gui thread.
+ const QVector<AnimationCallbackAndValue> callbacks = prepareCallbacks(mappingData, blendedResults);
+ blendedClipAnimator->sendCallbacks(callbacks);
}
} // Animation