X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipitem.cpp;h=b663a6ed08eecf7220025facc679d4d8a5d235c0;hb=1d7da2457cc52f8686ac0654b7fedb9a5bb21a8b;hp=0408213873ae4a679776bc7018e66d7927fd8247;hpb=3eeba58b7d59810eba5154f186210b08b107bccc;p=kdenlive diff --git a/src/clipitem.cpp b/src/clipitem.cpp index 04082138..b663a6ed 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,9 +258,16 @@ 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 (effect.attribute("tag") == "volume" || effect.attribute("tag") == "brightness") { @@ -320,6 +327,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 +453,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 +507,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 +529,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 +1022,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 +1379,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 +1410,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) @@ -1571,10 +1601,10 @@ void ClipItem::deleteEffect(QString index) m_effectList.removeAt(ix); m_effectNames = m_effectList.effectNames().join(" / "); - if (m_effectList.isEmpty() || m_selectedEffect + 1 == ix) { + if (m_effectList.isEmpty() || m_selectedEffect == ix) { // Current effect was removed - if (ix > 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()); @@ -1630,6 +1660,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) { @@ -1642,8 +1686,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 @@ -1826,9 +1876,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)); }