Commit b27b4c45 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle

Merge branch 'master' of git://anongit.kde.org/kdenlive

parents 7874b768 6d1acdab
......@@ -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();
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment