Audio envelope calculation extracted into own class, mean and standard deviation...

[kdenlive] / src / transition.cpp

diff --git a/src/transition.cpp b/src/transition.cpp
index c3c36e4d989a00d5739dfe7976f45c77cd65b4ce..d9e931d2d9c3cefa920fdc772b1b75b80f8229b6 100644 (file)
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -29,7 +29,9 @@
 #include <QDomElement>
 #include <QPainter>
 #include <QStyleOptionGraphicsItem>
-
+#if QT_VERSION >= 0x040600
+#include <QPropertyAnimation>
+#endif
 
 Transition::Transition(const ItemInfo &info, int transitiontrack, double fps, QDomElement params, bool automaticTransition) :
         AbstractClipItem(info, QRectF(), fps),
@@ -43,14 +45,20 @@ Transition::Transition(const ItemInfo &info, int transitiontrack, double fps, QD
     setPos(info.startPos.frames(fps), (int)(info.track * KdenliveSettings::trackheight() + itemOffset() + 1));
 
 #if QT_VERSION >= 0x040600
-    QPropertyAnimation *startAnimation = new QPropertyAnimation(this, "rect", this);
-    startAnimation->setDuration(200);
-    QRectF r(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal) itemHeight() / 2);
-    QRectF r2(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal)itemHeight());
-    startAnimation->setStartValue(r);
-    startAnimation->setEndValue(r2);
-    startAnimation->setEasingCurve(QEasingCurve::OutQuad);
-    startAnimation->start(QAbstractAnimation::DeleteWhenStopped);
+    if (!(KGlobalSettings::graphicEffectsLevel() & KGlobalSettings::SimpleAnimationEffects)) {
+        // animation disabled
+        setRect(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal) itemHeight());
+    }
+    else {
+        QPropertyAnimation *startAnimation = new QPropertyAnimation(this, "rect");
+        startAnimation->setDuration(200);
+        const QRectF r(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal) itemHeight() / 2);
+        const QRectF r2(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal)itemHeight());
+        startAnimation->setStartValue(r);
+        startAnimation->setEndValue(r2);
+        startAnimation->setEasingCurve(QEasingCurve::OutQuad);
+        startAnimation->start(QAbstractAnimation::DeleteWhenStopped);
+    }
 #else
     setRect(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal) itemHeight());
 #endif
@@ -298,11 +306,13 @@ OPERATIONTYPE Transition::operationMode(QPointF pos)
     return MOVE;
 }
 
+//static
 int Transition::itemHeight()
 {
     return (int) (KdenliveSettings::trackheight() / 3 * 2 - 1);
 }
 
+//static
 int Transition::itemOffset()
 {
     return (int) (KdenliveSettings::trackheight() / 3 * 2);