From 6d1acdab58d8e6472d5b1f04a868e26f19b6f668 Mon Sep 17 00:00:00 2001 From: Vincent PINON Date: Sat, 30 Jun 2012 10:00:47 +0200 Subject: [PATCH] Fix fadeout interpreted as fadein (fade>0) --- src/clipitem.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/clipitem.cpp b/src/clipitem.cpp index 7b95d695..e50ba6ea 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -188,21 +188,21 @@ void ClipItem::setEffectList(const EffectsList effectList) } } else if (effectId == "fadeout") { if (m_effectList.hasEffect(QString(), "fade_to_black") == -1) { - if (e.attribute("name") == "out") fade -= e.attribute("value").toInt(); - else if (e.attribute("name") == "in") fade += e.attribute("value").toInt(); + if (e.attribute("name") == "out") fade += e.attribute("value").toInt(); + else if (e.attribute("name") == "in") fade -= e.attribute("value").toInt(); } else { QDomElement fadeout = m_effectList.getEffectByTag(QString(), "fade_to_black"); - if (fadeout.attribute("name") == "out") fade -= fadeout.attribute("value").toInt(); - else if (fadeout.attribute("name") == "in") fade += fadeout.attribute("value").toInt(); + if (fadeout.attribute("name") == "out") fade += fadeout.attribute("value").toInt(); + else if (fadeout.attribute("name") == "in") fade -= fadeout.attribute("value").toInt(); } } else if (effectId == "fade_to_black") { if (m_effectList.hasEffect(QString(), "fadeout") == -1) { - if (e.attribute("name") == "out") fade -= e.attribute("value").toInt(); - else if (e.attribute("name") == "in") fade += e.attribute("value").toInt(); + if (e.attribute("name") == "out") fade += e.attribute("value").toInt(); + else if (e.attribute("name") == "in") fade -= e.attribute("value").toInt(); } else { QDomElement fadeout = m_effectList.getEffectByTag(QString(), "fadeout"); - if (fadeout.attribute("name") == "out") fade -= fadeout.attribute("value").toInt(); - else if (fadeout.attribute("name") == "in") fade += fadeout.attribute("value").toInt(); + if (fadeout.attribute("name") == "out") fade += fadeout.attribute("value").toInt(); + else if (fadeout.attribute("name") == "in") fade -= fadeout.attribute("value").toInt(); } } } -- 2.39.2