X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipitem.cpp;h=cf9a67369ee8a7583478f34dbfda9c080fbeae5e;hb=08902b01f367c2545c6e453604f8ecbd2009b6bd;hp=463ffed5c91f964f692c9120ae3f88b3cb4250df;hpb=a52d45435503ccdbea7c22589d529c032da9ff53;p=kdenlive diff --git a/src/clipitem.cpp b/src/clipitem.cpp index 463ffed5..cf9a6736 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -61,17 +61,20 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, i setPos(info.startPos.frames(fps), (double)(info.track * KdenliveSettings::trackheight()) + 1); // set speed independant info + if (m_speed <= 0 && m_speed > -1) + m_speed = -1.0; m_speedIndependantInfo = m_info; - m_speedIndependantInfo.cropStart = GenTime((int)(m_info.cropStart.frames(m_fps) * m_speed), m_fps); - m_speedIndependantInfo.cropDuration = GenTime((int)(m_info.cropDuration.frames(m_fps) * m_speed), m_fps); + m_speedIndependantInfo.cropStart = GenTime((int)(m_info.cropStart.frames(m_fps) * qAbs(m_speed)), m_fps); + m_speedIndependantInfo.cropDuration = GenTime((int)(m_info.cropDuration.frames(m_fps) * qAbs(m_speed)), m_fps); m_videoPix = KIcon("kdenlive-show-video").pixmap(QSize(16, 16)); m_audioPix = KIcon("kdenlive-show-audio").pixmap(QSize(16, 16)); - if (m_speed == 1.0) m_clipName = m_clip->name(); - else { + if (m_speed == 1.0) + m_clipName = m_clip->name(); + else m_clipName = m_clip->name() + " - " + QString::number(m_speed * 100, 'f', 0) + '%'; - } + m_producer = m_clip->getId(); m_clipType = m_clip->clipType(); //m_cropStart = info.cropStart; @@ -195,8 +198,10 @@ void ClipItem::setEffectList(const EffectsList effectList) } } } - if (fade > 0) m_startFade = fade; - else if (fade < 0) m_endFade = -fade; + if (fade > 0) + m_startFade = fade; + else if (fade < 0) + m_endFade = -fade; } setSelectedEffect(0); } @@ -242,7 +247,7 @@ void ClipItem::initEffect(QDomElement effect, int diff) QString def = e.attribute("default"); // Effect has a keyframe type parameter, we need to set the values if (e.attribute("keyframes").isEmpty()) { - e.setAttribute("keyframes", QString::number(cropStart().frames(m_fps)) + ':' + def + ';' + QString::number((cropStart() + cropDuration()).frames(m_fps) - 1) + ':' + def); + e.setAttribute("keyframes", QString::number(cropStart().frames(m_fps)) + ':' + def); kDebug() << "///// EFFECT KEYFRAMES INITED: " << e.attribute("keyframes"); //break; } @@ -250,7 +255,7 @@ void ClipItem::initEffect(QDomElement effect, int diff) } if (effect.attribute("tag") == "volume" || effect.attribute("tag") == "brightness") { if (effect.attribute("id") == "fadeout" || effect.attribute("id") == "fade_to_black") { - int end = (cropDuration() + cropStart()).frames(m_fps); + int end = (cropDuration() + cropStart()).frames(m_fps) - 1; int start = end; if (effect.attribute("id") == "fadeout") { if (m_effectList.hasEffect(QString(), "fade_to_black") == -1) { @@ -308,9 +313,14 @@ void ClipItem::initEffect(QDomElement effect, int diff) bool ClipItem::checkKeyFrames() { bool clipEffectsModified = false; - for (int ix = 0; ix < m_effectList.count(); ix ++) { - QString kfr = keyframes(ix); - if (!kfr.isEmpty()) { + // go through all effects this clip has + for (int ix = 0; ix < m_effectList.count(); ++ix) { + QStringList keyframeParams = keyframes(ix); + QStringList newKeyFrameParams; + bool effModified = false; + + // go through all params which have keyframes + foreach(const QString &kfr, keyframeParams) { const QStringList keyframes = kfr.split(';', QString::SkipEmptyParts); QStringList newKeyFrames; bool cutKeyFrame = false; @@ -319,6 +329,8 @@ bool ClipItem::checkKeyFrames() double lastValue = -1; int start = cropStart().frames(m_fps); int end = (cropStart() + cropDuration()).frames(m_fps); + + // go through all keyframes for one param foreach(const QString &str, keyframes) { int pos = str.section(':', 0, 0).toInt(); double val = str.section(':', 1, 1).toDouble(); @@ -354,30 +366,38 @@ bool ClipItem::checkKeyFrames() lastPos = pos; lastValue = val; } - if (modified) { - // update KeyFrames - setKeyframes(ix, newKeyFrames.join(";")); - clipEffectsModified = true; - } + + newKeyFrameParams.append(newKeyFrames.join(";")); + if (modified) + effModified = true; + } + + if (effModified) { + // update KeyFrames + setKeyframes(ix, newKeyFrameParams); + clipEffectsModified = true; } } return clipEffectsModified; } -void ClipItem::setKeyframes(const int ix, const QString keyframes) +void ClipItem::setKeyframes(const int ix, const QStringList keyframes) { QDomElement effect = getEffectAt(ix); if (effect.attribute("disable") == "1") return; QDomNodeList params = effect.elementsByTagName("parameter"); + int keyframeParams = 0; for (int i = 0; i < params.count(); i++) { QDomElement e = params.item(i).toElement(); - if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { - e.setAttribute("keyframes", keyframes); - if (ix == m_selectedEffect) { + if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe") && e.attribute("intimeline") == "1") { + e.setAttribute("keyframes", keyframes.at(keyframeParams)); + if (ix == m_selectedEffect && keyframeParams == 0) { m_keyframes.clear(); + m_visibleParam = i; double max = e.attribute("max").toDouble(); double min = e.attribute("min").toDouble(); m_keyframeFactor = 100.0 / (max - min); + m_keyframeOffset = min; m_keyframeDefault = e.attribute("default").toDouble(); m_selectedKeyframe = 0; // parse keyframes @@ -390,9 +410,8 @@ void ClipItem::setKeyframes(const int ix, const QString keyframes) if (m_keyframes.find(m_editedKeyframe) == m_keyframes.end()) m_editedKeyframe = -1; if (m_keyframes.find(m_editedKeyframe) == m_keyframes.end()) m_editedKeyframe = -1; update(); - return; } - break; + ++keyframeParams; } } } @@ -407,11 +426,13 @@ void ClipItem::setSelectedEffect(const int ix) if (effect.attribute("disable") != "1") for (int i = 0; i < params.count(); i++) { QDomElement e = params.item(i).toElement(); - if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { + if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe") && e.attribute("intimeline") == "1") { m_keyframes.clear(); + m_visibleParam = i; double max = e.attribute("max").toDouble(); double min = e.attribute("min").toDouble(); m_keyframeFactor = 100.0 / (max - min); + m_keyframeOffset = min; m_keyframeDefault = e.attribute("default").toDouble(); m_selectedKeyframe = 0; @@ -434,18 +455,16 @@ void ClipItem::setSelectedEffect(const int ix) } } -QString ClipItem::keyframes(const int index) +QStringList ClipItem::keyframes(const int index) { - QString result; + QStringList result; QDomElement effect = effectAt(index); QDomNodeList params = effect.elementsByTagName("parameter"); for (int i = 0; i < params.count(); i++) { QDomElement e = params.item(i).toElement(); - if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { - result = e.attribute("keyframes"); - break; - } + if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) + result.append(e.attribute("keyframes")); } return result; } @@ -456,23 +475,19 @@ void ClipItem::updateKeyframeEffect() QDomElement effect = getEffectAt(m_selectedEffect); if (effect.attribute("disable") == "1") return; QDomNodeList params = effect.elementsByTagName("parameter"); - - for (int i = 0; i < params.count(); i++) { - QDomElement e = params.item(i).toElement(); - if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { - QString keyframes; - if (m_keyframes.count() > 0) { - QMap::const_iterator i = m_keyframes.constBegin(); - while (i != m_keyframes.constEnd()) { - keyframes.append(QString::number(i.key()) + ':' + QString::number(i.value()) + ';'); - ++i; - } + QDomElement e = params.item(m_visibleParam).toElement(); + + if (!e.isNull()) { + QString keyframes; + if (m_keyframes.count() > 0) { + QMap::const_iterator i = m_keyframes.constBegin(); + while (i != m_keyframes.constEnd()) { + keyframes.append(QString::number(i.key()) + ':' + QString::number(i.value()) + ';'); + ++i; } - // Effect has a keyframe type parameter, we need to set the values - //kDebug() << "::::::::::::::: SETTING EFFECT KEYFRAMES: " << keyframes; - e.setAttribute("keyframes", keyframes); - break; } + // Effect has a keyframe type parameter, we need to set the values + e.setAttribute("keyframes", keyframes); } } @@ -493,7 +508,7 @@ void ClipItem::resetThumbs(bool clearExistingThumbs) } -void ClipItem::refreshClip(bool checkDuration) +void ClipItem::refreshClip(bool checkDuration, bool forceResetThumbs) { if (checkDuration && (m_maxDuration != m_clip->maxDuration())) { m_maxDuration = m_clip->maxDuration(); @@ -503,11 +518,10 @@ void ClipItem::refreshClip(bool checkDuration) if (m_info.cropStart > m_maxDuration) { m_info.cropStart = GenTime(); m_info.cropDuration = qMin(m_info.cropDuration, m_maxDuration); - updateRectGeometry(); } else { m_info.cropDuration = m_maxDuration; - updateRectGeometry(); } + updateRectGeometry(); } } } @@ -515,7 +529,8 @@ void ClipItem::refreshClip(bool checkDuration) QString colour = m_clip->getProperty("colour"); colour = colour.replace(0, 2, "#"); m_baseColor = QColor(colour.left(7)); - } else resetThumbs(checkDuration); + update(); + } else resetThumbs(forceResetThumbs); } void ClipItem::slotFetchThumbs() @@ -644,6 +659,11 @@ DocClipBase *ClipItem::baseClip() const } QDomElement ClipItem::xml() const +{ + return itemXml(); +} + +QDomElement ClipItem::itemXml() const { QDomElement xml = m_clip->toXML(); if (m_speed != 1.0) xml.setAttribute("speed", m_speed); @@ -729,6 +749,12 @@ void ClipItem::paint(QPainter *painter, QLineF l2(mapped.left() + m_startPix.width(), mapped.top(), mapped.left() + m_startPix.width(), mapped.bottom()); painter->drawLine(l2); } + if (painter->matrix().m11() == FRAME_SIZE) { + int offset = (m_info.startPos - m_info.cropStart).frames(m_fps); + int left = qMax((int) m_info.startPos.frames(m_fps) + 1, (int) mapToScene(exposed.left(), 0).x()); + int right = qMin((int)(m_info.startPos + m_info.cropDuration).frames(m_fps) - 1, (int) mapToScene(exposed.right(), 0).x()); + doGetIntraThumbs(painter, mapped.topLeft(), m_info.cropStart.frames(m_fps), left - offset, right - offset); + } painter->setPen(Qt::black); } @@ -761,6 +787,7 @@ void ClipItem::paint(QPainter *painter, const int mappedEndPixel = painter->matrix().map(QPointF(endpixel + cropLeft, 0)).x() - clipStart; cropLeft = cropLeft * scale; + if (channels >= 1) { emit prepareAudioThumb(scale, mappedStartPixel, mappedEndPixel, channels); } @@ -828,7 +855,7 @@ void ClipItem::paint(QPainter *painter, pen.setStyle(Qt::DotLine); for (; it != markers.end(); ++it) { - pos = GenTime((int)((*it).time().frames(m_fps) / m_speed + 0.5), m_fps) - cropStart(); + pos = GenTime((int)((*it).time().frames(m_fps) / qAbs(m_speed) + 0.5), m_fps) - cropStart(); if (pos > GenTime()) { if (pos > cropDuration()) break; QLineF l(rect().x() + pos.frames(m_fps), rect().y(), rect().x() + pos.frames(m_fps), rect().bottom()); @@ -919,36 +946,19 @@ OPERATIONTYPE ClipItem::operationMode(QPointF pos) if (rect.height() < 30) addtransitionOffset = 0; if (qAbs((int)(pos.x() - (rect.x() + m_startFade))) < maximumOffset && qAbs((int)(pos.y() - rect.y())) < 6) { - if (m_startFade == 0) setToolTip(i18n("Add audio fade")); - // xgettext:no-c-format - else setToolTip(i18n("Audio fade duration: %1s", GenTime(m_startFade, m_fps).seconds())); return FADEIN; } else if (pos.x() - rect.x() < maximumOffset && (rect.bottom() - pos.y() > addtransitionOffset)) { - // xgettext:no-c-format - setToolTip(i18n("Crop from start: %1s", cropStart().seconds())); return RESIZESTART; } else if (qAbs((int)(pos.x() - (rect.x() + rect.width() - m_endFade))) < maximumOffset && qAbs((int)(pos.y() - rect.y())) < 6) { - if (m_endFade == 0) setToolTip(i18n("Add audio fade")); - // xgettext:no-c-format - else setToolTip(i18n("Audio fade duration: %1s", GenTime(m_endFade, m_fps).seconds())); return FADEOUT; } else if ((rect.right() - pos.x() < maximumOffset) && (rect.bottom() - pos.y() > addtransitionOffset)) { - // xgettext:no-c-format - setToolTip(i18n("Clip duration: %1s", cropDuration().seconds())); return RESIZEEND; } else if ((pos.x() - rect.x() < 16 / scale) && (rect.bottom() - pos.y() <= addtransitionOffset)) { - setToolTip(i18n("Add transition")); return TRANSITIONSTART; } else if ((rect.right() - pos.x() < 16 / scale) && (rect.bottom() - pos.y() <= addtransitionOffset)) { - setToolTip(i18n("Add transition")); return TRANSITIONEND; } - QString tooltip = "" + m_clipName + ""; - if (!baseClip()->fileURL().isEmpty()) - tooltip.append("
" + baseClip()->fileURL().path()); - if (!baseClip()->description().isEmpty()) - tooltip.append("
" + baseClip()->description()); - setToolTip(tooltip); + return MOVE; } @@ -959,8 +969,7 @@ QList ClipItem::snapMarkers() const GenTime pos; for (int i = 0; i < markers.size(); i++) { - - pos = GenTime((int)(markers.at(i).frames(m_fps) / m_speed + 0.5), m_fps) - cropStart(); + pos = GenTime((int)(markers.at(i).frames(m_fps) / qAbs(m_speed) + 0.5), m_fps) - cropStart(); if (pos > GenTime()) { if (pos > cropDuration()) break; else snaps.append(pos + startPos()); @@ -976,7 +985,7 @@ QList ClipItem::commentedSnapMarkers() const GenTime pos; for (int i = 0; i < markers.size(); i++) { - pos = GenTime((int)(markers.at(i).time().frames(m_fps) / m_speed + 0.5), m_fps) - cropStart(); + pos = GenTime((int)(markers.at(i).time().frames(m_fps) / qAbs(m_speed) + 0.5), m_fps) - cropStart(); if (pos > GenTime()) { if (pos > cropDuration()) break; else snaps.append(CommentedTime(pos + startPos(), markers.at(i).comment())); @@ -1140,28 +1149,23 @@ void ClipItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *) } */ -void ClipItem::resizeStart(int posx) +void ClipItem::resizeStart(int posx, bool /*size*/) { - const int min = (startPos() - cropStart()).frames(m_fps); - if (posx < min) { - if (clipType() == IMAGE || clipType() == COLOR || clipType() == TEXT) { - GenTime oldPos = startPos(); - moveBy(-1 * (oldPos - GenTime(posx, m_fps)).frames(m_fps), 0); - const int newPos = (endPos() + (oldPos - startPos())).frames(m_fps); - AbstractClipItem::resizeEnd(newPos); - } - posx = min; + bool sizeLimit = false; + if (clipType() != IMAGE && clipType() != COLOR && clipType() != TEXT) { + const int min = (startPos() - cropStart()).frames(m_fps); + if (posx < min) posx = min; + sizeLimit = true; } - - + if (posx == startPos().frames(m_fps)) return; const int previous = cropStart().frames(m_fps); - AbstractClipItem::resizeStart(posx); + AbstractClipItem::resizeStart(posx, sizeLimit); // set speed independant info m_speedIndependantInfo = m_info; - m_speedIndependantInfo.cropStart = GenTime((int)(m_info.cropStart.frames(m_fps) * m_speed), m_fps); - m_speedIndependantInfo.cropDuration = GenTime((int)(m_info.cropDuration.frames(m_fps) * m_speed), m_fps); + m_speedIndependantInfo.cropStart = GenTime((int)(m_info.cropStart.frames(m_fps) * qAbs(m_speed)), m_fps); + m_speedIndependantInfo.cropDuration = GenTime((int)(m_info.cropDuration.frames(m_fps) * qAbs(m_speed)), m_fps); if ((int) cropStart().frames(m_fps) != previous) { if (m_hasThumbs && KdenliveSettings::videothumbnails()) { @@ -1181,8 +1185,8 @@ void ClipItem::resizeEnd(int posx) // set speed independant info m_speedIndependantInfo = m_info; - m_speedIndependantInfo.cropStart = GenTime((int)(m_info.cropStart.frames(m_fps) * m_speed), m_fps); - m_speedIndependantInfo.cropDuration = GenTime((int)(m_info.cropDuration.frames(m_fps) * m_speed), m_fps); + m_speedIndependantInfo.cropStart = GenTime((int)(m_info.cropStart.frames(m_fps) * qAbs(m_speed)), m_fps); + m_speedIndependantInfo.cropDuration = GenTime((int)(m_info.cropDuration.frames(m_fps) * qAbs(m_speed)), m_fps); if ((int) cropDuration().frames(m_fps) != previous) { if (m_hasThumbs && KdenliveSettings::videothumbnails()) { @@ -1194,12 +1198,13 @@ void ClipItem::resizeEnd(int posx) bool ClipItem::checkEffectsKeyframesPos(const int previous, const int current, bool fromStart) { - bool modified = false; + bool effModified = false; for (int i = 0; i < m_effectList.count(); i++) { QDomElement effect = m_effectList.at(i); QDomNodeList params = effect.elementsByTagName("parameter"); for (int j = 0; j < params.count(); j++) { - QDomElement e = params.item(i).toElement(); + bool modified = false; + QDomElement e = params.item(j).toElement(); if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { // parse keyframes and adjust values const QStringList keyframes = e.attribute("keyframes").split(';', QString::SkipEmptyParts); @@ -1210,16 +1215,19 @@ bool ClipItem::checkEffectsKeyframesPos(const int previous, const int current, b pos = str.section(':', 0, 0).toInt(); val = str.section(':', 1, 1).toDouble(); if (pos == previous) { + // first or last keyframe kfr[current] = val; modified = true; } else { if ((fromStart && pos >= current) || (!fromStart && pos <= current)) { + // only keyframes in range kfr[pos] = val; modified = true; } } } if (modified) { + effModified = true; QString newkfr; QMap::const_iterator k = kfr.constBegin(); while (k != kfr.constEnd()) { @@ -1227,13 +1235,12 @@ bool ClipItem::checkEffectsKeyframesPos(const int previous, const int current, b ++k; } e.setAttribute("keyframes", newkfr); - break; } } } } - if (modified && m_selectedEffect >= 0) setSelectedEffect(m_selectedEffect); - return modified; + if (effModified && m_selectedEffect >= 0) setSelectedEffect(m_selectedEffect); + return effModified; } //virtual @@ -1391,11 +1398,16 @@ EffectsParameterList ClipItem::addEffect(const QDomElement effect, bool /*animat if (effect.hasAttribute("src")) parameters.addParam("src", effect.attribute("src")); if (effect.hasAttribute("disable")) parameters.addParam("disable", effect.attribute("disable")); - QString effectId = effect.attribute("id"); if (effectId.isEmpty()) effectId = effect.attribute("tag"); parameters.addParam("id", effectId); + // special case: the affine effect needs in / out points + if (effectId == "pan_zoom") { + parameters.addParam("in", QString::number(cropStart().frames(m_fps))); + parameters.addParam("out", QString::number((cropStart() + cropDuration()).frames(m_fps))); + } + QDomNodeList params = effect.elementsByTagName("parameter"); int fade = 0; for (int i = 0; i < params.count(); i++) { @@ -1406,8 +1418,8 @@ EffectsParameterList ClipItem::addEffect(const QDomElement effect, bool /*animat double factor = e.attribute("factor", "1").toDouble(); if (factor != 1) { for (int j = 0; j < values.count(); j++) { - QString pos = values.at(j).section(":", 0, 0); - double val = values.at(j).section(":", 1, 1).toDouble() / factor; + QString pos = values.at(j).section(':', 0, 0); + double val = values.at(j).section(':', 1, 1).toDouble() / factor; values[j] = pos + "=" + QString::number(val); } } @@ -1495,70 +1507,6 @@ EffectsParameterList ClipItem::addEffect(const QDomElement effect, bool /*animat return parameters; } -EffectsParameterList ClipItem::getEffectArgs(const QDomElement effect) -{ - EffectsParameterList parameters; - parameters.addParam("tag", effect.attribute("tag")); - parameters.addParam("kdenlive_ix", effect.attribute("kdenlive_ix")); - parameters.addParam("id", effect.attribute("id")); - if (effect.hasAttribute("src")) parameters.addParam("src", effect.attribute("src")); - if (effect.hasAttribute("disable")) parameters.addParam("disable", effect.attribute("disable")); - - QDomNodeList params = effect.elementsByTagName("parameter"); - for (int i = 0; i < params.count(); i++) { - QDomElement e = params.item(i).toElement(); - //kDebug() << "/ / / /SENDING EFFECT PARAM: " << e.attribute("type") << ", NAME_ " << e.attribute("tag"); - if (e.attribute("type") == "simplekeyframe") { - - QStringList values = e.attribute("keyframes").split(";", QString::SkipEmptyParts); - double factor = e.attribute("factor", "1").toDouble(); - for (int j = 0; j < values.count(); j++) { - QString pos = values.at(j).section(":", 0, 0); - double val = values.at(j).section(":", 1, 1).toDouble() / factor; - values[j] = pos + "=" + QString::number(val); - } - // kDebug() << "/ / / /SENDING KEYFR:" << values; - parameters.addParam(e.attribute("name"), values.join(";")); - /*parameters.addParam(e.attribute("name"), e.attribute("keyframes").replace(":", "=")); - parameters.addParam("max", e.attribute("max")); - parameters.addParam("min", e.attribute("min")); - parameters.addParam("factor", e.attribute("factor", "1"));*/ - } else if (e.attribute("type") == "keyframe") { - kDebug() << "/ / / /SENDING KEYFR EFFECT TYPE"; - parameters.addParam("keyframes", e.attribute("keyframes")); - parameters.addParam("max", e.attribute("max")); - parameters.addParam("min", e.attribute("min")); - parameters.addParam("factor", e.attribute("factor", "1")); - parameters.addParam("starttag", e.attribute("starttag", "start")); - parameters.addParam("endtag", e.attribute("endtag", "end")); - } else if (e.attribute("namedesc").contains(';')) { - QString format = e.attribute("format"); - QStringList separators = format.split("%d", QString::SkipEmptyParts); - QStringList values = e.attribute("value").split(QRegExp("[,:;x]")); - QString neu; - QTextStream txtNeu(&neu); - if (values.size() > 0) - txtNeu << (int)values[0].toDouble(); - for (int i = 0; i < separators.size() && i + 1 < values.size(); i++) { - txtNeu << separators[i]; - txtNeu << (int)(values[i+1].toDouble()); - } - parameters.addParam("start", neu); - } else { - if (e.attribute("factor", "1") != "1") { - double fact; - if (e.attribute("factor").startsWith('%')) { - fact = ProfilesDialog::getStringEval(projectScene()->profile(), e.attribute("factor")); - } else fact = e.attribute("factor", "1").toDouble(); - parameters.addParam(e.attribute("name"), QString::number(e.attribute("value").toDouble() / fact)); - } else { - parameters.addParam(e.attribute("name"), e.attribute("value")); - } - } - } - return parameters; -} - void ClipItem::deleteEffect(QString index) { bool needRepaint = false; @@ -1613,17 +1561,19 @@ int ClipItem::strobe() const void ClipItem::setSpeed(const double speed, const int strobe) { m_speed = speed; + 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) + '%'; - m_info.cropStart = GenTime((int)(m_speedIndependantInfo.cropStart.frames(m_fps) / m_speed + 0.5), m_fps); - m_info.cropDuration = GenTime((int)(m_speedIndependantInfo.cropDuration.frames(m_fps) / m_speed + 0.5), m_fps); + 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(); } GenTime ClipItem::maxDuration() const { - return GenTime((int)(m_maxDuration.frames(m_fps) / m_speed + 0.5), m_fps); + return GenTime((int)(m_maxDuration.frames(m_fps) / qAbs(m_speed) + 0.5), m_fps); } GenTime ClipItem::speedIndependantCropStart() const @@ -1645,7 +1595,7 @@ const ItemInfo ClipItem::speedIndependantInfo() const //virtual void ClipItem::dropEvent(QGraphicsSceneDragDropEvent * event) { - const QString effects = QString(event->mimeData()->data("kdenlive/effectslist")); + const QString effects = QString::fromUtf8(event->mimeData()->data("kdenlive/effectslist")); QDomDocument doc; doc.setContent(effects, true); const QDomElement e = doc.documentElement(); @@ -1715,24 +1665,33 @@ void ClipItem::insertKeyframe(QDomElement effect, int pos, int val) QDomNodeList params = effect.elementsByTagName("parameter"); for (int i = 0; i < params.count(); i++) { QDomElement e = params.item(i).toElement(); - QString kfr = e.attribute("keyframes"); - const QStringList keyframes = kfr.split(';', QString::SkipEmptyParts); - QStringList newkfr; - bool added = false; - foreach(const QString &str, keyframes) { - int kpos = str.section(':', 0, 0).toInt(); - double newval = str.section(':', 1, 1).toDouble(); - if (kpos < pos) { - newkfr.append(str); - } else if (!added) { - if (i == 0) newkfr.append(QString::number(pos) + ":" + QString::number(val)); - else newkfr.append(QString::number(pos) + ":" + QString::number(newval)); - if (kpos > pos) newkfr.append(str); - added = true; - } else newkfr.append(str); + if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { + QString kfr = e.attribute("keyframes"); + const QStringList keyframes = kfr.split(';', QString::SkipEmptyParts); + QStringList newkfr; + bool added = false; + foreach(const QString &str, keyframes) { + int kpos = str.section(':', 0, 0).toInt(); + double newval = str.section(':', 1, 1).toDouble(); + if (kpos < pos) { + newkfr.append(str); + } else if (!added) { + if (i == m_visibleParam) + newkfr.append(QString::number(pos) + ":" + QString::number(val)); + else + newkfr.append(QString::number(pos) + ":" + QString::number(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)); + else + newkfr.append(QString::number(pos) + ":" + e.attribute("default")); + } + e.setAttribute("keyframes", newkfr.join(";")); } - if (!added) newkfr.append(QString::number(pos) + ":" + QString::number(val)); - e.setAttribute("keyframes", newkfr.join(";")); } } @@ -1745,20 +1704,24 @@ void ClipItem::movedKeyframe(QDomElement effect, int oldpos, int newpos, double int end = (cropStart() + cropDuration()).frames(m_fps) - 1; for (int i = 0; i < params.count(); i++) { QDomElement e = params.item(i).toElement(); - QString kfr = e.attribute("keyframes"); - const QStringList keyframes = kfr.split(';', QString::SkipEmptyParts); - QStringList newkfr; - foreach(const QString &str, keyframes) { - if (str.section(':', 0, 0).toInt() != oldpos) { - newkfr.append(str); - } else if (newpos != -1) { - newpos = qMax(newpos, start); - newpos = qMin(newpos, end); - if (i == 0) newkfr.append(QString::number(newpos) + ":" + QString::number(value)); - else newkfr.append(QString::number(newpos) + ":" + str.section(':', 1, 1)); + if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { + QString kfr = e.attribute("keyframes"); + const QStringList keyframes = kfr.split(';', QString::SkipEmptyParts); + QStringList newkfr; + foreach(const QString &str, keyframes) { + if (str.section(':', 0, 0).toInt() != oldpos) { + newkfr.append(str); + } else if (newpos != -1) { + newpos = qMax(newpos, start); + newpos = qMin(newpos, end); + if (i == m_visibleParam) + newkfr.append(QString::number(newpos) + ":" + QString::number(value)); + else + newkfr.append(QString::number(newpos) + ":" + str.section(':', 1, 1)); + } } + e.setAttribute("keyframes", newkfr.join(";")); } - e.setAttribute("keyframes", newkfr.join(";")); } updateKeyframes(effect); @@ -1770,7 +1733,11 @@ void ClipItem::updateKeyframes(QDomElement effect) m_keyframes.clear(); // parse keyframes QDomNodeList params = effect.elementsByTagName("parameter"); - QDomElement e = params.item(0).toElement(); + QDomElement e = params.item(m_visibleParam).toElement(); + if (e.attribute("intimeline") != "1") { + setSelectedEffect(m_selectedEffect); + return; + } const QStringList keyframes = e.attribute("keyframes").split(';', QString::SkipEmptyParts); foreach(const QString &str, keyframes) { int pos = str.section(':', 0, 0).toInt(); @@ -1779,4 +1746,111 @@ void ClipItem::updateKeyframes(QDomElement effect) } if (!m_keyframes.contains(m_selectedKeyframe)) m_selectedKeyframe = -1; } + +void ClipItem::doGetIntraThumbs(QPainter *painter, const QPointF startPos, int offset, int start, int end) +{ + if (!m_clip->thumbProducer() || clipType() == COLOR) return; + if (scene() && scene()->views().isEmpty()) return; + CustomTrackView *view = (CustomTrackView *) scene()->views()[0]; + if (view == NULL) return; + const int theight = KdenliveSettings::trackheight(); + const int twidth = FRAME_SIZE; + + if (clipType() == IMAGE || clipType() == TEXT) { + for (int i = start; i <= end; i++) + painter->drawPixmap(startPos + QPointF(twidth *(i - offset), 0), m_startPix); + } + QPixmap p; + for (int i = start; i <= end; i++) { + if (!view->m_pixmapCache->find(m_clip->fileURL().path() + "%" + QString::number(i), p)) { + p = m_clip->thumbProducer()->extractImage(i, twidth, theight); + view->m_pixmapCache->insert(m_clip->fileURL().path() + "%" + QString::number(i), p); + } + painter->drawPixmap(startPos + QPointF(twidth *(i - offset), 0), p); + } +} + +QList ClipItem::updatePanZoom(int width, int height, int cut) +{ + QList effectPositions; + for (int i = 0; i < m_effectList.count(); i++) { + QDomElement effect = m_effectList.at(i); + QDomNodeList params = effect.elementsByTagName("parameter"); + for (int j = 0; j < params.count(); j++) { + QDomElement e = params.item(j).toElement(); + if (e.isNull()) + continue; + if (e.attribute("type") == "geometry" && !e.hasAttribute("fixed")) { + effectPositions << i; + + int in = cropStart().frames(fps()); + int out = in + cropDuration().frames(fps()); + int dur = out - in - 1; + + effect.setAttribute("in", in); + effect.setAttribute("out", out); + + Mlt::Geometry geometry(e.attribute("value").toUtf8().data(), dur, width, height); + Mlt::GeometryItem item; + bool endFrameAdded = false; + if (cut == 0) { + while (!geometry.next_key(&item, dur)) { + if (!endFrameAdded) { + // add keyframe at the end with interpolated value + + // but only once ;) + endFrameAdded = true; + + Mlt::GeometryItem endItem; + Mlt::GeometryItem interp; + geometry.fetch(&interp, dur - 1); + endItem.frame(dur - 1); + endItem.x(interp.x()); + endItem.y(interp.y()); + endItem.w(interp.w()); + endItem.h(interp.h()); + endItem.mix(interp.mix()); + geometry.insert(&endItem); + } + geometry.remove(item.frame()); + } + } else { + Mlt::Geometry origGeometry(e.attribute("value").toUtf8().data(), dur, width, height); + // remove keyframes before cut point + while (!geometry.prev_key(&item, cut - 1) && item.frame() < cut) + geometry.remove(item.frame()); + + // add a keyframe at new pos 0 + origGeometry.fetch(&item, cut); + item.frame(0); + geometry.insert(&item); + + // move exisiting keyframes by -cut + while (!origGeometry.next_key(&item, cut)) { + geometry.remove(item.frame()); + origGeometry.remove(item.frame()); + item.frame(item.frame() - cut); + geometry.insert(&item); + } + + } + + e.setAttribute("value", geometry.serialise()); + } + } + } + + return effectPositions; +} + +Mlt::Producer *ClipItem::getProducer(int track, bool trackSpecific) +{ + if (isAudioOnly()) + return m_clip->audioProducer(track); + else if (isVideoOnly()) + return m_clip->videoProducer(); + else + return m_clip->producer(trackSpecific ? track : -1); +} + #include "clipitem.moc"