return m_selectedEffect;
}
-void ClipItem::initEffect(QDomElement effect, int diff)
+void ClipItem::initEffect(QDomElement effect, int diff, int offset)
{
// the kdenlive_ix int is used to identify an effect in mlt's playlist, should
// not be changed
e.setAttribute("value", "1");
}
- if ((e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe") && e.attribute("keyframes").isEmpty()) {
- // Effect has a keyframe type parameter, we need to set the values
- e.setAttribute("keyframes", QString::number(cropStart().frames(m_fps)) + ':' + e.attribute("default"));
+ if (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe") {
+ if (e.attribute("keyframes").isEmpty()) {
+ // Effect has a keyframe type parameter, we need to set the values
+ e.setAttribute("keyframes", QString::number(cropStart().frames(m_fps)) + ':' + e.attribute("default"));
+ }
+ else if (offset != 0) {
+ // adjust keyframes to this clip
+ QString adjusted = adjustKeyframes(e.attribute("keyframes"), offset - cropStart().frames(m_fps));
+ e.setAttribute("keyframes", adjusted);
+ }
}
+
+ if (e.attribute("type") == "geometry" && !e.hasAttribute("fixed")) {
+ // Effects with a geometry parameter need to sync in / out with parent clip
+ effect.setAttribute("in", QString::number(cropStart().frames(m_fps)));
+ effect.setAttribute("out", QString::number((cropStart() + cropDuration()).frames(m_fps) - 1));
+ effect.setAttribute("_sync_in_out", "1");
+ }
}
if (effect.attribute("tag") == "volume" || effect.attribute("tag") == "brightness") {
if (effect.attribute("id") == "fadeout" || effect.attribute("id") == "fade_to_black") {
int start = end;
if (effect.attribute("id") == "fadeout") {
if (m_effectList.hasEffect(QString(), "fade_to_black") == -1) {
- int effectDuration = EffectsList::parameter(effect, "in").toInt();
+ int effectDuration = EffectsList::parameter(effect, "out").toInt() - EffectsList::parameter(effect, "in").toInt();
if (effectDuration > cropDuration().frames(m_fps)) {
effectDuration = cropDuration().frames(m_fps) / 2;
}
}
} else if (effect.attribute("id") == "fade_to_black") {
if (m_effectList.hasEffect(QString(), "fadeout") == -1) {
- int effectDuration = EffectsList::parameter(effect, "in").toInt();
+ int effectDuration = EffectsList::parameter(effect, "out").toInt() - EffectsList::parameter(effect, "in").toInt();
if (effectDuration > cropDuration().frames(m_fps)) {
effectDuration = cropDuration().frames(m_fps) / 2;
}
if (effect.attribute("id") == "fadein") {
if (m_effectList.hasEffect(QString(), "fade_from_black") == -1) {
int effectDuration = EffectsList::parameter(effect, "out").toInt();
+ if (offset != 0) effectDuration -= offset;
if (effectDuration > cropDuration().frames(m_fps)) {
effectDuration = cropDuration().frames(m_fps) / 2;
}
end += effectDuration;
} else
- end += EffectsList::parameter(m_effectList.getEffectByTag(QString(), "fade_from_black"), "out").toInt();
+ end += EffectsList::parameter(m_effectList.getEffectByTag(QString(), "fade_from_black"), "out").toInt() - offset;
} else if (effect.attribute("id") == "fade_from_black") {
if (m_effectList.hasEffect(QString(), "fadein") == -1) {
int effectDuration = EffectsList::parameter(effect, "out").toInt();
+ if (offset != 0) effectDuration -= offset;
if (effectDuration > cropDuration().frames(m_fps)) {
effectDuration = cropDuration().frames(m_fps) / 2;
}
end += effectDuration;
} else
- end += EffectsList::parameter(m_effectList.getEffectByTag(QString(), "fadein"), "out").toInt();
+ end += EffectsList::parameter(m_effectList.getEffectByTag(QString(), "fadein"), "out").toInt() - offset;
}
EffectsList::setParameter(effect, "in", QString::number(start));
EffectsList::setParameter(effect, "out", QString::number(end));
}
}
+const QString ClipItem::adjustKeyframes(QString keyframes, int offset)
+{
+ QStringList result;
+ // Simple keyframes
+ const QStringList list = keyframes.split(';', QString::SkipEmptyParts);
+ foreach(const QString &keyframe, list) {
+ int pos = keyframe.section(':', 0, 0).toInt() - offset;
+ QString newKey = QString::number(pos) + ":" + keyframe.section(':', 1);
+ result.append(newKey);
+ }
+ return result.join(";");
+}
+
bool ClipItem::checkKeyFrames()
{
bool clipEffectsModified = false;
if (qAbs((int)(pos.x() - (rect.x() + m_startFade))) < maximumOffset && qAbs((int)(pos.y() - rect.y())) < 6) {
return FADEIN;
- } else if (pos.x() - rect.x() < maximumOffset && (rect.bottom() - pos.y() > addtransitionOffset)) {
+ } else if ((pos.x() <= rect.x() + rect.width() / 2) && pos.x() - rect.x() < maximumOffset && (rect.bottom() - pos.y() > addtransitionOffset)) {
return RESIZESTART;
} else if (qAbs((int)(pos.x() - (rect.x() + rect.width() - m_endFade))) < maximumOffset && qAbs((int)(pos.y() - rect.y())) < 6) {
return FADEOUT;
- } else if ((rect.right() - pos.x() < maximumOffset) && (rect.bottom() - pos.y() > addtransitionOffset)) {
+ } else if ((pos.x() >= rect.x() + rect.width() / 2) && (rect.right() - pos.x() < maximumOffset) && (rect.bottom() - pos.y() > addtransitionOffset)) {
return RESIZEEND;
} else if ((pos.x() - rect.x() < 16 / scale) && (rect.bottom() - pos.y() <= addtransitionOffset)) {
return TRANSITIONSTART;
// Update index to the real one
effect.setAttribute("kdenlive_ix", insertedEffect.attribute("kdenlive_ix"));
+ int effectIn;
+ int effectOut;
+
+ if (effect.attribute("tag") == "affine") {
+ // special case: the affine effect needs in / out points
+ effectIn = effect.attribute("in").toInt();
+ effectOut = effect.attribute("out").toInt();
+ }
+ else {
+ effectIn = EffectsList::parameter(effect, "in").toInt();
+ effectOut = EffectsList::parameter(effect, "out").toInt();
+ }
EffectsParameterList parameters;
parameters.addParam("tag", insertedEffect.attribute("tag"));
if (effectId.isEmpty()) effectId = insertedEffect.attribute("tag");
parameters.addParam("id", effectId);
- // special case: the affine effect needs in / out points
-
QDomNodeList params = insertedEffect.elementsByTagName("parameter");
int fade = 0;
bool needInOutSync = false;
+
+ // check if it is a fade effect
+ if (effectId == "fadein") {
+ needRepaint = true;
+ if (m_effectList.hasEffect(QString(), "fade_from_black") == -1) {
+ fade = effectOut - effectIn;
+ }/* else {
+ QDomElement fadein = m_effectList.getEffectByTag(QString(), "fade_from_black");
+ if (fadein.attribute("name") == "out") fade += fadein.attribute("value").toInt();
+ else if (fadein.attribute("name") == "in") fade -= fadein.attribute("value").toInt();
+ }*/
+ } else if (effectId == "fade_from_black") {
+ kDebug()<<"// FOUND FTB:"<<effectOut<<" - "<<effectIn;
+ needRepaint = true;
+ if (m_effectList.hasEffect(QString(), "fadein") == -1) {
+ fade = effectOut - effectIn;
+ }/* else {
+ QDomElement fadein = m_effectList.getEffectByTag(QString(), "fadein");
+ if (fadein.attribute("name") == "out") fade += fadein.attribute("value").toInt();
+ else if (fadein.attribute("name") == "in") fade -= fadein.attribute("value").toInt();
+ }*/
+ } else if (effectId == "fadeout") {
+ needRepaint = true;
+ if (m_effectList.hasEffect(QString(), "fade_to_black") == -1) {
+ fade = effectIn - effectOut;
+ } /*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();
+ }*/
+ } else if (effectId == "fade_to_black") {
+ needRepaint = true;
+ if (m_effectList.hasEffect(QString(), "fadeout") == -1) {
+ fade = effectIn - effectOut;
+ }/* 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();
+ }*/
+ }
+
for (int i = 0; i < params.count(); i++) {
QDomElement e = params.item(i).toElement();
if (!e.isNull()) {
} else if (e.attribute("factor", "1") == "1" && e.attribute("offset", "0") == "0") {
parameters.addParam(e.attribute("name"), e.attribute("value"));
- // check if it is a fade effect
- if (effectId == "fadein") {
- needRepaint = true;
- if (m_effectList.hasEffect(QString(), "fade_from_black") == -1) {
- if (e.attribute("name") == "out") fade += e.attribute("value").toInt();
- else if (e.attribute("name") == "in") fade -= e.attribute("value").toInt();
- } else {
- QDomElement fadein = m_effectList.getEffectByTag(QString(), "fade_from_black");
- if (fadein.attribute("name") == "out") fade += fadein.attribute("value").toInt();
- else if (fadein.attribute("name") == "in") fade -= fadein.attribute("value").toInt();
- }
- } else if (effectId == "fade_from_black") {
- needRepaint = true;
- if (m_effectList.hasEffect(QString(), "fadein") == -1) {
- if (e.attribute("name") == "out") fade += e.attribute("value").toInt();
- else if (e.attribute("name") == "in") fade -= e.attribute("value").toInt();
- } else {
- QDomElement fadein = m_effectList.getEffectByTag(QString(), "fadein");
- if (fadein.attribute("name") == "out") fade += fadein.attribute("value").toInt();
- else if (fadein.attribute("name") == "in") fade -= fadein.attribute("value").toInt();
- }
- } else if (effectId == "fadeout") {
- needRepaint = true;
- 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();
- } 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();
- }
- } else if (effectId == "fade_to_black") {
- needRepaint = true;
- 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();
- } 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();
- }
- }
} else {
double fact;
if (e.attribute("factor").contains('%')) {
if (id == "fade_from_black" || id == "fadein") {
if (in != cropStart().frames(m_fps)) {
effects[i] = effect.cloneNode().toElement();
- int diff = in - cropStart().frames(m_fps);
- in -= diff;
- out -= diff;
+ int duration = out - in;
+ in = cropStart().frames(m_fps);
+ out = in + duration;
EffectsList::setParameter(effect, "in", QString::number(in));
EffectsList::setParameter(effect, "out", QString::number(out));
}
projects / kdenlive / blobdiff