X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipitem.cpp;h=f3a3babab39b555d59972190935b49174155802a;hb=cb6ec003e060b425cf0d3abd5a46fd93d0c8671c;hp=d16f1ad8b81fd730f22f05e40505050cc16f5013;hpb=7ac1f7b70439ce38c29fb6ff02439f24cb040ccc;p=kdenlive diff --git a/src/clipitem.cpp b/src/clipitem.cpp index d16f1ad8..f3a3baba 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -59,56 +59,59 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, i setZValue(2); setRect(0, 0, (info.endPos - info.startPos).frames(fps) - 0.02, (double)(KdenliveSettings::trackheight() - 2)); 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) * 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 = clip->name(); + if (m_speed == 1.0) m_clipName = m_clip->name(); else { - m_clipName = clip->name() + " - " + QString::number(m_speed * 100, 'f', 0) + '%'; - m_cropDuration = m_cropDuration * m_speed; + m_clipName = m_clip->name() + " - " + QString::number(m_speed * 100, 'f', 0) + '%'; } - m_producer = clip->getId(); - m_clipType = clip->clipType(); - m_cropStart = info.cropStart; - m_maxDuration = clip->maxDuration(); + m_producer = m_clip->getId(); + m_clipType = m_clip->clipType(); + //m_cropStart = info.cropStart; + m_maxDuration = m_clip->maxDuration(); setAcceptDrops(true); - m_audioThumbReady = clip->audioThumbCreated(); + m_audioThumbReady = m_clip->audioThumbCreated(); //setAcceptsHoverEvents(true); connect(this , SIGNAL(prepareAudioThumb(double, int, int, int)) , this, SLOT(slotPrepareAudioThumb(double, int, int, int))); 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())); - - connect(this, SIGNAL(getThumb(int, int)), clip->thumbProducer(), SLOT(extractImage(int, int))); - //connect(this, SIGNAL(getThumb(int, int)), clip->thumbProducer(), SLOT(getVideoThumbs(int, int))); - - connect(clip->thumbProducer(), SIGNAL(thumbReady(int, QPixmap)), this, SLOT(slotThumbReady(int, QPixmap))); - connect(clip, SIGNAL(gotAudioData()), this, SLOT(slotGotAudioData())); - if (generateThumbs) QTimer::singleShot(200, this, SLOT(slotFetchThumbs())); - - /*if (m_clip->producer()) { - videoThumbProducer.init(this, m_clip->producer(), KdenliveSettings::trackheight() * KdenliveSettings::project_display_ratio(), KdenliveSettings::trackheight()); - slotFetchThumbs(); - }*/ + 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(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 = clip->getProperty("colour"); + QString colour = m_clip->getProperty("colour"); colour = colour.replace(0, 2, "#"); m_baseColor = QColor(colour.left(7)); } else if (m_clipType == IMAGE || m_clipType == TEXT) { m_baseColor = QColor(141, 166, 215); if (m_clipType == TEXT) { - connect(this, SIGNAL(getThumb(int, int)), clip->thumbProducer(), SLOT(extractImage(int, int))); - connect(clip->thumbProducer(), SIGNAL(thumbReady(int, QPixmap)), this, SLOT(slotThumbReady(int, QPixmap))); + 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))); } //m_startPix = KThumb::getImage(KUrl(clip->getProperty("resource")), (int)(KdenliveSettings::trackheight() * KdenliveSettings::project_display_ratio()), KdenliveSettings::trackheight()); } else if (m_clipType == AUDIO) { m_baseColor = QColor(141, 215, 166); - connect(clip, SIGNAL(gotAudioData()), this, SLOT(slotGotAudioData())); + connect(m_clip, SIGNAL(gotAudioData()), this, SLOT(slotGotAudioData())); } } @@ -116,9 +119,10 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, i 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, QPixmap)), this, SLOT(slotThumbReady(int, QPixmap))); - 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; } @@ -127,14 +131,15 @@ ClipItem *ClipItem::clone(ItemInfo info) const { ClipItem *duplicate = new ClipItem(m_clip, info, m_fps, m_speed, m_strobe); if (m_clipType == IMAGE || m_clipType == TEXT) duplicate->slotSetStartThumb(m_startPix); - else { - if (info.cropStart == m_cropStart) duplicate->slotSetStartThumb(m_startPix); - if (info.cropStart + (info.endPos - info.startPos) == m_cropStart + m_cropDuration) duplicate->slotSetEndThumb(m_endPix); + else if (m_clipType != COLOR) { + if (info.cropStart == m_info.cropStart) duplicate->slotSetStartThumb(m_startPix); + if (info.cropStart + (info.endPos - info.startPos) == m_info.cropStart + (m_info.endPos - m_info.startPos)) duplicate->slotSetEndThumb(m_endPix); } //kDebug() << "// CLoning clip: " << (info.cropStart + (info.endPos - info.startPos)).frames(m_fps) << ", CURRENT end: " << (cropStart() + duration()).frames(m_fps); duplicate->setEffectList(m_effectList); duplicate->setVideoOnly(m_videoOnly); duplicate->setAudioOnly(m_audioOnly); + duplicate->setFades(fadeIn(), fadeOut()); //duplicate->setSpeed(m_speed); return duplicate; } @@ -143,7 +148,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 @@ -156,13 +213,18 @@ int ClipItem::selectedEffectIndex() const return m_selectedEffect; } -void ClipItem::initEffect(QDomElement effect) +void ClipItem::initEffect(QDomElement effect, int diff) { // the kdenlive_ix int is used to identify an effect in mlt's playlist, should // not be changed if (effect.attribute("kdenlive_ix").toInt() == 0) effect.setAttribute("kdenlive_ix", QString::number(effectsCounter())); - // init keyframes if required + + if (effect.attribute("id") == "freeze" && diff > 0) { + EffectsList::setParameter(effect, "frame", QString::number(diff)); + } + + // Init parameter value & keyframes if required QDomNodeList params = effect.elementsByTagName("parameter"); for (int i = 0; i < params.count(); i++) { QDomElement e = params.item(i).toElement(); @@ -177,13 +239,13 @@ void ClipItem::initEffect(QDomElement effect) } } - 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; } } } @@ -247,17 +309,24 @@ void ClipItem::initEffect(QDomElement effect) 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; bool modified = false; int lastPos = -1; double lastValue = -1; - int start = m_cropStart.frames(m_fps); - int end = (m_cropStart + m_cropDuration).frames(m_fps); + 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(); @@ -293,31 +362,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("disabled") == "1") return; + 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.setAttribute("keyframes", keyframes); - if (ix == m_selectedEffect) { + if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { + e.setAttribute("keyframes", keyframes.at(keyframeParams)); + if (ix == m_selectedEffect && keyframeParams == 0) { 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) { @@ -325,10 +401,11 @@ 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; } - break; + ++keyframeParams; } } } @@ -340,15 +417,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) { @@ -356,6 +435,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; } @@ -367,18 +447,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") { - result = e.attribute("keyframes"); - break; - } + if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) + result.append(e.attribute("keyframes")); } return result; } @@ -387,14 +465,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()) + ';'); @@ -431,16 +509,15 @@ void ClipItem::refreshClip(bool checkDuration) if (checkDuration && (m_maxDuration != m_clip->maxDuration())) { m_maxDuration = m_clip->maxDuration(); if (m_clipType != IMAGE && m_clipType != TEXT && m_clipType != COLOR) { - if (m_maxDuration != GenTime() && m_cropStart + m_cropDuration > m_maxDuration) { + if (m_maxDuration != GenTime() && m_info.cropStart + m_info.cropDuration > m_maxDuration) { // Clip duration changed, make sure to stay in correct range - if (m_cropStart > m_maxDuration) { - m_cropStart = GenTime(); - m_cropDuration = qMin(m_cropDuration, m_maxDuration); - updateRectGeometry(); + if (m_info.cropStart > m_maxDuration) { + m_info.cropStart = GenTime(); + m_info.cropDuration = qMin(m_info.cropDuration, m_maxDuration); } else { - m_cropDuration = m_maxDuration; - updateRectGeometry(); + m_info.cropDuration = m_maxDuration; } + updateRectGeometry(); } } } @@ -453,6 +530,7 @@ void ClipItem::refreshClip(bool checkDuration) void ClipItem::slotFetchThumbs() { + if (scene() == NULL || m_clipType == AUDIO || m_clipType == COLOR) return; if (m_clipType == IMAGE) { if (m_startPix.isNull()) { m_startPix = KThumb::getImage(KUrl(m_clip->getProperty("resource")), (int)(KdenliveSettings::trackheight() * KdenliveSettings::project_display_ratio()), KdenliveSettings::trackheight()); @@ -469,7 +547,7 @@ void ClipItem::slotFetchThumbs() if (m_endPix.isNull() && m_startPix.isNull()) { m_startThumbRequested = true; m_endThumbRequested = true; - emit getThumb((int)cropStart().frames(m_fps), (int)(cropStart() + cropDuration()).frames(m_fps) - 1); + emit getThumb((int)m_speedIndependantInfo.cropStart.frames(m_fps), (int)(m_speedIndependantInfo.cropStart + m_speedIndependantInfo.cropDuration).frames(m_fps) - 1); } else { if (m_endPix.isNull()) { slotGetEndThumb(); @@ -478,35 +556,18 @@ void ClipItem::slotFetchThumbs() slotGetStartThumb(); } } - /* - if (m_hasThumbs) { - if (m_endPix.isNull() && m_startPix.isNull()) { - int frame1 = (int)m_cropStart.frames(m_fps); - int frame2 = (int)(m_cropStart + m_cropDuration).frames(m_fps) - 1; - //videoThumbProducer.setThumbFrames(m_clip->producer(), frame1, frame2); - //videoThumbProducer.start(QThread::LowestPriority); - } else { - if (m_endPix.isNull()) slotGetEndThumb(); - else slotGetStartThumb(); - } - - } else if (m_startPix.isNull()) slotGetStartThumb();*/ } void ClipItem::slotGetStartThumb() { m_startThumbRequested = true; - emit getThumb((int)cropStart().frames(m_fps), -1); - //videoThumbProducer.setThumbFrames(m_clip->producer(), (int)m_cropStart.frames(m_fps), - 1); - //videoThumbProducer.start(QThread::LowestPriority); + emit getThumb((int)m_speedIndependantInfo.cropStart.frames(m_fps), -1); } void ClipItem::slotGetEndThumb() { m_endThumbRequested = true; - emit getThumb(-1, (int)(cropStart() + cropDuration()).frames(m_fps) - 1); - //videoThumbProducer.setThumbFrames(m_clip->producer(), -1, (int)(m_cropStart + m_cropDuration).frames(m_fps) - 1); - //videoThumbProducer.start(QThread::LowestPriority); + emit getThumb(-1, (int)(m_speedIndependantInfo.cropStart + m_speedIndependantInfo.cropDuration).frames(m_fps) - 1); } @@ -532,19 +593,23 @@ void ClipItem::slotSetEndThumb(QImage img) } } -void ClipItem::slotThumbReady(int frame, QPixmap pix) +void ClipItem::slotThumbReady(int frame, QImage img) { if (scene() == NULL) return; QRectF r = boundingRect(); + QPixmap pix = QPixmap::fromImage(img); double width = pix.width() / projectScene()->scale().x(); - if (m_startThumbRequested && frame == cropStart().frames(m_fps)) { + if (m_startThumbRequested && frame == m_speedIndependantInfo.cropStart.frames(m_fps)) { m_startPix = pix; m_startThumbRequested = false; update(r.left(), r.top(), width, pix.height()); - } else if (m_endThumbRequested && frame == (cropStart() + cropDuration()).frames(m_fps) - 1) { + if (m_clipType == IMAGE || m_clipType == TEXT) { + update(r.right() - width, r.top(), width, pix.height()); + } + } else if (m_endThumbRequested && frame == (m_speedIndependantInfo.cropStart + m_speedIndependantInfo.cropDuration).frames(m_fps) - 1) { m_endPix = pix; m_endThumbRequested = false; - update(r.right() - width, r.y(), width, pix.height()); + update(r.right() - width, r.top(), width, pix.height()); } } @@ -589,6 +654,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); @@ -630,7 +700,7 @@ void ClipItem::flashClip() //m_timeLine->start(); } -void ClipItem::animate(qreal value) +void ClipItem::animate(qreal /*value*/) { QRectF r = boundingRect(); r.setHeight(20); @@ -657,7 +727,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); @@ -675,6 +744,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); } @@ -697,15 +772,17 @@ 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_cropStart.frames(m_fps); + double cropLeft = m_info.cropStart.frames(m_fps); const int clipStart = mappedRect.x(); const int mappedStartPixel = painter->matrix().map(QPointF(startpixel + cropLeft, 0)).x() - clipStart; const int mappedEndPixel = painter->matrix().map(QPointF(endpixel + cropLeft, 0)).x() - clipStart; cropLeft = cropLeft * scale; + if (channels >= 1) { emit prepareAudioThumb(scale, mappedStartPixel, mappedEndPixel, channels); } @@ -762,37 +839,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); - painter->setPen(pen); - for (; it != markers.end(); ++it) { - pos = (*it).time() / m_speed - 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->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) / 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()); + 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))); } } @@ -851,8 +929,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; @@ -861,16 +942,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)) { @@ -880,7 +965,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; } @@ -891,7 +981,7 @@ QList ClipItem::snapMarkers() const GenTime pos; for (int i = 0; i < markers.size(); i++) { - pos = markers.at(i) / m_speed - 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()); @@ -907,7 +997,7 @@ QList ClipItem::commentedSnapMarkers() const GenTime pos; for (int i = 0; i < markers.size(); i++) { - pos = markers.at(i).time() / m_speed - 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())); @@ -1017,7 +1107,7 @@ void ClipItem::setFadeIn(int pos) if (pos == m_startFade) return; int oldIn = m_startFade; if (pos < 0) pos = 0; - if (pos > m_cropDuration.frames(m_fps)) pos = (int)(m_cropDuration.frames(m_fps)); + if (pos > cropDuration().frames(m_fps)) pos = (int)(cropDuration().frames(m_fps)); m_startFade = pos; QRectF rect = boundingRect(); update(rect.x(), rect.y(), qMax(oldIn, pos), rect.height()); @@ -1028,13 +1118,19 @@ void ClipItem::setFadeOut(int pos) if (pos == m_endFade) return; int oldOut = m_endFade; if (pos < 0) pos = 0; - if (pos > m_cropDuration.frames(m_fps)) pos = (int)(m_cropDuration.frames(m_fps)); + if (pos > cropDuration().frames(m_fps)) pos = (int)(cropDuration().frames(m_fps)); m_endFade = pos; QRectF rect = boundingRect(); update(rect.x() + rect.width() - qMax(oldOut, pos), rect.y(), qMax(oldOut, pos), rect.height()); } +void ClipItem::setFades(int in, int out) +{ + m_startFade = in; + m_endFade = out; +} + /* //virtual void ClipItem::hoverEnterEvent(QGraphicsSceneHoverEvent *e) @@ -1065,33 +1161,47 @@ void ClipItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *) } */ -void ClipItem::resizeStart(int posx, double /*speed*/) +void ClipItem::resizeStart(int posx, bool /*size*/) { - const int min = (startPos() - cropStart()).frames(m_fps); - if (posx < min) 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, m_speed); + AbstractClipItem::resizeStart(posx, sizeLimit); + + // set speed independant info + m_speedIndependantInfo = m_info; + 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()) { - /*connect(m_clip->thumbProducer(), SIGNAL(thumbReady(int, QPixmap)), this, SLOT(slotThumbReady(int, QPixmap)));*/ m_startThumbTimer.start(150); } } } -void ClipItem::resizeEnd(int posx, double /*speed*/) +void ClipItem::resizeEnd(int posx) { const int max = (startPos() - cropStart() + maxDuration()).frames(m_fps); if (posx > max && maxDuration() != GenTime()) posx = max; if (posx == endPos().frames(m_fps)) return; //kDebug() << "// NEW POS: " << posx << ", OLD END: " << endPos().frames(m_fps); - const int previous = (int)(cropStart() + cropDuration()).frames(m_fps) - 1; - AbstractClipItem::resizeEnd(posx, m_speed); - const int current = (int)(cropStart() + cropDuration()).frames(m_fps) - 1; - if (current != previous) { + const int previous = cropDuration().frames(m_fps); + AbstractClipItem::resizeEnd(posx); + + // set speed independant info + m_speedIndependantInfo = m_info; + 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()) { - /*connect(m_clip->thumbProducer(), SIGNAL(thumbReady(int, QPixmap)), this, SLOT(slotThumbReady(int, QPixmap)));*/ m_endThumbTimer.start(150); } } @@ -1100,13 +1210,14 @@ void ClipItem::resizeEnd(int posx, double /*speed*/) 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(); - if (e.attribute("type") == "keyframe") { + 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); QMap kfr; @@ -1116,16 +1227,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()) { @@ -1133,18 +1247,21 @@ 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 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(); @@ -1160,12 +1277,15 @@ QVariant ClipItem::itemChange(GraphicsItemChange change, const QVariant &value) // Only one clip is moving QRectF sceneShape = rect(); sceneShape.translate(newPos); - QList items = scene()->items(sceneShape, Qt::IntersectsItemShape); + QList items; + if (projectScene()->editMode() == NORMALEDIT) + items = scene()->items(sceneShape, Qt::IntersectsItemShape); items.removeAll(this); bool forwardMove = newPos.x() > pos().x(); 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(); @@ -1189,21 +1309,24 @@ 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()) { - m_startPos = GenTime((int) pos().x(), m_fps); + // move was not successful, revert to previous pos + m_info.startPos = GenTime((int) pos().x(), m_fps); return pos(); } } } - m_track = newTrack; - m_startPos = GenTime((int) newPos.x(), m_fps); + m_info.track = newTrack; + m_info.startPos = GenTime((int) newPos.x(), m_fps); + return newPos; } } } - m_track = newTrack; - m_startPos = GenTime((int) newPos.x(), m_fps); + m_info.track = newTrack; + m_info.startPos = GenTime((int) newPos.x(), m_fps); //kDebug()<<"// ITEM NEW POS: "< (m_effectList.count() - 1)) { + if (ix < 0 || ix > (m_effectList.count() - 1) || effect.isNull()) { kDebug() << "Invalid effect index: " << ix; return; } @@ -1266,7 +1389,7 @@ void ClipItem::setEffectAt(int ix, QDomElement effect) } } -EffectsParameterList ClipItem::addEffect(const QDomElement effect, bool animate) +EffectsParameterList ClipItem::addEffect(const QDomElement effect, bool /*animate*/) { bool needRepaint = false; int ix; @@ -1285,28 +1408,51 @@ EffectsParameterList ClipItem::addEffect(const QDomElement effect, bool animate) 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"); if (effectId.isEmpty()) effectId = effect.attribute("tag"); parameters.addParam("id", effectId); + // special case: the affine effect need in / out points + if (effectId == "pan_zoom") { + int start = cropStart().frames(m_fps); + int end = (cropStart() + cropDuration()).frames(m_fps); + if (start < 0) { + end -= start; + start = 0; + } + parameters.addParam("in", QString::number(start)); + parameters.addParam("out", QString::number(end)); + } + QDomNodeList params = effect.elementsByTagName("parameter"); int fade = 0; 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 @@ -1383,16 +1529,34 @@ EffectsParameterList ClipItem::getEffectArgs(const QDomElement effect) { EffectsParameterList parameters; parameters.addParam("tag", effect.attribute("tag")); + if (effect.hasAttribute("region")) parameters.addParam("region", effect.attribute("region")); 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")); + if (effect.hasAttribute("in")) parameters.addParam("in", effect.attribute("in")); + if (effect.hasAttribute("out")) parameters.addParam("out", effect.attribute("out")); 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")); @@ -1482,30 +1646,35 @@ 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) / 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 m_maxDuration / m_speed; + return GenTime((int)(m_maxDuration.frames(m_fps) / qAbs(m_speed) + 0.5), m_fps); } -GenTime ClipItem::cropStart() const +GenTime ClipItem::speedIndependantCropStart() const { - return m_cropStart / m_speed; + return m_speedIndependantInfo.cropStart; } -GenTime ClipItem::cropDuration() const +GenTime ClipItem::speedIndependantCropDuration() const { - return m_cropDuration / m_speed; + return m_speedIndependantInfo.cropDuration; } -GenTime ClipItem::endPos() const + +const ItemInfo ClipItem::speedIndependantInfo() const { - return m_startPos + cropDuration(); + return m_speedIndependantInfo; } //virtual @@ -1518,7 +1687,7 @@ void ClipItem::dropEvent(QGraphicsSceneDragDropEvent * event) if (scene() && !scene()->views().isEmpty()) { event->accept(); CustomTrackView *view = (CustomTrackView *) scene()->views()[0]; - if (view) view->slotAddEffect(e, m_startPos, track()); + if (view) view->slotAddEffect(e, m_info.startPos, track()); } } @@ -1552,7 +1721,14 @@ void ClipItem::setAudioOnly(bool force) { m_audioOnly = force; if (m_audioOnly) m_baseColor = QColor(141, 215, 166); - else m_baseColor = QColor(141, 166, 215); + else { + if (m_clipType == COLOR) { + QString colour = m_clip->getProperty("colour"); + colour = colour.replace(0, 2, "#"); + m_baseColor = QColor(colour.left(7)); + } else if (m_clipType == AUDIO) m_baseColor = QColor(141, 215, 166); + else m_baseColor = QColor(141, 166, 215); + } m_audioThumbCachePic.clear(); } @@ -1566,5 +1742,101 @@ 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; +} + +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->pixmapCache->find(m_clip->fileURL().path() + "%" + QString::number(i), p)) { + p = m_clip->thumbProducer()->extractImage(i, twidth, theight); + view->pixmapCache->insert(m_clip->fileURL().path() + "%" + QString::number(i), p); + } + painter->drawPixmap(startPos + QPointF(twidth *(i - offset), 0), p); + } +} + #include "clipitem.moc"