X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipitem.cpp;h=0492669dbb665ec4ff075a4a256cb6c3de4e3fce;hb=f6afc93100a3d635181e017cd9f49844580fd0e7;hp=befec3a43cfced6e57abf8523385c07d79567f0b;hpb=4f6ba75aba90feaeeb43f85df08e4e3aaf20a613;p=kdenlive diff --git a/src/clipitem.cpp b/src/clipitem.cpp index befec3a4..0492669d 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -83,17 +83,19 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, i if (m_clipType == VIDEO || m_clipType == AV || m_clipType == SLIDESHOW || m_clipType == PLAYLIST) { m_baseColor = QColor(141, 166, 215); - m_hasThumbs = true; - m_startThumbTimer.setSingleShot(true); - connect(&m_startThumbTimer, SIGNAL(timeout()), this, SLOT(slotGetStartThumb())); - m_endThumbTimer.setSingleShot(true); - connect(&m_endThumbTimer, SIGNAL(timeout()), this, SLOT(slotGetEndThumb())); + if (!m_clip->isPlaceHolder()) { + m_hasThumbs = true; + m_startThumbTimer.setSingleShot(true); + connect(&m_startThumbTimer, SIGNAL(timeout()), this, SLOT(slotGetStartThumb())); + m_endThumbTimer.setSingleShot(true); + connect(&m_endThumbTimer, SIGNAL(timeout()), this, SLOT(slotGetEndThumb())); - connect(this, SIGNAL(getThumb(int, int)), m_clip->thumbProducer(), SLOT(extractImage(int, int))); + connect(this, SIGNAL(getThumb(int, int)), m_clip->thumbProducer(), SLOT(extractImage(int, int))); - connect(m_clip->thumbProducer(), SIGNAL(thumbReady(int, QImage)), this, SLOT(slotThumbReady(int, QImage))); - connect(m_clip, SIGNAL(gotAudioData()), this, SLOT(slotGotAudioData())); - if (generateThumbs) QTimer::singleShot(200, this, SLOT(slotFetchThumbs())); + connect(m_clip->thumbProducer(), SIGNAL(thumbReady(int, QImage)), this, SLOT(slotThumbReady(int, QImage))); + connect(m_clip, SIGNAL(gotAudioData()), this, SLOT(slotGotAudioData())); + if (generateThumbs) QTimer::singleShot(200, this, SLOT(slotFetchThumbs())); + } } else if (m_clipType == COLOR) { QString colour = m_clip->getProperty("colour"); @@ -118,8 +120,8 @@ ClipItem::~ClipItem() blockSignals(true); if (scene()) scene()->removeItem(this); if (m_clipType == VIDEO || m_clipType == AV || m_clipType == SLIDESHOW || m_clipType == PLAYLIST) { - disconnect(m_clip->thumbProducer(), SIGNAL(thumbReady(int, QImage)), this, SLOT(slotThumbReady(int, QImage))); - disconnect(m_clip, SIGNAL(gotAudioData()), this, SLOT(slotGotAudioData())); + //disconnect(m_clip->thumbProducer(), SIGNAL(thumbReady(int, QImage)), this, SLOT(slotThumbReady(int, QImage))); + //disconnect(m_clip, SIGNAL(gotAudioData()), this, SLOT(slotGotAudioData())); } delete m_timeLine; } @@ -136,6 +138,7 @@ ClipItem *ClipItem::clone(ItemInfo info) const duplicate->setEffectList(m_effectList); duplicate->setVideoOnly(m_videoOnly); duplicate->setAudioOnly(m_audioOnly); + duplicate->setFades(fadeIn(), fadeOut()); //duplicate->setSpeed(m_speed); return duplicate; } @@ -144,7 +147,59 @@ void ClipItem::setEffectList(const EffectsList effectList) { m_effectList.clone(effectList); m_effectNames = m_effectList.effectNames().join(" / "); - if (!m_effectList.isEmpty()) setSelectedEffect(0); + if (!m_effectList.isEmpty()) { + for (int i = 0; i < m_effectList.count(); i++) { + QString effectId = m_effectList.item(i).attribute("id"); + // check if it is a fade effect + QDomNodeList params = m_effectList.item(i).elementsByTagName("parameter"); + int fade = 0; + for (int j = 0; j < params.count(); j++) { + QDomElement e = params.item(j).toElement(); + if (!e.isNull()) { + if (effectId == "fadein") { + 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") { + 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") { + 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") { + 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(); + } + } + } + } + if (fade > 0) m_startFade = fade; + else if (fade < 0) m_endFade = -fade; + } + setSelectedEffect(0); + } } const EffectsList ClipItem::effectList() const @@ -183,13 +238,13 @@ void ClipItem::initEffect(QDomElement effect, int diff) } } - if (!e.isNull() && e.attribute("type") == "keyframe") { + if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { 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); - //kDebug() << "///// EFFECT KEYFRAMES INITED: " << e.attribute("keyframes"); - break; + kDebug() << "///// EFFECT KEYFRAMES INITED: " << e.attribute("keyframes"); + //break; } } } @@ -312,11 +367,11 @@ bool ClipItem::checkKeyFrames() void ClipItem::setKeyframes(const int ix, const QString keyframes) { QDomElement effect = getEffectAt(ix); - if (effect.attribute("disabled") == "1") return; + 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") { + if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { e.setAttribute("keyframes", keyframes); if (ix == m_selectedEffect) { m_keyframes.clear(); @@ -324,6 +379,7 @@ void ClipItem::setKeyframes(const int ix, const QString keyframes) double min = e.attribute("min").toDouble(); m_keyframeFactor = 100.0 / (max - min); m_keyframeDefault = e.attribute("default").toDouble(); + m_selectedKeyframe = 0; // parse keyframes const QStringList keyframes = e.attribute("keyframes").split(';', QString::SkipEmptyParts); foreach(const QString &str, keyframes) { @@ -331,6 +387,8 @@ void ClipItem::setKeyframes(const int ix, const QString keyframes) double val = str.section(':', 1, 1).toDouble(); m_keyframes[pos] = val; } + 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; } @@ -346,15 +404,17 @@ void ClipItem::setSelectedEffect(const int ix) QDomElement effect = effectAt(m_selectedEffect); if (effect.isNull() == false) { QDomNodeList params = effect.elementsByTagName("parameter"); - if (effect.attribute("disabled") != "1") + 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") { + if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { m_keyframes.clear(); double max = e.attribute("max").toDouble(); double min = e.attribute("min").toDouble(); m_keyframeFactor = 100.0 / (max - min); m_keyframeDefault = e.attribute("default").toDouble(); + m_selectedKeyframe = 0; + // parse keyframes const QStringList keyframes = e.attribute("keyframes").split(';', QString::SkipEmptyParts); foreach(const QString &str, keyframes) { @@ -362,6 +422,7 @@ void ClipItem::setSelectedEffect(const int ix) double val = str.section(':', 1, 1).toDouble(); m_keyframes[pos] = val; } + if (m_keyframes.find(m_editedKeyframe) == m_keyframes.end()) m_editedKeyframe = -1; update(); return; } @@ -381,7 +442,7 @@ QString ClipItem::keyframes(const int index) for (int i = 0; i < params.count(); i++) { QDomElement e = params.item(i).toElement(); - if (!e.isNull() && e.attribute("type") == "keyframe") { + if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { result = e.attribute("keyframes"); break; } @@ -393,14 +454,14 @@ void ClipItem::updateKeyframeEffect() { // regenerate xml parameter from the clip keyframes QDomElement effect = getEffectAt(m_selectedEffect); - if (effect.attribute("disabled") == "1") return; + 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") { + if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { QString keyframes; - if (m_keyframes.count() > 1) { + 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()) + ';'); @@ -651,7 +712,6 @@ void ClipItem::paint(QPainter *painter, if (KdenliveSettings::videothumbnails() && !isAudioOnly()) { QPen pen = painter->pen(); pen.setColor(QColor(255, 255, 255, 150)); - const QRectF source(0.0, 0.0, (double) m_startPix.width(), (double) m_startPix.height()); painter->setPen(pen); if ((m_clipType == IMAGE || m_clipType == TEXT) && !m_startPix.isNull()) { const QPointF top = mapped.topRight() - QPointF(m_startPix.width() - 1, 0); @@ -691,7 +751,8 @@ void ClipItem::paint(QPainter *painter, } else mappedRect = mapped; double scale = painter->matrix().m11(); - int channels = baseClip()->getProperty("channels").toInt(); + int channels = 0; + if (isEnabled() && m_clip) channels = m_clip->getProperty("channels").toInt(); if (scale != m_framePixelWidth) m_audioThumbCachePic.clear(); double cropLeft = m_info.cropStart.frames(m_fps); @@ -756,38 +817,38 @@ void ClipItem::paint(QPainter *painter, // draw markers - QList < CommentedTime > markers = baseClip()->commentedSnapMarkers(); - QList < CommentedTime >::Iterator it = markers.begin(); - GenTime pos; - double framepos; - QBrush markerBrush(QColor(120, 120, 0, 140)); - QPen pen = painter->pen(); - pen.setColor(QColor(255, 255, 255, 200)); - pen.setStyle(Qt::DotLine); - - for (; it != markers.end(); ++it) { - pos = GenTime((int)((*it).time().frames(m_fps) / 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()); - QLineF l2 = painter->matrix().map(l); - //framepos = scale * pos.frames(m_fps); - //QLineF l(framepos, 5, framepos, itemHeight - 5); - painter->setPen(pen); - 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 r2 = painter->matrix().mapRect(r1); - const QRectF txtBounding3 = painter->boundingRect(r2, Qt::AlignLeft | Qt::AlignTop, ' ' + (*it).comment() + ' '); - painter->setBrush(markerBrush); - painter->setPen(Qt::NoPen); - painter->drawRoundedRect(txtBounding3, 3, 3); - painter->setBrush(QBrush(Qt::NoBrush)); - painter->setPen(Qt::white); - painter->drawText(txtBounding3, Qt::AlignCenter, (*it).comment()); + if (isEnabled() && m_clip) { + QList < CommentedTime > markers = m_clip->commentedSnapMarkers(); + QList < CommentedTime >::Iterator it = markers.begin(); + GenTime pos; + double framepos; + QBrush markerBrush(QColor(120, 120, 0, 140)); + QPen pen = painter->pen(); + pen.setColor(QColor(255, 255, 255, 200)); + pen.setStyle(Qt::DotLine); + + for (; it != markers.end(); ++it) { + pos = GenTime((int)((*it).time().frames(m_fps) / 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()); + QLineF l2 = painter->matrix().map(l); + painter->setPen(pen); + 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 r2 = painter->matrix().mapRect(r1); + const QRectF txtBounding3 = painter->boundingRect(r2, Qt::AlignLeft | Qt::AlignTop, ' ' + (*it).comment() + ' '); + painter->setBrush(markerBrush); + painter->setPen(Qt::NoPen); + painter->drawRoundedRect(txtBounding3, 3, 3); + painter->setBrush(QBrush(Qt::NoBrush)); + painter->setPen(Qt::white); + painter->drawText(txtBounding3, Qt::AlignCenter, (*it).comment()); + } + //painter->fillRect(QRect(br.x() + framepos, br.y(), 10, br.height()), QBrush(QColor(0, 0, 0, 150))); } - //painter->fillRect(QRect(br.x() + framepos, br.y(), 10, br.height()), QBrush(QColor(0, 0, 0, 150))); } } @@ -846,8 +907,11 @@ OPERATIONTYPE ClipItem::operationMode(QPointF pos) const double scale = projectScene()->scale().x(); double maximumOffset = 6 / scale; if (isSelected() || (parentItem() && parentItem()->isSelected())) { - m_editedKeyframe = mouseOverKeyFrames(pos, maximumOffset); - if (m_editedKeyframe != -1) return KEYFRAME; + int kf = mouseOverKeyFrames(pos, maximumOffset); + if (kf != -1) { + m_editedKeyframe = kf; + return KEYFRAME; + } } QRectF rect = sceneBoundingRect(); int addtransitionOffset = 10; @@ -856,16 +920,20 @@ OPERATIONTYPE ClipItem::operationMode(QPointF pos) 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)) { @@ -875,7 +943,12 @@ OPERATIONTYPE ClipItem::operationMode(QPointF pos) setToolTip(i18n("Add transition")); return TRANSITIONEND; } - setToolTip(QString()); + 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; } @@ -1031,6 +1104,12 @@ void ClipItem::setFadeOut(int pos) } +void ClipItem::setFades(int in, int out) +{ + m_startFade = in; + m_endFade = out; +} + /* //virtual void ClipItem::hoverEnterEvent(QGraphicsSceneHoverEvent *e) @@ -1111,7 +1190,7 @@ bool ClipItem::checkEffectsKeyframesPos(const int previous, const int current, b QDomNodeList params = effect.elementsByTagName("parameter"); for (int j = 0; j < params.count(); j++) { QDomElement e = params.item(i).toElement(); - if (e.attribute("type") == "keyframe") { + 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); QMap kfr; @@ -1150,6 +1229,10 @@ bool ClipItem::checkEffectsKeyframesPos(const int previous, const int current, b //virtual QVariant ClipItem::itemChange(GraphicsItemChange change, const QVariant &value) { + if (change == QGraphicsItem::ItemSelectedChange) { + if (value.toBool()) setZValue(10); + else setZValue(2); + } if (change == ItemPositionChange && scene()) { // calculate new position. //if (parentItem()) return pos(); @@ -1173,6 +1256,7 @@ QVariant ClipItem::itemChange(GraphicsItemChange change, const QVariant &value) int offset = 0; if (!items.isEmpty()) { for (int i = 0; i < items.count(); i++) { + if (!items.at(i)->isEnabled()) continue; if (items.at(i)->type() == type()) { // Collision! QPointF otherPos = items.at(i)->pos(); @@ -1196,6 +1280,7 @@ QVariant ClipItem::itemChange(GraphicsItemChange change, const QVariant &value) QList subitems = scene()->items(sceneShape, Qt::IntersectsItemShape); subitems.removeAll(this); for (int j = 0; j < subitems.count(); j++) { + if (!subitems.at(j)->isEnabled()) continue; if (subitems.at(j)->type() == type()) { // move was not successful, revert to previous pos m_info.startPos = GenTime((int) pos().x(), m_fps); @@ -1294,7 +1379,7 @@ EffectsParameterList ClipItem::addEffect(const QDomElement effect, bool /*animat parameters.addParam("tag", effect.attribute("tag")); parameters.addParam("kdenlive_ix", effect.attribute("kdenlive_ix")); if (effect.hasAttribute("src")) parameters.addParam("src", effect.attribute("src")); - if (effect.hasAttribute("disabled")) parameters.addParam("disabled", effect.attribute("disabled")); + if (effect.hasAttribute("disable")) parameters.addParam("disable", effect.attribute("disable")); QString effectId = effect.attribute("id"); @@ -1306,16 +1391,28 @@ EffectsParameterList ClipItem::addEffect(const QDomElement effect, bool /*animat for (int i = 0; i < params.count(); i++) { QDomElement e = params.item(i).toElement(); if (!e.isNull()) { - if (e.attribute("type") == "keyframe") { + if (e.attribute("type") == "simplekeyframe") { + QStringList values = e.attribute("keyframes").split(";", QString::SkipEmptyParts); + 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; + values[j] = pos + "=" + QString::number(val); + } + } + parameters.addParam(e.attribute("name"), values.join(";")); + /*parameters.addParam("max", e.attribute("max")); + parameters.addParam("min", e.attribute("min")); + parameters.addParam("factor", );*/ + } else if (e.attribute("type") == "keyframe") { 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")); - } - - if (e.attribute("factor", "1") == "1") { + } else if (e.attribute("factor", "1") == "1") { parameters.addParam(e.attribute("name"), e.attribute("value")); // check if it is a fade effect @@ -1395,13 +1492,28 @@ EffectsParameterList ClipItem::getEffectArgs(const QDomElement effect) 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("disabled")) parameters.addParam("disabled", effect.attribute("disabled")); + 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") == "keyframe") { + 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")); @@ -1585,5 +1697,76 @@ bool ClipItem::isVideoOnly() const return m_videoOnly; } +void ClipItem::insertKeyframe(QDomElement effect, int pos, int val) +{ + if (effect.attribute("disable") == "1") return; + effect.setAttribute("active_keyframe", pos); + m_editedKeyframe = pos; + 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 (!added) newkfr.append(QString::number(pos) + ":" + QString::number(val)); + e.setAttribute("keyframes", newkfr.join(";")); + } +} + +void ClipItem::movedKeyframe(QDomElement effect, int oldpos, int newpos, double value) +{ + if (effect.attribute("disable") == "1") return; + effect.setAttribute("active_keyframe", newpos); + QDomNodeList params = effect.elementsByTagName("parameter"); + int start = cropStart().frames(m_fps); + 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)); + } + } + e.setAttribute("keyframes", newkfr.join(";")); + } + + updateKeyframes(effect); + update(); +} +void ClipItem::updateKeyframes(QDomElement effect) +{ + m_keyframes.clear(); + // parse keyframes + QDomNodeList params = effect.elementsByTagName("parameter"); + QDomElement e = params.item(0).toElement(); + const QStringList keyframes = e.attribute("keyframes").split(';', QString::SkipEmptyParts); + foreach(const QString &str, keyframes) { + int pos = str.section(':', 0, 0).toInt(); + double val = str.section(':', 1, 1).toDouble(); + m_keyframes[pos] = val; + } + if (!m_keyframes.contains(m_selectedKeyframe)) m_selectedKeyframe = -1; +} #include "clipitem.moc"