X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipitem.cpp;h=7b95d695fcd774d49b5cad202f42bfbcfd4ac3f3;hb=d4b6dc2efbf65bdbbea25ff6c8c2df785895f570;hp=1f350225b13cdbe50ec1da04c6cebcae6377e398;hpb=65291fac2609fe71e4be801a4d5349ddda5b9243;p=kdenlive diff --git a/src/clipitem.cpp b/src/clipitem.cpp index 1f350225..7b95d695 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -226,7 +226,7 @@ int ClipItem::selectedEffectIndex() const 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 @@ -258,10 +258,24 @@ void ClipItem::initEffect(QDomElement effect, int diff) 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") { @@ -269,7 +283,7 @@ void ClipItem::initEffect(QDomElement effect, int diff) 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; } @@ -280,7 +294,7 @@ void ClipItem::initEffect(QDomElement effect, int diff) } } 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; } @@ -298,21 +312,23 @@ void ClipItem::initEffect(QDomElement effect, int diff) 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)); @@ -320,6 +336,19 @@ void ClipItem::initEffect(QDomElement effect, int diff) } } +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; @@ -433,7 +462,7 @@ void ClipItem::setSelectedEffect(const int ix) { m_selectedEffect = ix; QLocale locale; - QDomElement effect = effectAt(m_selectedEffect); + QDomElement effect = effectAtIndex(m_selectedEffect); if (!effect.isNull() && effect.attribute("disable") != "1") { QDomNodeList params = effect.elementsByTagName("parameter"); for (int i = 0; i < params.count(); i++) { @@ -487,7 +516,7 @@ QStringList ClipItem::keyframes(const int index) void ClipItem::updateKeyframeEffect() { // regenerate xml parameter from the clip keyframes - QDomElement effect = getEffectAt(m_selectedEffect); + QDomElement effect = getEffectAtIndex(m_selectedEffect); if (effect.attribute("disable") == "1") return; QDomNodeList params = effect.elementsByTagName("parameter"); QDomElement e = params.item(m_visibleParam).toElement(); @@ -509,7 +538,7 @@ void ClipItem::updateKeyframeEffect() QDomElement ClipItem::selectedEffect() { if (m_selectedEffect == -1 || m_effectList.isEmpty()) return QDomElement(); - return effectAt(m_selectedEffect); + return effectAtIndex(m_selectedEffect); } void ClipItem::resetThumbs(bool clearExistingThumbs) @@ -1002,11 +1031,11 @@ OPERATIONTYPE ClipItem::operationMode(QPointF pos) 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; @@ -1359,19 +1388,25 @@ QStringList ClipItem::effectNames() return m_effectList.effectNames(); } -QDomElement ClipItem::effectAt(int ix) const +QDomElement ClipItem::effect(int ix) const +{ + if (ix >= m_effectList.count() || ix < 0) return QDomElement(); + return m_effectList.at(ix).cloneNode().toElement(); +} + +QDomElement ClipItem::effectAtIndex(int ix) const { if (ix > m_effectList.count() || ix <= 0) return QDomElement(); return m_effectList.itemFromIndex(ix).cloneNode().toElement(); } -QDomElement ClipItem::getEffectAt(int ix) const +QDomElement ClipItem::getEffectAtIndex(int ix) const { if (ix > m_effectList.count() || ix <= 0) return QDomElement(); return m_effectList.itemFromIndex(ix); } -bool ClipItem::updateEffect(QDomElement effect) +void ClipItem::updateEffect(QDomElement effect) { //kDebug() << "CHange EFFECT AT: " << ix << ", CURR: " << m_effectList.at(ix).attribute("tag") << ", NEW: " << effect.attribute("tag"); m_effectList.updateEffect(effect); @@ -1384,7 +1419,11 @@ bool ClipItem::updateEffect(QDomElement effect) r.setHeight(20); update(r); } - return true; +} + +void ClipItem::enableEffects(QList indexes, bool disable) +{ + m_effectList.enableEffects(indexes, disable); } bool ClipItem::moveEffect(QDomElement effect, int ix) @@ -1415,6 +1454,7 @@ EffectsParameterList ClipItem::addEffect(QDomElement effect, bool /*animate*/) int ix; QDomElement insertedEffect; if (!effect.hasAttribute("kdenlive_ix")) { + // effect dropped from effect list ix = effectsCounter(); } else ix = effect.attribute("kdenlive_ix").toInt(); if (!m_effectList.isEmpty() && ix <= m_effectList.count()) { @@ -1424,6 +1464,18 @@ EffectsParameterList ClipItem::addEffect(QDomElement effect, bool /*animate*/) // 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")); @@ -1435,11 +1487,50 @@ EffectsParameterList ClipItem::addEffect(QDomElement effect, bool /*animate*/) 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:"< m_effectList.count() - 1) { - setSelectedEffect(m_effectList.count() - 1); + if (ix > m_effectList.count()) { + setSelectedEffect(m_effectList.count()); } else setSelectedEffect(ix); } if (needRepaint) update(boundingRect()); @@ -1629,6 +1678,20 @@ const ItemInfo ClipItem::speedIndependantInfo() const return m_speedIndependantInfo; } +int ClipItem::nextFreeEffectGroupIndex() const +{ + int freeGroupIndex = 0; + for (int i = 0; i < m_effectList.count(); i++) { + QDomElement effect = m_effectList.at(i); + EffectInfo effectInfo; + effectInfo.fromString(effect.attribute("kdenlive_info")); + if (effectInfo.groupIndex >= freeGroupIndex) { + freeGroupIndex = effectInfo.groupIndex + 1; + } + } + return freeGroupIndex; +} + //virtual void ClipItem::dropEvent(QGraphicsSceneDragDropEvent * event) { @@ -1641,8 +1704,14 @@ void ClipItem::dropEvent(QGraphicsSceneDragDropEvent * event) if (e.tagName() == "effectgroup") { // dropped an effect group QDomNodeList effectlist = e.elementsByTagName("effect"); + int freeGroupIndex = nextFreeEffectGroupIndex(); + EffectInfo effectInfo; for (int i = 0; i < effectlist.count(); i++) { - effectlist.at(i).toElement().removeAttribute("kdenlive_ix"); + QDomElement effect = effectlist.at(i).toElement(); + effectInfo.fromString(effect.attribute("kdenlive_info")); + effectInfo.groupIndex = freeGroupIndex; + effect.setAttribute("kdenlive_info", effectInfo.toString()); + effect.removeAttribute("kdenlive_ix"); } } else { // single effect dropped @@ -1825,9 +1894,9 @@ QMap ClipItem::adjustEffectsToDuration(int width, int height, 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)); } @@ -1862,7 +1931,10 @@ QMap ClipItem::adjustEffectsToDuration(int width, int height, int frame = EffectsList::parameter(effect, "frame").toInt(); EffectsList::setParameter(effect, "frame", QString::number(frame - diff)); continue; - } + } else if (effect.attribute("id") == "pan_zoom") { + effect.setAttribute("in", cropStart().frames(m_fps)); + effect.setAttribute("out", (cropStart() + cropDuration()).frames(m_fps) - 1); + } QDomNodeList params = effect.elementsByTagName("parameter"); for (int j = 0; j < params.count(); j++) { @@ -1876,7 +1948,7 @@ QMap ClipItem::adjustEffectsToDuration(int width, int height, } else if (type == "simplekeyframe" || type == "keyframe") { if (!effects.contains(i)) effects[i] = effect.cloneNode().toElement(); - updateNormalKeyframes(param); + updateNormalKeyframes(param, oldInfo); #ifdef USE_QJSON } else if (type == "roto-spline") { if (!effects.contains(i)) @@ -1891,16 +1963,25 @@ QMap ClipItem::adjustEffectsToDuration(int width, int height, return effects; } -bool ClipItem::updateNormalKeyframes(QDomElement parameter) +bool ClipItem::updateNormalKeyframes(QDomElement parameter, ItemInfo oldInfo) { int in = cropStart().frames(m_fps); int out = (cropStart() + cropDuration()).frames(m_fps) - 1; + int oldin = oldInfo.cropStart.frames(m_fps); QLocale locale; + bool keyFrameUpdated = false; const QStringList data = parameter.attribute("keyframes").split(';', QString::SkipEmptyParts); QMap keyframes; - foreach (QString keyframe, data) - keyframes[keyframe.section(':', 0, 0).toInt()] = locale.toDouble(keyframe.section(':', 1, 1)); + foreach (QString keyframe, data) { + int keyframepos = keyframe.section(':', 0, 0).toInt(); + // if keyframe was at clip start, update it + if (keyframepos == oldin) { + keyframepos = in; + keyFrameUpdated = true; + } + keyframes[keyframepos] = locale.toDouble(keyframe.section(':', 1, 1)); + } QMap::iterator i = keyframes.end(); @@ -1952,7 +2033,7 @@ bool ClipItem::updateNormalKeyframes(QDomElement parameter) ++i; } - if (startFound || endFound) { + if (startFound || endFound || keyFrameUpdated) { QString newkfr; QMap::const_iterator k = keyframes.constBegin(); while (k != keyframes.constEnd()) { @@ -1968,7 +2049,6 @@ bool ClipItem::updateNormalKeyframes(QDomElement parameter) void ClipItem::updateGeometryKeyframes(QDomElement effect, int paramIndex, int width, int height, ItemInfo oldInfo) { - QDomElement param = effect.elementsByTagName("parameter").item(paramIndex).toElement(); int offset = oldInfo.cropStart.frames(m_fps); QString data = param.attribute("value");