X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipitem.cpp;h=5d73dc42241e73cb13d83c63d1093a1887ef86e8;hb=12bd13b246f3cf974339c619c62104ca10af3170;hp=fadf7ba5843896aa2ac865f5b386bd3d9d7ed3fe;hpb=2a4060e2edb252fd65c5fafc48643cfb3609255e;p=kdenlive diff --git a/src/clipitem.cpp b/src/clipitem.cpp index fadf7ba5..5d73dc42 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -60,7 +60,8 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, i m_speed(speed), m_strobe(strobe), m_framePixelWidth(0), - m_limitedKeyFrames(false) + m_limitedKeyFrames(false), + m_isMainSelectedClip(false) { setZValue(2); m_effectList = EffectsList(true); @@ -188,21 +189,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(); } } } @@ -226,7 +227,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 +259,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 +284,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 +295,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 +313,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 +337,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 +463,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 +517,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 +539,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) @@ -739,29 +769,39 @@ void ClipItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *) { + QPalette palette = scene()->palette(); QColor paintColor; + QColor textColor; + QColor textBgColor; QPen framePen; if (parentItem()) paintColor = QColor(255, 248, 149); else paintColor = m_baseColor; if (isSelected() || (parentItem() && parentItem()->isSelected())) { + textColor = palette.highlightedText().color(); + textBgColor = palette.highlight().color(); paintColor = paintColor.darker(); - framePen.setColor(Qt::red); - framePen.setWidthF(2.0); + framePen.setColor(textBgColor); } else { + textColor = palette.text().color(); + textBgColor = palette.window().color(); + textBgColor.setAlpha(200); framePen.setColor(paintColor.darker()); } - const QRectF exposed = option->exposedRect; - painter->setClipRect(exposed); - painter->fillRect(exposed, paintColor); - painter->setWorldMatrixEnabled(false);; + const QRectF mappedExposed = painter->worldTransform().mapRect(exposed); const QRectF mapped = painter->worldTransform().mapRect(rect()); + painter->setWorldMatrixEnabled(false); + QPainterPath p; + p.addRect(mappedExposed); + QPainterPath q; + q.addRoundedRect(mapped.adjusted(0, 0, -0.5, 0), 3, 3); + painter->setClipPath(p.intersected(q)); + painter->setPen(Qt::NoPen); + painter->fillRect(mappedExposed, paintColor); + painter->setPen(paintColor.darker()); // draw thumbnails if (KdenliveSettings::videothumbnails() && !isAudioOnly()) { - QPen pen = painter->pen(); - pen.setColor(QColor(255, 255, 255, 150)); - painter->setPen(pen); if ((m_clipType == IMAGE || m_clipType == TEXT) && !m_startPix.isNull()) { const QPointF top = mapped.topRight() - QPointF(m_startPix.width() - 1, 0); painter->drawPixmap(top, m_startPix); @@ -794,11 +834,10 @@ void ClipItem::paint(QPainter *painter, else { #if KDE_IS_VERSION(4,5,0) if (m_clip && m_clip->thumbProducer()) { - QString path = m_clip->fileURL().path() + "_"; + QString path = m_clip->fileURL().path() + '_'; QImage img; QPen pen(Qt::white); pen.setStyle(Qt::DotLine); - painter->setPen(pen); QList missing; for (int i = left; i <= right; i++) { img = m_clip->thumbProducer()->findCachedThumb(path + QString::number(i)); @@ -815,7 +854,6 @@ void ClipItem::paint(QPainter *painter, #endif } } - painter->setPen(Qt::black); } // draw audio thumbnails @@ -863,36 +901,38 @@ void ClipItem::paint(QPainter *painter, // Draw effects names if (!m_effectNames.isEmpty() && mapped.width() > 40) { QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignLeft | Qt::AlignTop, m_effectNames); - QColor bgColor; + QColor bColor = palette.window().color(); + QColor tColor = palette.text().color(); + tColor.setAlpha(220); if (m_timeLine && m_timeLine->state() == QTimeLine::Running) { qreal value = m_timeLine->currentValue(); txtBounding.setWidth(txtBounding.width() * value); - bgColor.setRgb(50 + 200 *(1.0 - value), 50, 50, 100 + 50 * value); - } else bgColor.setRgb(50, 50, 90, 180); - - QPainterPath rounded; - rounded.moveTo(txtBounding.bottomRight()); - rounded.arcTo(txtBounding.right() - txtBounding.height() - 2, txtBounding.top() - txtBounding.height(), txtBounding.height() * 2, txtBounding.height() * 2, 270, 90); - rounded.lineTo(txtBounding.topLeft()); - rounded.lineTo(txtBounding.bottomLeft()); - painter->fillPath(rounded, bgColor); - painter->setPen(Qt::lightGray); - painter->drawText(txtBounding.adjusted(1, 0, 1, 0), Qt::AlignCenter, m_effectNames); + bColor.setAlpha(100 + 50 * value); + }; + + painter->setBrush(bColor); + painter->setPen(Qt::NoPen); + painter->drawRoundedRect(txtBounding.adjusted(-1, -2, 4, -1), 3, 3); + painter->setPen(tColor); + painter->drawText(txtBounding.adjusted(2, 0, 1, -1), Qt::AlignCenter, m_effectNames); } - const QRectF txtBounding2 = painter->boundingRect(mapped, Qt::AlignHCenter | Qt::AlignVCenter, ' ' + m_clipName + ' '); - painter->setBrush(framePen.color()); - painter->setPen(Qt::NoPen); - painter->drawRoundedRect(txtBounding2, 3, 3); + // Draw clip name + const QRectF txtBounding2 = painter->boundingRect(mapped, Qt::AlignRight | Qt::AlignTop, m_clipName + ' ').adjusted(0, -1, 0, -1); + painter->setPen(Qt::NoPen); + if (m_isMainSelectedClip) { + framePen.setColor(Qt::red); + textBgColor = Qt::red; + } + painter->fillRect(txtBounding2.adjusted(-3, 0, 0, 0), textBgColor); painter->setBrush(QBrush(Qt::NoBrush)); - + painter->setPen(textColor); if (m_videoOnly) { painter->drawPixmap(txtBounding2.topLeft() - QPointF(17, -1), m_videoPix); } else if (m_audioOnly) { painter->drawPixmap(txtBounding2.topLeft() - QPointF(17, -1), m_audioPix); } - painter->setPen(Qt::white); - painter->drawText(txtBounding2, Qt::AlignCenter, m_clipName); + painter->drawText(txtBounding2, Qt::AlignLeft, m_clipName); // draw markers @@ -916,7 +956,7 @@ void ClipItem::paint(QPainter *painter, painter->drawLine(l2); if (KdenliveSettings::showmarkers()) { framepos = rect().x() + pos.frames(m_fps); - const QRectF r1(framepos + 0.04, 10, rect().width() - framepos - 2, rect().height() - 10); + const QRectF r1(framepos + 0.04, rect().height()/3, rect().width() - framepos - 2, rect().height() / 2); const QRectF r2 = painter->worldTransform().mapRect(r1); const QRectF txtBounding3 = painter->boundingRect(r2, Qt::AlignLeft | Qt::AlignTop, ' ' + (*it).comment() + ' '); painter->setBrush(markerBrush); @@ -973,13 +1013,10 @@ void ClipItem::paint(QPainter *painter, // draw clip border // expand clip rect to allow correct painting of clip border painter->setClipping(false); + painter->setRenderHint(QPainter::Antialiasing, true); + framePen.setWidthF(1.5); painter->setPen(framePen); - if (isSelected() || (parentItem() && parentItem()->isSelected())) { - painter->drawRect(mapped.adjusted(0.5, 0.5, -0.5, -0.5)); - } - else { - painter->drawRect(mapped.adjusted(0, 0, -0.5, 0)); - } + painter->drawRoundedRect(mapped.adjusted(0, 0, -0.5, -0.5), 3, 3); } @@ -997,16 +1034,16 @@ OPERATIONTYPE ClipItem::operationMode(QPointF pos) } QRectF rect = sceneBoundingRect(); int addtransitionOffset = 10; - // Don't allow add transition if track height is very small - if (rect.height() < 30) addtransitionOffset = 0; + // Don't allow add transition if track height is very small. No transitions for audio only clips + if (rect.height() < 30 || isAudioOnly() || m_clipType == AUDIO) addtransitionOffset = 0; 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; @@ -1031,7 +1068,8 @@ void ClipItem::resetFrameWidth(int width) QList ClipItem::snapMarkers() const { QList < GenTime > snaps; - QList < GenTime > markers = baseClip()->snapMarkers(); + if (!m_clip) return snaps; + QList < GenTime > markers = m_clip->snapMarkers(); GenTime pos; for (int i = 0; i < markers.size(); i++) { @@ -1047,7 +1085,8 @@ QList ClipItem::snapMarkers() const QList ClipItem::commentedSnapMarkers() const { QList < CommentedTime > snaps; - QList < CommentedTime > markers = baseClip()->commentedSnapMarkers(); + if (!m_clip) return snaps; + QList < CommentedTime > markers = m_clip->commentedSnapMarkers(); GenTime pos; for (int i = 0; i < markers.size(); i++) { @@ -1272,7 +1311,9 @@ QVariant ClipItem::itemChange(GraphicsItemChange change, const QVariant &value) int xpos = projectScene()->getSnapPointForPos((int) newPos.x(), KdenliveSettings::snaptopoints()); xpos = qMax(xpos, 0); newPos.setX(xpos); - int newTrack = newPos.y() / KdenliveSettings::trackheight(); + // Warning: newPos gives a position relative to the click event, so hack to get absolute pos + int yOffset = property("y_absolute").toInt() + newPos.y(); + int newTrack = yOffset / KdenliveSettings::trackheight(); newTrack = qMin(newTrack, projectScene()->tracksCount() - 1); newTrack = qMax(newTrack, 0); newPos.setY((int)(newTrack * KdenliveSettings::trackheight() + 1)); @@ -1359,19 +1400,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 +1431,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 +1466,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 +1476,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 +1499,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()); @@ -1601,8 +1662,8 @@ void ClipItem::setSpeed(const double speed, const int strobe) if (m_speed <= 0 && m_speed > -1) m_speed = -1.0; m_strobe = strobe; - if (m_speed == 1.0) m_clipName = baseClip()->name(); - else m_clipName = baseClip()->name() + " - " + QString::number(speed * 100, 'f', 0) + '%'; + if (m_speed == 1.0) m_clipName = m_clip->name(); + else m_clipName = m_clip->name() + " - " + QString::number(speed * 100, 'f', 0) + '%'; m_info.cropStart = GenTime((int)(m_speedIndependantInfo.cropStart.frames(m_fps) / qAbs(m_speed) + 0.5), m_fps); m_info.cropDuration = GenTime((int)(m_speedIndependantInfo.cropDuration.frames(m_fps) / qAbs(m_speed) + 0.5), m_fps); //update(); @@ -1629,6 +1690,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) { @@ -1638,11 +1713,17 @@ void ClipItem::dropEvent(QGraphicsSceneDragDropEvent * event) QDomDocument doc; doc.setContent(effects, true); QDomElement e = doc.documentElement(); - if (e.tagName() == "list") { + 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 @@ -1728,18 +1809,18 @@ void ClipItem::insertKeyframe(QDomElement effect, int pos, int val) newkfr.append(str); } else if (!added) { if (i == m_visibleParam) - newkfr.append(QString::number(pos) + ":" + QString::number(val)); + newkfr.append(QString::number(pos) + ':' + QString::number(val)); else - newkfr.append(QString::number(pos) + ":" + locale.toString(newval)); + newkfr.append(QString::number(pos) + ':' + locale.toString(newval)); if (kpos > pos) newkfr.append(str); added = true; } else newkfr.append(str); } if (!added) { if (i == m_visibleParam) - newkfr.append(QString::number(pos) + ":" + QString::number(val)); + newkfr.append(QString::number(pos) + ':' + QString::number(val)); else - newkfr.append(QString::number(pos) + ":" + e.attribute("default")); + newkfr.append(QString::number(pos) + ':' + e.attribute("default")); } e.setAttribute("keyframes", newkfr.join(";")); } @@ -1767,9 +1848,9 @@ void ClipItem::movedKeyframe(QDomElement effect, int oldpos, int newpos, double newpos = qMax(newpos, start); newpos = qMin(newpos, end); if (i == m_visibleParam) - newkfr.append(QString::number(newpos) + ":" + locale.toString(value)); + newkfr.append(QString::number(newpos) + ':' + locale.toString(value)); else - newkfr.append(QString::number(newpos) + ":" + str.section(':', 1, 1)); + newkfr.append(QString::number(newpos) + ':' + str.section(':', 1, 1)); } } e.setAttribute("keyframes", newkfr.join(";")); @@ -1806,7 +1887,7 @@ Mlt::Producer *ClipItem::getProducer(int track, bool trackSpecific) if (isAudioOnly()) return m_clip->audioProducer(track); else if (isVideoOnly()) - return m_clip->videoProducer(); + return m_clip->videoProducer(track); else return m_clip->getProducer(trackSpecific ? track : -1); } @@ -1825,9 +1906,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 +1943,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 +1960,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 +1975,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 +2045,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,20 +2061,19 @@ 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"); if (offset > 0) { QStringList kfrs = data.split(';'); data.clear(); - foreach (QString keyframe, kfrs) { + foreach (const QString &keyframe, kfrs) { if (keyframe.contains('=')) { int pos = keyframe.section('=', 0, 0).toInt(); pos += offset; - data.append(QString::number(pos) + "=" + keyframe.section('=', 1) + ";"); + data.append(QString::number(pos) + '=' + keyframe.section('=', 1) + ";"); } - else data.append(keyframe + ";"); + else data.append(keyframe + ';'); } } Mlt::Geometry geometry(data.toUtf8().data(), oldInfo.cropDuration.frames(m_fps), width, height); @@ -1994,5 +2086,17 @@ void ClipItem::slotGotThumbsCache() update(); } +void ClipItem::setMainSelectedClip(bool selected) +{ + if (selected == m_isMainSelectedClip) return; + m_isMainSelectedClip = selected; + update(); +} + +bool ClipItem::isMainSelectedClip() +{ + return m_isMainSelectedClip; +} + #include "clipitem.moc"