X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipitem.cpp;h=b663a6ed08eecf7220025facc679d4d8a5d235c0;hb=1d7da2457cc52f8686ac0654b7fedb9a5bb21a8b;hp=f366ab6304b81e54bf2bfb84413aaec33b29d0ab;hpb=62b517a3d5fc09dd9288261f9155dfd61a19d72c;p=kdenlive diff --git a/src/clipitem.cpp b/src/clipitem.cpp index f366ab63..b663a6ed 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -27,7 +27,7 @@ #include "kdenlivesettings.h" #include "kthumb.h" #include "profilesdialog.h" -#ifdef QJSON +#ifdef USE_QJSON #include "rotoscoping/rotowidget.h" #endif @@ -40,7 +40,9 @@ #include #include -ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, int strobe, bool generateThumbs) : +static int FRAME_SIZE; + +ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, int strobe, int frame_width, bool generateThumbs) : AbstractClipItem(info, QRectF(), fps), m_clip(clip), m_startFade(0), @@ -57,9 +59,12 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, i //m_hover(false), m_speed(speed), m_strobe(strobe), - m_framePixelWidth(0) + m_framePixelWidth(0), + m_limitedKeyFrames(false) { setZValue(2); + m_effectList = EffectsList(true); + FRAME_SIZE = frame_width; setRect(0, 0, (info.endPos - info.startPos).frames(fps) - 0.02, (double) itemHeight()); setPos(info.startPos.frames(fps), (double)(info.track * KdenliveSettings::trackheight()) + 1 + itemOffset()); @@ -95,9 +100,6 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, i 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())); @@ -110,7 +112,6 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, i } else if (m_clipType == IMAGE || m_clipType == TEXT) { m_baseColor = QColor(141, 166, 215); if (m_clipType == TEXT) { - 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()); @@ -124,6 +125,8 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, i ClipItem::~ClipItem() { blockSignals(true); + m_endThumbTimer.stop(); + m_startThumbTimer.stop(); 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))); @@ -134,11 +137,13 @@ ClipItem::~ClipItem() ClipItem *ClipItem::clone(ItemInfo info) const { - ClipItem *duplicate = new ClipItem(m_clip, info, m_fps, m_speed, m_strobe); + ClipItem *duplicate = new ClipItem(m_clip, info, m_fps, m_speed, m_strobe, FRAME_SIZE); if (m_clipType == IMAGE || m_clipType == TEXT) duplicate->slotSetStartThumb(m_startPix); 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); + if (info.cropStart + (info.endPos - info.startPos) == m_info.cropStart + m_info.cropDuration) { + 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); @@ -155,9 +160,10 @@ void ClipItem::setEffectList(const EffectsList effectList) m_effectNames = m_effectList.effectNames().join(" / "); if (!m_effectList.isEmpty()) { for (int i = 0; i < m_effectList.count(); i++) { - QString effectId = m_effectList.item(i).attribute("id"); + QDomElement effect = m_effectList.at(i); + QString effectId = effect.attribute("id"); // check if it is a fade effect - QDomNodeList params = m_effectList.item(i).elementsByTagName("parameter"); + QDomNodeList params = effect.elementsByTagName("parameter"); int fade = 0; for (int j = 0; j < params.count(); j++) { QDomElement e = params.item(j).toElement(); @@ -220,12 +226,10 @@ int ClipItem::selectedEffectIndex() const return m_selectedEffect; } -void ClipItem::initEffect(QDomElement effect, int diff) +void ClipItem::initEffect(QDomElement effect, int diff, int offset) { // the kdenlive_ix int is used to identify an effect in mlt's playlist, should // not be changed - if (effect.attribute("kdenlive_ix").toInt() == 0) - effect.setAttribute("kdenlive_ix", QString::number(effectsCounter())); if (effect.attribute("id") == "freeze" && diff > 0) { EffectsList::setParameter(effect, "frame", QString::number(diff)); @@ -240,7 +244,7 @@ void ClipItem::initEffect(QDomElement effect, int diff) continue; // Check if this effect has a variable parameter - if (e.attribute("default").startsWith('%')) { + if (e.attribute("default").contains('%')) { double evaluatedValue = ProfilesDialog::getStringEval(projectScene()->profile(), e.attribute("default")); e.setAttribute("default", evaluatedValue); if (e.hasAttribute("value") && e.attribute("value").startsWith('%')) { @@ -254,9 +258,16 @@ void ClipItem::initEffect(QDomElement effect, int diff) e.setAttribute("value", "1"); } - if ((e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe") && e.attribute("keyframes").isEmpty()) { - // Effect has a keyframe type parameter, we need to set the values - e.setAttribute("keyframes", QString::number(cropStart().frames(m_fps)) + ':' + e.attribute("default")); + if (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe") { + if (e.attribute("keyframes").isEmpty()) { + // Effect has a keyframe type parameter, we need to set the values + e.setAttribute("keyframes", QString::number(cropStart().frames(m_fps)) + ':' + e.attribute("default")); + } + else if (offset != 0) { + // adjust keyframes to this clip + QString adjusted = adjustKeyframes(e.attribute("keyframes"), offset - cropStart().frames(m_fps)); + e.setAttribute("keyframes", adjusted); + } } } if (effect.attribute("tag") == "volume" || effect.attribute("tag") == "brightness") { @@ -316,9 +327,23 @@ void ClipItem::initEffect(QDomElement effect, int diff) } } +const QString ClipItem::adjustKeyframes(QString keyframes, int offset) +{ + QStringList result; + // Simple keyframes + const QStringList list = keyframes.split(';', QString::SkipEmptyParts); + foreach(const QString &keyframe, list) { + int pos = keyframe.section(':', 0, 0).toInt() - offset; + QString newKey = QString::number(pos) + ":" + keyframe.section(':', 1); + result.append(newKey); + } + return result.join(";"); +} + bool ClipItem::checkKeyFrames() { bool clipEffectsModified = false; + QLocale locale; // go through all effects this clip has for (int ix = 0; ix < m_effectList.count(); ++ix) { QStringList keyframeParams = keyframes(ix); @@ -339,7 +364,7 @@ bool ClipItem::checkKeyFrames() // 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(); + double val = locale.toDouble(str.section(':', 1, 1)); if (pos - start < 0) { // a keyframe is defined before the start of the clip cutKeyFrame = true; @@ -349,7 +374,7 @@ bool ClipItem::checkKeyFrames() int diff = pos - lastPos; double ratio = (double)(start - lastPos) / diff; double newValue = lastValue + (val - lastValue) * ratio; - newKeyFrames.append(QString::number(start) + ':' + QString::number(newValue)); + newKeyFrames.append(QString::number(start) + ':' + locale.toString(newValue)); modified = true; } cutKeyFrame = false; @@ -361,12 +386,12 @@ bool ClipItem::checkKeyFrames() if (diff != 0) { double ratio = (double)(end - lastPos) / diff; double newValue = lastValue + (val - lastValue) * ratio; - newKeyFrames.append(QString::number(end) + ':' + QString::number(newValue)); + newKeyFrames.append(QString::number(end) + ':' + locale.toString(newValue)); modified = true; } break; } else { - newKeyFrames.append(QString::number(pos) + ':' + QString::number(val)); + newKeyFrames.append(QString::number(pos) + ':' + locale.toString(val)); } } lastPos = pos; @@ -389,8 +414,9 @@ bool ClipItem::checkKeyFrames() void ClipItem::setKeyframes(const int ix, const QStringList keyframes) { - QDomElement effect = getEffectAt(ix); + QDomElement effect = m_effectList.at(ix); if (effect.attribute("disable") == "1") return; + QLocale locale; QDomNodeList params = effect.elementsByTagName("parameter"); int keyframeParams = 0; for (int i = 0; i < params.count(); i++) { @@ -400,17 +426,17 @@ void ClipItem::setKeyframes(const int ix, const QStringList keyframes) if (ix == m_selectedEffect && keyframeParams == 0) { m_keyframes.clear(); m_visibleParam = i; - double max = e.attribute("max").toDouble(); - double min = e.attribute("min").toDouble(); + double max = locale.toDouble(e.attribute("max")); + double min = locale.toDouble(e.attribute("min")); m_keyframeFactor = 100.0 / (max - min); m_keyframeOffset = min; - m_keyframeDefault = e.attribute("default").toDouble(); + m_keyframeDefault = locale.toDouble(e.attribute("default")); m_selectedKeyframe = 0; // parse keyframes 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(); + double val = locale.toDouble(str.section(':', 1, 1)); m_keyframes[pos] = val; } if (m_keyframes.find(m_editedKeyframe) == m_keyframes.end()) m_editedKeyframe = -1; @@ -426,26 +452,28 @@ void ClipItem::setKeyframes(const int ix, const QStringList keyframes) void ClipItem::setSelectedEffect(const int ix) { m_selectedEffect = ix; - QDomElement effect = effectAt(m_selectedEffect); + QLocale locale; + QDomElement effect = effectAtIndex(m_selectedEffect); if (!effect.isNull() && effect.attribute("disable") != "1") { QDomNodeList params = effect.elementsByTagName("parameter"); for (int i = 0; i < params.count(); i++) { QDomElement e = params.item(i).toElement(); if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe") && e.attribute("intimeline") == "1") { m_keyframes.clear(); + m_limitedKeyFrames = e.attribute("type") == "keyframe"; m_visibleParam = i; - double max = e.attribute("max").toDouble(); - double min = e.attribute("min").toDouble(); + double max = locale.toDouble(e.attribute("max")); + double min = locale.toDouble(e.attribute("min")); m_keyframeFactor = 100.0 / (max - min); m_keyframeOffset = min; - m_keyframeDefault = e.attribute("default").toDouble(); + m_keyframeDefault = locale.toDouble(e.attribute("default")); m_selectedKeyframe = 0; // parse keyframes 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(); + double val = locale.toDouble(str.section(':', 1, 1)); m_keyframes[pos] = val; } if (m_keyframes.find(m_editedKeyframe) == m_keyframes.end()) @@ -465,7 +493,7 @@ void ClipItem::setSelectedEffect(const int ix) QStringList ClipItem::keyframes(const int index) { QStringList result; - QDomElement effect = effectAt(index); + QDomElement effect = m_effectList.at(index); QDomNodeList params = effect.elementsByTagName("parameter"); for (int i = 0; i < params.count(); i++) { @@ -479,7 +507,7 @@ QStringList ClipItem::keyframes(const int index) void ClipItem::updateKeyframeEffect() { // regenerate xml parameter from the clip keyframes - QDomElement effect = getEffectAt(m_selectedEffect); + QDomElement effect = getEffectAtIndex(m_selectedEffect); if (effect.attribute("disable") == "1") return; QDomNodeList params = effect.elementsByTagName("parameter"); QDomElement e = params.item(m_visibleParam).toElement(); @@ -501,7 +529,7 @@ void ClipItem::updateKeyframeEffect() QDomElement ClipItem::selectedEffect() { if (m_selectedEffect == -1 || m_effectList.isEmpty()) return QDomElement(); - return effectAt(m_selectedEffect); + return effectAtIndex(m_selectedEffect); } void ClipItem::resetThumbs(bool clearExistingThumbs) @@ -556,30 +584,37 @@ void ClipItem::slotFetchThumbs() return; } - if (m_endPix.isNull() && m_startPix.isNull()) { + QList frames; + if (m_startPix.isNull()) { m_startThumbRequested = true; + frames.append((int)m_speedIndependantInfo.cropStart.frames(m_fps)); + } + + if (m_endPix.isNull()) { m_endThumbRequested = true; - 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(); - } - if (m_startPix.isNull()) { - slotGetStartThumb(); - } + frames.append((int)(m_speedIndependantInfo.cropStart + m_speedIndependantInfo.cropDuration).frames(m_fps) - 1); } + + if (!frames.isEmpty()) m_clip->slotExtractImage(frames); +} + +void ClipItem::stopThumbs() +{ + // Clip is about to be deleted, make sure we don't request thumbnails + disconnect(&m_startThumbTimer, SIGNAL(timeout()), this, SLOT(slotGetStartThumb())); + disconnect(&m_endThumbTimer, SIGNAL(timeout()), this, SLOT(slotGetEndThumb())); } void ClipItem::slotGetStartThumb() { m_startThumbRequested = true; - emit getThumb((int)m_speedIndependantInfo.cropStart.frames(m_fps), -1); + m_clip->slotExtractImage(QList() << (int)m_speedIndependantInfo.cropStart.frames(m_fps)); } void ClipItem::slotGetEndThumb() { m_endThumbRequested = true; - emit getThumb(-1, (int)(m_speedIndependantInfo.cropStart + m_speedIndependantInfo.cropDuration).frames(m_fps) - 1); + m_clip->slotExtractImage(QList() << (int)(m_speedIndependantInfo.cropStart + m_speedIndependantInfo.cropDuration).frames(m_fps) - 1); } @@ -725,16 +760,23 @@ void ClipItem::paint(QPainter *painter, QWidget *) { QColor paintColor; + QPen framePen; if (parentItem()) paintColor = QColor(255, 248, 149); else paintColor = m_baseColor; - if (isSelected() || (parentItem() && parentItem()->isSelected())) paintColor = paintColor.darker(); + if (isSelected() || (parentItem() && parentItem()->isSelected())) { + paintColor = paintColor.darker(); + framePen.setColor(Qt::red); + framePen.setWidthF(2.0); + } + else { + framePen.setColor(paintColor.darker()); + } - painter->setMatrixEnabled(false); - const QRectF mapped = painter->matrix().mapRect(rect()).adjusted(0.5, 0, 0.5, 0); const QRectF exposed = option->exposedRect; - painter->setClipRect(mapped); - painter->fillRect(mapped, paintColor); - + painter->setClipRect(exposed); + painter->fillRect(exposed, paintColor); + painter->setWorldMatrixEnabled(false);; + const QRectF mapped = painter->worldTransform().mapRect(rect()); // draw thumbnails if (KdenliveSettings::videothumbnails() && !isAudioOnly()) { QPen pen = painter->pen(); @@ -756,11 +798,42 @@ 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) { + + // if we are in full zoom, paint thumbnail for every frame + if (m_clip->thumbProducer() && clipType() != COLOR && clipType() != AUDIO && !m_audioOnly && painter->worldTransform().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); + int left = qMax((int) m_info.cropStart.frames(m_fps) + 1, (int) mapToScene(exposed.left(), 0).x() - offset); + int right = qMin((int)(m_info.cropStart + m_info.cropDuration).frames(m_fps) - 1, (int) mapToScene(exposed.right(), 0).x() - offset); + QPointF startPos = mapped.topLeft(); + int startOffset = m_info.cropStart.frames(m_fps); + if (clipType() == IMAGE || clipType() == TEXT) { + for (int i = left; i <= right; i++) { + painter->drawPixmap(startPos + QPointF(FRAME_SIZE *(i - startOffset), 0), m_startPix); + } + } + else { +#if KDE_IS_VERSION(4,5,0) + if (m_clip && m_clip->thumbProducer()) { + QString path = m_clip->fileURL().path() + "_"; + QImage img; + QPen pen(Qt::white); + pen.setStyle(Qt::DotLine); + painter->setPen(pen); + QList missing; + for (int i = left; i <= right; i++) { + img = m_clip->thumbProducer()->findCachedThumb(path + QString::number(i)); + QPointF xpos = startPos + QPointF(FRAME_SIZE *(i - startOffset), 0); + if (img.isNull()) missing << i; + else painter->drawImage(xpos, img); + painter->drawLine(xpos, xpos + QPointF(0, mapped.height())); + } + if (!missing.isEmpty()) { + m_clip->thumbProducer()->queryIntraThumbs(missing); + connect(m_clip->thumbProducer(), SIGNAL(thumbsCached()), this, SLOT(slotGotThumbsCache())); + } + } +#endif + } } painter->setPen(Qt::black); } @@ -783,18 +856,17 @@ void ClipItem::paint(QPainter *painter, mappedRect.setTop(mappedRect.bottom() - mapped.height() / 2); } else mappedRect = mapped; - double scale = painter->matrix().m11(); + double scale = painter->worldTransform().m11(); 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); 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; + const int mappedStartPixel = painter->worldTransform().map(QPointF(startpixel + cropLeft, 0)).x() - clipStart; + const int mappedEndPixel = painter->worldTransform().map(QPointF(endpixel + cropLeft, 0)).x() - clipStart; cropLeft = cropLeft * scale; - if (channels >= 1) { emit prepareAudioThumb(scale, mappedStartPixel, mappedEndPixel, channels); } @@ -805,133 +877,129 @@ void ClipItem::paint(QPainter *painter, } } - // Draw effects names - if (!m_effectNames.isEmpty() && mapped.width() > 40) { - QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignLeft | Qt::AlignTop, m_effectNames); - QColor bgColor; - if (m_timeLine && m_timeLine->state() == QTimeLine::Running) { - qreal value = m_timeLine->currentValue(); - txtBounding.setWidth(txtBounding.width() * value); - bgColor.setRgb(50 + 200 *(1.0 - value), 50, 50, 100 + 50 * value); - } else bgColor.setRgb(50, 50, 90, 180); - - QPainterPath rounded; - rounded.moveTo(txtBounding.bottomRight()); - rounded.arcTo(txtBounding.right() - txtBounding.height() - 2, txtBounding.top() - txtBounding.height(), txtBounding.height() * 2, txtBounding.height() * 2, 270, 90); - rounded.lineTo(txtBounding.topLeft()); - rounded.lineTo(txtBounding.bottomLeft()); - painter->fillPath(rounded, bgColor); - painter->setPen(Qt::lightGray); - painter->drawText(txtBounding.adjusted(1, 0, 1, 0), Qt::AlignCenter, m_effectNames); - } - - // Draw clip name - QColor frameColor(paintColor.darker()); - if (isSelected() || (parentItem() && parentItem()->isSelected())) { - frameColor = QColor(Qt::red); - } - frameColor.setAlpha(160); - - const QRectF txtBounding2 = painter->boundingRect(mapped, Qt::AlignHCenter | Qt::AlignVCenter, ' ' + m_clipName + ' '); - //painter->fillRect(txtBounding2, frameColor); - painter->setBrush(frameColor); - painter->setPen(Qt::NoPen); - painter->drawRoundedRect(txtBounding2, 3, 3); - painter->setBrush(QBrush(Qt::NoBrush)); - - //painter->setPen(QColor(0, 0, 0, 180)); - //painter->drawText(txtBounding, Qt::AlignCenter, m_clipName); - if (m_videoOnly) { - painter->drawPixmap(txtBounding2.topLeft() - QPointF(17, -1), m_videoPix); - } else if (m_audioOnly) { - painter->drawPixmap(txtBounding2.topLeft() - QPointF(17, -1), m_audioPix); - } - painter->setPen(Qt::white); - painter->drawText(txtBounding2, Qt::AlignCenter, m_clipName); + // only paint details if clip is big enough + if (mapped.width() > 20) { + + // Draw effects names + if (!m_effectNames.isEmpty() && mapped.width() > 40) { + QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignLeft | Qt::AlignTop, m_effectNames); + QColor bgColor; + if (m_timeLine && m_timeLine->state() == QTimeLine::Running) { + qreal value = m_timeLine->currentValue(); + txtBounding.setWidth(txtBounding.width() * value); + bgColor.setRgb(50 + 200 *(1.0 - value), 50, 50, 100 + 50 * value); + } else bgColor.setRgb(50, 50, 90, 180); + + QPainterPath rounded; + rounded.moveTo(txtBounding.bottomRight()); + rounded.arcTo(txtBounding.right() - txtBounding.height() - 2, txtBounding.top() - txtBounding.height(), txtBounding.height() * 2, txtBounding.height() * 2, 270, 90); + rounded.lineTo(txtBounding.topLeft()); + rounded.lineTo(txtBounding.bottomLeft()); + painter->fillPath(rounded, bgColor); + painter->setPen(Qt::lightGray); + painter->drawText(txtBounding.adjusted(1, 0, 1, 0), Qt::AlignCenter, m_effectNames); + } + const QRectF txtBounding2 = painter->boundingRect(mapped, Qt::AlignHCenter | Qt::AlignVCenter, ' ' + m_clipName + ' '); + painter->setBrush(framePen.color()); + painter->setPen(Qt::NoPen); + painter->drawRoundedRect(txtBounding2, 3, 3); + painter->setBrush(QBrush(Qt::NoBrush)); - // draw markers - 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()); + if (m_videoOnly) { + painter->drawPixmap(txtBounding2.topLeft() - QPointF(17, -1), m_videoPix); + } else if (m_audioOnly) { + painter->drawPixmap(txtBounding2.topLeft() - QPointF(17, -1), m_audioPix); + } + painter->setPen(Qt::white); + painter->drawText(txtBounding2, Qt::AlignCenter, m_clipName); + + + // draw markers + 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->worldTransform().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->worldTransform().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))); } } - } - // draw start / end fades - QBrush fades; - if (isSelected()) { - fades = QBrush(QColor(200, 50, 50, 150)); - } else fades = QBrush(QColor(200, 200, 200, 200)); - - if (m_startFade != 0) { - QPainterPath fadeInPath; - fadeInPath.moveTo(0, 0); - fadeInPath.lineTo(0, rect().height()); - fadeInPath.lineTo(m_startFade, 0); - fadeInPath.closeSubpath(); - QPainterPath f1 = painter->matrix().map(fadeInPath); - painter->fillPath(f1/*.intersected(resultClipPath)*/, fades); - /*if (isSelected()) { - QLineF l(m_startFade * scale, 0, 0, itemHeight); - painter->drawLine(l); - }*/ - } - if (m_endFade != 0) { - QPainterPath fadeOutPath; - fadeOutPath.moveTo(rect().width(), 0); - fadeOutPath.lineTo(rect().width(), rect().height()); - fadeOutPath.lineTo(rect().width() - m_endFade, 0); - fadeOutPath.closeSubpath(); - QPainterPath f1 = painter->matrix().map(fadeOutPath); - painter->fillPath(f1/*.intersected(resultClipPath)*/, fades); - /*if (isSelected()) { - QLineF l(itemWidth - m_endFade * scale, 0, itemWidth, itemHeight); - painter->drawLine(l); - }*/ - } - - - painter->setPen(QPen(Qt::lightGray)); - // draw effect or transition keyframes - if (mapped.width() > 20) drawKeyFrames(painter, exposed); + // draw start / end fades + QBrush fades; + if (isSelected()) { + fades = QBrush(QColor(200, 50, 50, 150)); + } else fades = QBrush(QColor(200, 200, 200, 200)); + + if (m_startFade != 0) { + QPainterPath fadeInPath; + fadeInPath.moveTo(0, 0); + fadeInPath.lineTo(0, rect().height()); + fadeInPath.lineTo(m_startFade, 0); + fadeInPath.closeSubpath(); + QPainterPath f1 = painter->worldTransform().map(fadeInPath); + painter->fillPath(f1/*.intersected(resultClipPath)*/, fades); + /*if (isSelected()) { + QLineF l(m_startFade * scale, 0, 0, itemHeight); + painter->drawLine(l); + }*/ + } + if (m_endFade != 0) { + QPainterPath fadeOutPath; + fadeOutPath.moveTo(rect().width(), 0); + fadeOutPath.lineTo(rect().width(), rect().height()); + fadeOutPath.lineTo(rect().width() - m_endFade, 0); + fadeOutPath.closeSubpath(); + QPainterPath f1 = painter->worldTransform().map(fadeOutPath); + painter->fillPath(f1/*.intersected(resultClipPath)*/, fades); + /*if (isSelected()) { + QLineF l(itemWidth - m_endFade * scale, 0, itemWidth, itemHeight); + painter->drawLine(l); + }*/ + } - //painter->setMatrixEnabled(true); + painter->setPen(QPen(Qt::lightGray)); + // draw effect or transition keyframes + drawKeyFrames(painter, m_limitedKeyFrames); + } + // draw clip border // expand clip rect to allow correct painting of clip border - QPen pen1(frameColor); - painter->setPen(pen1); painter->setClipping(false); - painter->drawRect(painter->matrix().mapRect(rect())); + painter->setPen(framePen); + if (isSelected() || (parentItem() && parentItem()->isSelected())) { + painter->drawRect(mapped.adjusted(0.5, 0.5, -0.5, -0.5)); + } + else { + painter->drawRect(mapped.adjusted(0, 0, -0.5, 0)); + } } @@ -954,11 +1022,11 @@ OPERATIONTYPE ClipItem::operationMode(QPointF pos) if (qAbs((int)(pos.x() - (rect.x() + m_startFade))) < maximumOffset && qAbs((int)(pos.y() - rect.y())) < 6) { return FADEIN; - } else if (pos.x() - rect.x() < maximumOffset && (rect.bottom() - pos.y() > addtransitionOffset)) { + } else if ((pos.x() <= rect.x() + rect.width() / 2) && pos.x() - rect.x() < maximumOffset && (rect.bottom() - pos.y() > addtransitionOffset)) { return RESIZESTART; } else if (qAbs((int)(pos.x() - (rect.x() + rect.width() - m_endFade))) < maximumOffset && qAbs((int)(pos.y() - rect.y())) < 6) { return FADEOUT; - } else if ((rect.right() - pos.x() < maximumOffset) && (rect.bottom() - pos.y() > addtransitionOffset)) { + } else if ((pos.x() >= rect.x() + rect.width() / 2) && (rect.right() - pos.x() < maximumOffset) && (rect.bottom() - pos.y() > addtransitionOffset)) { return RESIZEEND; } else if ((pos.x() - rect.x() < 16 / scale) && (rect.bottom() - pos.y() <= addtransitionOffset)) { return TRANSITIONSTART; @@ -974,6 +1042,12 @@ int ClipItem::itemHeight() return KdenliveSettings::trackheight() - 2; } +void ClipItem::resetFrameWidth(int width) +{ + FRAME_SIZE = width; + update(); +} + QList ClipItem::snapMarkers() const { QList < GenTime > snaps; @@ -1305,27 +1379,53 @@ QStringList ClipItem::effectNames() return m_effectList.effectNames(); } -QDomElement ClipItem::effectAt(int ix) const +QDomElement ClipItem::effect(int ix) const { - if (ix > m_effectList.count() - 1 || ix < 0 || m_effectList.at(ix).isNull()) return QDomElement(); + if (ix >= m_effectList.count() || ix < 0) return QDomElement(); return m_effectList.at(ix).cloneNode().toElement(); } -QDomElement ClipItem::getEffectAt(int ix) const +QDomElement ClipItem::effectAtIndex(int ix) const +{ + if (ix > m_effectList.count() || ix <= 0) return QDomElement(); + return m_effectList.itemFromIndex(ix).cloneNode().toElement(); +} + +QDomElement ClipItem::getEffectAtIndex(int ix) const +{ + if (ix > m_effectList.count() || ix <= 0) return QDomElement(); + return m_effectList.itemFromIndex(ix); +} + +void ClipItem::updateEffect(QDomElement effect) +{ + //kDebug() << "CHange EFFECT AT: " << ix << ", CURR: " << m_effectList.at(ix).attribute("tag") << ", NEW: " << effect.attribute("tag"); + m_effectList.updateEffect(effect); + m_effectNames = m_effectList.effectNames().join(" / "); + QString id = effect.attribute("id"); + if (id == "fadein" || id == "fadeout" || id == "fade_from_black" || id == "fade_to_black") + update(); + else { + QRectF r = boundingRect(); + r.setHeight(20); + update(r); + } +} + +void ClipItem::enableEffects(QList indexes, bool disable) { - if (ix > m_effectList.count() - 1 || ix < 0 || m_effectList.at(ix).isNull()) return QDomElement(); - return m_effectList.at(ix); + m_effectList.enableEffects(indexes, disable); } -void ClipItem::setEffectAt(int ix, QDomElement effect) +bool ClipItem::moveEffect(QDomElement effect, int ix) { - if (ix < 0 || ix > (m_effectList.count() - 1) || effect.isNull()) { + if (ix <= 0 || ix > (m_effectList.count()) || effect.isNull()) { kDebug() << "Invalid effect index: " << ix; - return; + return false; } - //kDebug() << "CHange EFFECT AT: " << ix << ", CURR: " << m_effectList.at(ix).attribute("tag") << ", NEW: " << effect.attribute("tag"); - effect.setAttribute("kdenlive_ix", ix + 1); - m_effectList.replace(ix, effect); + m_effectList.removeAt(effect.attribute("kdenlive_ix").toInt()); + effect.setAttribute("kdenlive_ix", ix); + m_effectList.insert(effect); m_effectNames = m_effectList.effectNames().join(" / "); QString id = effect.attribute("id"); if (id == "fadein" || id == "fadeout" || id == "fade_from_black" || id == "fade_to_black") @@ -1335,52 +1435,58 @@ void ClipItem::setEffectAt(int ix, QDomElement effect) r.setHeight(20); update(r); } + return true; } -EffectsParameterList ClipItem::addEffect(const QDomElement effect, bool /*animate*/) +EffectsParameterList ClipItem::addEffect(QDomElement effect, bool /*animate*/) { bool needRepaint = false; + QLocale locale; int ix; + QDomElement insertedEffect; if (!effect.hasAttribute("kdenlive_ix")) { + // effect dropped from effect list ix = effectsCounter(); } else ix = effect.attribute("kdenlive_ix").toInt(); if (!m_effectList.isEmpty() && ix <= m_effectList.count()) { needRepaint = true; - m_effectList.insert(ix - 1, effect); - for (int i = ix; i < m_effectList.count(); i++) { - int index = m_effectList.item(i).attribute("kdenlive_ix").toInt(); - if (index >= ix) m_effectList.item(i).setAttribute("kdenlive_ix", index + 1); - } - } else m_effectList.append(effect); + insertedEffect = m_effectList.insert(effect); + } else insertedEffect = m_effectList.append(effect); + + // Update index to the real one + effect.setAttribute("kdenlive_ix", insertedEffect.attribute("kdenlive_ix")); + EffectsParameterList parameters; - 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("disable")) parameters.addParam("disable", effect.attribute("disable")); + parameters.addParam("tag", insertedEffect.attribute("tag")); + parameters.addParam("kdenlive_ix", insertedEffect.attribute("kdenlive_ix")); + if (insertedEffect.hasAttribute("src")) parameters.addParam("src", insertedEffect.attribute("src")); + if (insertedEffect.hasAttribute("disable")) parameters.addParam("disable", insertedEffect.attribute("disable")); - QString effectId = effect.attribute("id"); - if (effectId.isEmpty()) effectId = effect.attribute("tag"); + QString effectId = insertedEffect.attribute("id"); + if (effectId.isEmpty()) effectId = insertedEffect.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"); + QDomNodeList params = insertedEffect.elementsByTagName("parameter"); int fade = 0; + bool needInOutSync = false; for (int i = 0; i < params.count(); i++) { QDomElement e = params.item(i).toElement(); if (!e.isNull()) { + if (e.attribute("type") == "geometry" && !e.hasAttribute("fixed")) { + // Effects with a geometry parameter need to sync in / out with parent clip + needInOutSync = true; + } if (e.attribute("type") == "simplekeyframe") { QStringList values = e.attribute("keyframes").split(";", QString::SkipEmptyParts); - double factor = e.attribute("factor", "1").toDouble(); - if (factor != 1) { + double factor = locale.toDouble(e.attribute("factor", "1")); + double offset = e.attribute("offset", "0").toDouble(); + if (factor != 1 || offset != 0) { 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); + double val = (locale.toDouble(values.at(j).section(':', 1, 1)) - offset) / factor; + values[j] = pos + "=" + locale.toString(val); } } parameters.addParam(e.attribute("name"), values.join(";")); @@ -1392,9 +1498,10 @@ EffectsParameterList ClipItem::addEffect(const QDomElement effect, bool /*animat parameters.addParam("max", e.attribute("max")); parameters.addParam("min", e.attribute("min")); parameters.addParam("factor", e.attribute("factor", "1")); + parameters.addParam("offset", e.attribute("offset", "0")); parameters.addParam("starttag", e.attribute("starttag", "start")); parameters.addParam("endtag", e.attribute("endtag", "end")); - } else if (e.attribute("factor", "1") == "1") { + } else if (e.attribute("factor", "1") == "1" && e.attribute("offset", "0") == "0") { parameters.addParam(e.attribute("name"), e.attribute("value")); // check if it is a fade effect @@ -1441,13 +1548,21 @@ EffectsParameterList ClipItem::addEffect(const QDomElement effect, bool /*animat } } else { double fact; - if (e.attribute("factor").startsWith('%')) { + if (e.attribute("factor").contains('%')) { 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 { + fact = locale.toDouble(e.attribute("factor", "1")); + } + double offset = e.attribute("offset", "0").toDouble(); + parameters.addParam(e.attribute("name"), locale.toString((locale.toDouble(e.attribute("value")) - offset) / fact)); } } } + if (needInOutSync) { + parameters.addParam("in", QString::number(cropStart().frames(m_fps))); + parameters.addParam("out", QString::number((cropStart() + cropDuration()).frames(m_fps) - 1)); + parameters.addParam("_sync_in_out", "1"); + } m_effectNames = m_effectList.effectNames().join(" / "); if (fade > 0) m_startFade = fade; else if (fade < 0) m_endFade = -fade; @@ -1470,34 +1585,27 @@ EffectsParameterList ClipItem::addEffect(const QDomElement effect, bool /*animat void ClipItem::deleteEffect(QString index) { bool needRepaint = false; - QString ix; - - for (int i = 0; i < m_effectList.count(); ++i) { - ix = m_effectList.at(i).attribute("kdenlive_ix"); - if (ix == index) { - QString effectId = m_effectList.at(i).attribute("id"); - if ((effectId == "fadein" && hasEffect(QString(), "fade_from_black") == -1) || - (effectId == "fade_from_black" && hasEffect(QString(), "fadein") == -1)) { - m_startFade = 0; - needRepaint = true; - } else if ((effectId == "fadeout" && hasEffect(QString(), "fade_to_black") == -1) || - (effectId == "fade_to_black" && hasEffect(QString(), "fadeout") == -1)) { - m_endFade = 0; - needRepaint = true; - } else if (EffectsList::hasKeyFrames(m_effectList.at(i))) needRepaint = true; - m_effectList.removeAt(i); - i--; - } else if (ix.toInt() > index.toInt()) { - m_effectList.item(i).setAttribute("kdenlive_ix", ix.toInt() - 1); - } - } + int ix = index.toInt(); + + QDomElement effect = m_effectList.itemFromIndex(ix); + QString effectId = effect.attribute("id"); + if ((effectId == "fadein" && hasEffect(QString(), "fade_from_black") == -1) || + (effectId == "fade_from_black" && hasEffect(QString(), "fadein") == -1)) { + m_startFade = 0; + needRepaint = true; + } else if ((effectId == "fadeout" && hasEffect(QString(), "fade_to_black") == -1) || + (effectId == "fade_to_black" && hasEffect(QString(), "fadeout") == -1)) { + m_endFade = 0; + needRepaint = true; + } else if (EffectsList::hasKeyFrames(effect)) needRepaint = true; + m_effectList.removeAt(ix); m_effectNames = m_effectList.effectNames().join(" / "); - if (m_effectList.isEmpty() || m_selectedEffect + 1 == index.toInt()) { + if (m_effectList.isEmpty() || m_selectedEffect == ix) { // Current effect was removed - if (index.toInt() > m_effectList.count() - 1) { - setSelectedEffect(m_effectList.count() - 1); - } else setSelectedEffect(index.toInt()); + if (ix > m_effectList.count()) { + setSelectedEffect(m_effectList.count()); + } else setSelectedEffect(ix); } if (needRepaint) update(boundingRect()); else { @@ -1552,25 +1660,58 @@ const ItemInfo ClipItem::speedIndependantInfo() const return m_speedIndependantInfo; } +int ClipItem::nextFreeEffectGroupIndex() const +{ + int freeGroupIndex = 0; + for (int i = 0; i < m_effectList.count(); i++) { + QDomElement effect = m_effectList.at(i); + EffectInfo effectInfo; + effectInfo.fromString(effect.attribute("kdenlive_info")); + if (effectInfo.groupIndex >= freeGroupIndex) { + freeGroupIndex = effectInfo.groupIndex + 1; + } + } + return freeGroupIndex; +} + //virtual void ClipItem::dropEvent(QGraphicsSceneDragDropEvent * event) { - const QString effects = QString::fromUtf8(event->mimeData()->data("kdenlive/effectslist")); - QDomDocument doc; - doc.setContent(effects, true); - const QDomElement e = doc.documentElement(); - if (scene() && !scene()->views().isEmpty()) { - event->accept(); + if (event->proposedAction() == Qt::CopyAction && scene() && !scene()->views().isEmpty()) { + const QString effects = QString::fromUtf8(event->mimeData()->data("kdenlive/effectslist")); + event->acceptProposedAction(); + QDomDocument doc; + doc.setContent(effects, true); + QDomElement e = doc.documentElement(); + if (e.tagName() == "effectgroup") { + // dropped an effect group + QDomNodeList effectlist = e.elementsByTagName("effect"); + int freeGroupIndex = nextFreeEffectGroupIndex(); + EffectInfo effectInfo; + for (int i = 0; i < effectlist.count(); i++) { + QDomElement effect = effectlist.at(i).toElement(); + effectInfo.fromString(effect.attribute("kdenlive_info")); + effectInfo.groupIndex = freeGroupIndex; + effect.setAttribute("kdenlive_info", effectInfo.toString()); + effect.removeAttribute("kdenlive_ix"); + } + } else { + // single effect dropped + e.removeAttribute("kdenlive_ix"); + } CustomTrackView *view = (CustomTrackView *) scene()->views()[0]; if (view) view->slotAddEffect(e, m_info.startPos, track()); } + else return; } //virtual void ClipItem::dragEnterEvent(QGraphicsSceneDragDropEvent *event) { if (isItemLocked()) event->setAccepted(false); - else event->setAccepted(event->mimeData()->hasFormat("kdenlive/effectslist")); + else if (event->mimeData()->hasFormat("kdenlive/effectslist")) { + event->acceptProposedAction(); + } else event->setAccepted(false); } void ClipItem::dragLeaveEvent(QGraphicsSceneDragDropEvent *event) @@ -1620,6 +1761,7 @@ bool ClipItem::isVideoOnly() const void ClipItem::insertKeyframe(QDomElement effect, int pos, int val) { if (effect.attribute("disable") == "1") return; + QLocale locale; effect.setAttribute("active_keyframe", pos); m_editedKeyframe = pos; QDomNodeList params = effect.elementsByTagName("parameter"); @@ -1632,14 +1774,14 @@ void ClipItem::insertKeyframe(QDomElement effect, int pos, int val) bool added = false; foreach(const QString &str, keyframes) { int kpos = str.section(':', 0, 0).toInt(); - double newval = str.section(':', 1, 1).toDouble(); + double newval = locale.toDouble(str.section(':', 1, 1)); 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)); + newkfr.append(QString::number(pos) + ":" + locale.toString(newval)); if (kpos > pos) newkfr.append(str); added = true; } else newkfr.append(str); @@ -1658,6 +1800,7 @@ void ClipItem::insertKeyframe(QDomElement effect, int pos, int val) void ClipItem::movedKeyframe(QDomElement effect, int oldpos, int newpos, double value) { if (effect.attribute("disable") == "1") return; + QLocale locale; effect.setAttribute("active_keyframe", newpos); QDomNodeList params = effect.elementsByTagName("parameter"); int start = cropStart().frames(m_fps); @@ -1675,7 +1818,7 @@ void ClipItem::movedKeyframe(QDomElement effect, int oldpos, int newpos, double newpos = qMax(newpos, start); newpos = qMin(newpos, end); if (i == m_visibleParam) - newkfr.append(QString::number(newpos) + ":" + QString::number(value)); + newkfr.append(QString::number(newpos) + ":" + locale.toString(value)); else newkfr.append(QString::number(newpos) + ":" + str.section(':', 1, 1)); } @@ -1691,6 +1834,7 @@ void ClipItem::movedKeyframe(QDomElement effect, int oldpos, int newpos, double void ClipItem::updateKeyframes(QDomElement effect) { m_keyframes.clear(); + QLocale locale; // parse keyframes QDomNodeList params = effect.elementsByTagName("parameter"); QDomElement e = params.item(m_visibleParam).toElement(); @@ -1698,58 +1842,16 @@ void ClipItem::updateKeyframes(QDomElement effect) setSelectedEffect(m_selectedEffect); return; } + m_limitedKeyFrames = e.attribute("type") == "keyframe"; 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(); + double val = locale.toDouble(str.section(':', 1, 1)); 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->m_pixmapCache->findPixmap(m_clip->fileURL().path() + "%" + QString::number(i), &p)) { - p = m_clip->thumbProducer()->extractImage(i, twidth, theight); - view->m_pixmapCache->insertPixmap(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; -// updateGeometryKeyframes(effect, j, width, height, cut); - } - } - } - - return effectPositions; -} - Mlt::Producer *ClipItem::getProducer(int track, bool trackSpecific) { if (isAudioOnly()) @@ -1757,7 +1859,7 @@ Mlt::Producer *ClipItem::getProducer(int track, bool trackSpecific) else if (isVideoOnly()) return m_clip->videoProducer(); else - return m_clip->producer(trackSpecific ? track : -1); + return m_clip->getProducer(trackSpecific ? track : -1); } QMap ClipItem::adjustEffectsToDuration(int width, int height, ItemInfo oldInfo) @@ -1770,13 +1872,13 @@ QMap ClipItem::adjustEffectsToDuration(int width, int height, QString id = effect.attribute("id"); int in = EffectsList::parameter(effect, "in").toInt(); int out = EffectsList::parameter(effect, "out").toInt(); - int clipEnd = (cropStart() + cropDuration()).frames(m_fps); + int clipEnd = (cropStart() + cropDuration()).frames(m_fps) - 1; if (id == "fade_from_black" || id == "fadein") { if (in != cropStart().frames(m_fps)) { effects[i] = effect.cloneNode().toElement(); - int diff = in - cropStart().frames(m_fps); - in -= diff; - out -= diff; + int duration = out - in; + in = cropStart().frames(m_fps); + out = in + duration; EffectsList::setParameter(effect, "in", QString::number(in)); EffectsList::setParameter(effect, "out", QString::number(out)); } @@ -1791,7 +1893,7 @@ QMap ClipItem::adjustEffectsToDuration(int width, int height, if (out != clipEnd) { effects[i] = effect.cloneNode().toElement(); int diff = out - clipEnd; - in -= diff; + in = qMax(in - diff, (int) cropStart().frames(m_fps)); out -= diff; EffectsList::setParameter(effect, "in", QString::number(in)); EffectsList::setParameter(effect, "out", QString::number(out)); @@ -1826,7 +1928,7 @@ QMap ClipItem::adjustEffectsToDuration(int width, int height, if (!effects.contains(i)) effects[i] = effect.cloneNode().toElement(); updateNormalKeyframes(param); -#ifdef QJSON +#ifdef USE_QJSON } else if (type == "roto-spline") { if (!effects.contains(i)) effects[i] = effect.cloneNode().toElement(); @@ -1844,11 +1946,12 @@ bool ClipItem::updateNormalKeyframes(QDomElement parameter) { int in = cropStart().frames(m_fps); int out = (cropStart() + cropDuration()).frames(m_fps) - 1; + QLocale locale; const QStringList data = parameter.attribute("keyframes").split(';', QString::SkipEmptyParts); QMap keyframes; foreach (QString keyframe, data) - keyframes[keyframe.section(':', 0, 0).toInt()] = keyframe.section(':', 1, 1).toDouble(); + keyframes[keyframe.section(':', 0, 0).toInt()] = locale.toDouble(keyframe.section(':', 1, 1)); QMap::iterator i = keyframes.end(); @@ -1916,11 +2019,31 @@ bool ClipItem::updateNormalKeyframes(QDomElement parameter) void ClipItem::updateGeometryKeyframes(QDomElement effect, int paramIndex, int width, int height, ItemInfo oldInfo) { - QDomElement param = effect.elementsByTagName("parameter").item(paramIndex).toElement(); - - Mlt::Geometry geometry(param.attribute("value").toUtf8().data(), oldInfo.cropDuration.frames(m_fps), width, height); + QDomElement param = effect.elementsByTagName("parameter").item(paramIndex).toElement(); + int offset = oldInfo.cropStart.frames(m_fps); + QString data = param.attribute("value"); + if (offset > 0) { + QStringList kfrs = data.split(';'); + data.clear(); + foreach (QString keyframe, kfrs) { + if (keyframe.contains('=')) { + int pos = keyframe.section('=', 0, 0).toInt(); + pos += offset; + data.append(QString::number(pos) + "=" + keyframe.section('=', 1) + ";"); + } + else data.append(keyframe + ";"); + } + } + Mlt::Geometry geometry(data.toUtf8().data(), oldInfo.cropDuration.frames(m_fps), width, height); param.setAttribute("value", geometry.serialise(cropStart().frames(m_fps), (cropStart() + cropDuration()).frames(m_fps) - 1)); } +void ClipItem::slotGotThumbsCache() +{ + disconnect(m_clip->thumbProducer(), SIGNAL(thumbsCached()), this, SLOT(slotGotThumbsCache())); + update(); +} + #include "clipitem.moc" +