X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipitem.cpp;h=1aa2b203dcbd674b8ffb9a69edc65ad7d9c08e57;hb=459decee5e330552ef73b7cb363dbbe38fdc7e87;hp=f1b4bc8793dc8fbbba557d6de58ccb42c968d830;hpb=60c7aa5fc5eddc6728ef9312664cc4c38703a031;p=kdenlive diff --git a/src/clipitem.cpp b/src/clipitem.cpp index f1b4bc87..1aa2b203 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -26,6 +26,7 @@ #include "transition.h" #include "kdenlivesettings.h" #include "kthumb.h" +#include "profilesdialog.h" #include #include @@ -36,102 +37,119 @@ #include #include -ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, bool generateThumbs) - : AbstractClipItem(info, QRectF(), fps), m_clip(clip), m_resizeMode(NONE), m_grabPoint(0), m_maxTrack(0), m_hasThumbs(false), startThumbTimer(NULL), endThumbTimer(NULL), audioThumbWasDrawn(false), m_opacity(1.0), m_timeLine(0), m_startThumbRequested(false), m_endThumbRequested(false), m_startFade(0), m_endFade(0), m_hover(false), m_selectedEffect(-1), m_speed(speed), framePixelWidth(0), m_startPix(QPixmap()), m_endPix(QPixmap()), m_videoOnly(false), m_audioOnly(false) -{ - setZValue(1); +ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, int strobe, bool generateThumbs) : + AbstractClipItem(info, QRectF(), fps), + m_clip(clip), + m_startFade(0), + m_endFade(0), + m_audioOnly(false), + m_videoOnly(false), + m_startPix(QPixmap()), + m_endPix(QPixmap()), + m_hasThumbs(false), + m_selectedEffect(-1), + m_timeLine(0), + m_startThumbRequested(false), + m_endThumbRequested(false), + //m_hover(false), + m_speed(speed), + m_strobe(strobe), + m_framePixelWidth(0) +{ + 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 + m_speedIndependantInfo = m_info; + m_speedIndependantInfo.cropStart = GenTime((int)(m_info.cropStart.frames(m_fps) * m_speed), m_fps); + m_speedIndependantInfo.cropDuration = GenTime((int)(m_info.cropDuration.frames(m_fps) * m_speed), m_fps); + m_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); - audioThumbReady = clip->audioThumbCreated(); - - /* - m_cropStart = xml.attribute("in", 0).toInt(); - m_maxDuration = xml.attribute("duration", 0).toInt(); - if (m_maxDuration == 0) m_maxDuration = xml.attribute("out", 0).toInt() - m_cropStart; - - if (duration != -1) m_cropDuration = duration; - else m_cropDuration = m_maxDuration;*/ - - - setFlags(QGraphicsItem::ItemClipsToShape | QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable); - setAcceptsHoverEvents(true); + 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) { - setBrush(QColor(141, 166, 215)); - m_hasThumbs = true; - startThumbTimer = new QTimer(this); - startThumbTimer->setSingleShot(true); - connect(startThumbTimer, SIGNAL(timeout()), this, SLOT(slotGetStartThumb())); - endThumbTimer = new QTimer(this); - endThumbTimer->setSingleShot(true); - connect(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(); - }*/ + m_baseColor = QColor(141, 166, 215); + 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, "#"); - setBrush(QColor(colour.left(7))); + m_baseColor = QColor(colour.left(7)); } else if (m_clipType == IMAGE || m_clipType == TEXT) { - setBrush(QColor(141, 166, 215)); - m_startPix = KThumb::getImage(KUrl(clip->getProperty("resource")), (int)(KdenliveSettings::trackheight() * KdenliveSettings::project_display_ratio()), KdenliveSettings::trackheight()); - m_endPix = m_startPix; + 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()); } else if (m_clipType == AUDIO) { - setBrush(QColor(141, 215, 166)); - connect(clip, SIGNAL(gotAudioData()), this, SLOT(slotGotAudioData())); + m_baseColor = QColor(141, 215, 166); + connect(m_clip, SIGNAL(gotAudioData()), this, SLOT(slotGotAudioData())); } } ClipItem::~ClipItem() { - if (startThumbTimer) delete startThumbTimer; - if (endThumbTimer) delete endThumbTimer; - if (m_timeLine) delete m_timeLine; + blockSignals(true); + if (scene()) scene()->removeItem(this); + if (m_clipType == VIDEO || m_clipType == AV || m_clipType == SLIDESHOW || m_clipType == PLAYLIST) { + //disconnect(m_clip->thumbProducer(), SIGNAL(thumbReady(int, QImage)), this, SLOT(slotThumbReady(int, QImage))); + //disconnect(m_clip, SIGNAL(gotAudioData()), this, SLOT(slotGotAudioData())); + } + delete m_timeLine; } ClipItem *ClipItem::clone(ItemInfo info) const { - ClipItem *duplicate = new ClipItem(m_clip, info, m_fps, m_speed); - if (info.cropStart == m_cropStart) duplicate->slotSetStartThumb(m_startPix); - if (info.cropStart + (info.endPos - info.startPos) == m_cropStart + m_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.clone()); + 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 (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->setSpeed(m_speed); return duplicate; } void ClipItem::setEffectList(const EffectsList effectList) { - m_effectList = effectList; + m_effectList.clone(effectList); m_effectNames = m_effectList.effectNames().join(" / "); + if (!m_effectList.isEmpty()) setSelectedEffect(0); } -const EffectsList ClipItem::effectList() +const EffectsList ClipItem::effectList() const { return m_effectList; } @@ -141,42 +159,64 @@ 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(); - kDebug() << "// inint eff: " << e.attribute("name"); - if (!e.isNull() && e.attribute("type") == "keyframe") { + kDebug() << "// init eff: " << e.attribute("name"); + + // Check if this effect has a variable parameter + if (e.attribute("default").startsWith('%')) { + double evaluatedValue = ProfilesDialog::getStringEval(projectScene()->profile(), e.attribute("default")); + e.setAttribute("default", evaluatedValue); + if (e.hasAttribute("value") && e.attribute("value").startsWith('%')) { + e.setAttribute("value", evaluatedValue); + } + } + + 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(m_cropStart.frames(m_fps)) + ':' + def + ';' + QString::number((m_cropStart + m_cropDuration).frames(m_fps)) + ':' + def); + 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; + //break; } } } - if (effect.attribute("tag") == "volume" || effect.attribute("tag") == "brightness") { if (effect.attribute("id") == "fadeout" || effect.attribute("id") == "fade_to_black") { - int end = (duration() + cropStart()).frames(m_fps); + int end = (cropDuration() + cropStart()).frames(m_fps); int start = end; if (effect.attribute("id") == "fadeout") { if (m_effectList.hasEffect(QString(), "fade_to_black") == -1) { - start -= EffectsList::parameter(effect, "in").toInt(); + int effectDuration = EffectsList::parameter(effect, "in").toInt(); + if (effectDuration > cropDuration().frames(m_fps)) { + effectDuration = cropDuration().frames(m_fps) / 2; + } + start -= effectDuration; } else { QDomElement fadeout = m_effectList.getEffectByTag(QString(), "fade_to_black"); start -= EffectsList::parameter(fadeout, "out").toInt() - EffectsList::parameter(fadeout, "in").toInt(); } } else if (effect.attribute("id") == "fade_to_black") { if (m_effectList.hasEffect(QString(), "fadeout") == -1) { - start -= EffectsList::parameter(effect, "in").toInt(); + int effectDuration = EffectsList::parameter(effect, "in").toInt(); + if (effectDuration > cropDuration().frames(m_fps)) { + effectDuration = cropDuration().frames(m_fps) / 2; + } + start -= effectDuration; } else { QDomElement fadeout = m_effectList.getEffectByTag(QString(), "fadeout"); start -= EffectsList::parameter(fadeout, "out").toInt() - EffectsList::parameter(fadeout, "in").toInt(); @@ -188,14 +228,22 @@ void ClipItem::initEffect(QDomElement effect) int start = cropStart().frames(m_fps); int end = start; if (effect.attribute("id") == "fadein") { - if (m_effectList.hasEffect(QString(), "fade_from_black") == -1) - end += EffectsList::parameter(effect, "out").toInt(); - else + if (m_effectList.hasEffect(QString(), "fade_from_black") == -1) { + int effectDuration = EffectsList::parameter(effect, "out").toInt(); + if (effectDuration > cropDuration().frames(m_fps)) { + effectDuration = cropDuration().frames(m_fps) / 2; + } + end += effectDuration; + } else end += EffectsList::parameter(m_effectList.getEffectByTag(QString(), "fade_from_black"), "out").toInt(); } else if (effect.attribute("id") == "fade_from_black") { - if (m_effectList.hasEffect(QString(), "fadein") == -1) - end += EffectsList::parameter(effect, "out").toInt(); - else + if (m_effectList.hasEffect(QString(), "fadein") == -1) { + int effectDuration = EffectsList::parameter(effect, "out").toInt(); + if (effectDuration > cropDuration().frames(m_fps)) { + effectDuration = cropDuration().frames(m_fps) / 2; + } + end += effectDuration; + } else end += EffectsList::parameter(m_effectList.getEffectByTag(QString(), "fadein"), "out").toInt(); } EffectsList::setParameter(effect, "in", QString::number(start)); @@ -216,8 +264,8 @@ bool ClipItem::checkKeyFrames() 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); foreach(const QString &str, keyframes) { int pos = str.section(':', 0, 0).toInt(); double val = str.section(':', 1, 1).toDouble(); @@ -265,12 +313,12 @@ bool ClipItem::checkKeyFrames() void ClipItem::setKeyframes(const int ix, const QString keyframes) { - QDomElement effect = effectAt(ix); + QDomElement effect = getEffectAt(ix); if (effect.attribute("disabled") == "1") return; QDomNodeList params = effect.elementsByTagName("parameter"); for (int i = 0; i < params.count(); i++) { QDomElement e = params.item(i).toElement(); - if (!e.isNull() && e.attribute("type") == "keyframe") { + if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { e.setAttribute("keyframes", keyframes); if (ix == m_selectedEffect) { m_keyframes.clear(); @@ -278,6 +326,8 @@ void ClipItem::setKeyframes(const int ix, const QString keyframes) double min = e.attribute("min").toDouble(); m_keyframeFactor = 100.0 / (max - min); m_keyframeDefault = e.attribute("default").toDouble(); + m_selectedKeyframe = 0; + m_editedKeyframe = -1; // parse keyframes const QStringList keyframes = e.attribute("keyframes").split(';', QString::SkipEmptyParts); foreach(const QString &str, keyframes) { @@ -298,27 +348,31 @@ void ClipItem::setSelectedEffect(const int ix) { m_selectedEffect = ix; QDomElement effect = effectAt(m_selectedEffect); - QDomNodeList params = effect.elementsByTagName("parameter"); - if (effect.attribute("disabled") != "1") - for (int i = 0; i < params.count(); i++) { - QDomElement e = params.item(i).toElement(); - if (!e.isNull() && e.attribute("type") == "keyframe") { - 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(); - // 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(); - m_keyframes[pos] = val; + if (effect.isNull() == false) { + QDomNodeList params = effect.elementsByTagName("parameter"); + if (effect.attribute("disabled") != "1") + for (int i = 0; i < params.count(); i++) { + QDomElement e = params.item(i).toElement(); + if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { + 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; + m_editedKeyframe = -1; + // 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(); + m_keyframes[pos] = val; + } + update(); + return; } - update(); - return; } - } + } if (!m_keyframes.isEmpty()) { m_keyframes.clear(); update(); @@ -333,7 +387,7 @@ QString ClipItem::keyframes(const int index) for (int i = 0; i < params.count(); i++) { QDomElement e = params.item(i).toElement(); - if (!e.isNull() && e.attribute("type") == "keyframe") { + if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) { result = e.attribute("keyframes"); break; } @@ -344,16 +398,16 @@ QString ClipItem::keyframes(const int index) void ClipItem::updateKeyframeEffect() { // regenerate xml parameter from the clip keyframes - QDomElement effect = effectAt(m_selectedEffect); + QDomElement effect = getEffectAt(m_selectedEffect); if (effect.attribute("disabled") == "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) { - QMap::const_iterator i = m_keyframes.constBegin(); + if (m_keyframes.count() > 0) { + QMap::const_iterator i = m_keyframes.constBegin(); while (i != m_keyframes.constEnd()) { keyframes.append(QString::number(i.key()) + ':' + QString::number(i.value()) + ';'); ++i; @@ -373,31 +427,62 @@ QDomElement ClipItem::selectedEffect() return effectAt(m_selectedEffect); } -void ClipItem::resetThumbs() +void ClipItem::resetThumbs(bool clearExistingThumbs) { - m_startPix = QPixmap(); - m_endPix = QPixmap(); + if (clearExistingThumbs) { + m_startPix = QPixmap(); + m_endPix = QPixmap(); + m_audioThumbCachePic.clear(); + } slotFetchThumbs(); - audioThumbCachePic.clear(); } -void ClipItem::refreshClip() +void ClipItem::refreshClip(bool checkDuration) { - m_maxDuration = m_clip->maxDuration(); + 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_info.cropStart + m_info.cropDuration > m_maxDuration) { + // Clip duration changed, make sure to stay in correct range + if (m_info.cropStart > m_maxDuration) { + m_info.cropStart = GenTime(); + m_info.cropDuration = qMin(m_info.cropDuration, m_maxDuration); + updateRectGeometry(); + } else { + m_info.cropDuration = m_maxDuration; + updateRectGeometry(); + } + } + } + } if (m_clipType == COLOR) { QString colour = m_clip->getProperty("colour"); colour = colour.replace(0, 2, "#"); - setBrush(QColor(colour.left(7))); - } else slotFetchThumbs(); + m_baseColor = QColor(colour.left(7)); + } else resetThumbs(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()); + update(); + } + return; + } + + if (m_clipType == TEXT) { + if (m_startPix.isNull()) slotGetStartThumb(); + return; + } + 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(); @@ -406,35 +491,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); } @@ -460,21 +528,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 = sceneBoundingRect(); - double width = m_startPix.width() / projectScene()->scale(); - if (m_startThumbRequested && frame == cropStart().frames(m_fps)) { + QRectF r = boundingRect(); + QPixmap pix = QPixmap::fromImage(img); + double width = pix.width() / projectScene()->scale().x(); + if (m_startThumbRequested && frame == m_speedIndependantInfo.cropStart.frames(m_fps)) { m_startPix = pix; m_startThumbRequested = false; - double height = r.height(); - update(r.x(), r.y(), width, height); - } else if (m_endThumbRequested && frame == (cropStart() + cropDuration()).frames(m_fps) - 1) { + update(r.left(), r.top(), width, pix.height()); + 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; - double height = r.height(); - update(r.right() - width, r.y(), width, height); + update(r.right() - width, r.top(), width, pix.height()); } } @@ -500,7 +570,7 @@ QPixmap ClipItem::endThumb() const void ClipItem::slotGotAudioData() { - audioThumbReady = true; + m_audioThumbReady = true; if (m_clipType == AV && !isAudioOnly()) { QRectF r = boundingRect(); r.setTop(r.top() + r.height() / 2 - 1); @@ -522,6 +592,9 @@ QDomElement ClipItem::xml() const { QDomElement xml = m_clip->toXML(); if (m_speed != 1.0) xml.setAttribute("speed", m_speed); + if (m_strobe > 1) xml.setAttribute("strobe", m_strobe); + if (m_audioOnly) xml.setAttribute("audio_only", 1); + else if (m_videoOnly) xml.setAttribute("video_only", 1); return xml; } @@ -540,7 +613,7 @@ void ClipItem::setClipName(const QString &name) m_clipName = name; } -const QString &ClipItem::clipProducer() const +const QString ClipItem::clipProducer() const { return m_producer; } @@ -549,10 +622,12 @@ void ClipItem::flashClip() { if (m_timeLine == 0) { m_timeLine = new QTimeLine(750, this); + m_timeLine->setUpdateInterval(80); m_timeLine->setCurveShape(QTimeLine::EaseInOutCurve); + m_timeLine->setFrameRange(0, 100); connect(m_timeLine, SIGNAL(valueChanged(qreal)), this, SLOT(animate(qreal))); } - m_timeLine->start(); + //m_timeLine->start(); } void ClipItem::animate(qreal /*value*/) @@ -567,66 +642,44 @@ void ClipItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *) { - /*if (parentItem()) m_opacity = 0.5; - else m_opacity = 1.0; - painter->setOpacity(m_opacity);*/ QColor paintColor; if (parentItem()) paintColor = QColor(255, 248, 149); - else paintColor = brush().color(); + else paintColor = m_baseColor; if (isSelected() || (parentItem() && parentItem()->isSelected())) paintColor = paintColor.darker(); - QRectF br = rect(); - QRectF exposed = option->exposedRect; - QRectF mapped = painter->matrix().mapRect(br); - - const double itemWidth = br.width(); - const double itemHeight = br.height(); - const double scale = option->matrix.m11(); - const qreal xoffset = pen().widthF() / scale; - - //painter->setRenderHints(QPainter::Antialiasing); - - //QPainterPath roundRectPathUpper = upperRectPart(br), roundRectPathLower = lowerRectPart(br); - painter->setClipRect(exposed); - - //Fill clip rectangle - QRectF bgRect = br; - bgRect.setLeft(br.left() + xoffset); - painter->fillRect(bgRect, paintColor); - - //painter->setClipPath(resultClipPath, Qt::IntersectClip); - // draw thumbnails 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); + // draw thumbnails 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_startPix.isNull()) { - QPointF p1 = painter->matrix().map(QPointF(itemWidth, 0)) - QPointF(m_startPix.width(), 0); - QPointF p2 = painter->matrix().map(QPointF(itemWidth, itemHeight)) - QPointF(m_startPix.width(), 0); - painter->drawPixmap(p1, m_startPix); - QLineF l(p1, p2); - painter->drawLine(l); + if ((m_clipType == IMAGE || m_clipType == TEXT) && !m_startPix.isNull()) { + const QPointF top = mapped.topRight() - QPointF(m_startPix.width() - 1, 0); + painter->drawPixmap(top, m_startPix); + QLineF l2(top.x(), mapped.top(), top.x(), mapped.bottom()); + painter->drawLine(l2); } else if (!m_endPix.isNull()) { - QPointF p1 = painter->matrix().map(QPointF(itemWidth, 0)) - QPointF(m_endPix.width(), 0); - QPointF p2 = painter->matrix().map(QPointF(itemWidth, itemHeight)) - QPointF(m_endPix.width(), 0); - painter->drawPixmap(p1, m_endPix); - QLineF l(p1, p2); - painter->drawLine(l); + const QPointF top = mapped.topRight() - QPointF(m_endPix.width() - 1, 0); + painter->drawPixmap(top, m_endPix); + QLineF l2(top.x(), mapped.top(), top.x(), mapped.bottom()); + painter->drawLine(l2); } if (!m_startPix.isNull()) { - QPointF p1 = painter->matrix().map(QPointF(0, 0)) + QPointF(1.0, 0); - QPointF p2 = painter->matrix().map(QPointF(0, itemHeight)) + QPointF(1.0, 0); - painter->drawPixmap(p1, m_startPix); - QLineF l2(p1.x() + m_startPix.width(), p1.y(), p2.x() + m_startPix.width(), p2.y()); + painter->drawPixmap(mapped.topLeft(), m_startPix); + QLineF l2(mapped.left() + m_startPix.width(), mapped.top(), mapped.left() + m_startPix.width(), mapped.bottom()); painter->drawLine(l2); } painter->setPen(Qt::black); } // draw audio thumbnails - if (KdenliveSettings::audiothumbnails() && m_speed == 1.0 && !isVideoOnly() && ((m_clipType == AV && (exposed.bottom() > (itemHeight / 2) || isAudioOnly())) || m_clipType == AUDIO) && audioThumbReady) { + if (KdenliveSettings::audiothumbnails() && m_speed == 1.0 && !isVideoOnly() && ((m_clipType == AV && (exposed.bottom() > (rect().height() / 2) || isAudioOnly())) || m_clipType == AUDIO) && m_audioThumbReady) { double startpixel = exposed.left(); if (startpixel < 0) @@ -639,16 +692,15 @@ void ClipItem::paint(QPainter *painter, /*QPainterPath path = m_clipType == AV ? roundRectPathLower : resultClipPath;*/ QRectF mappedRect; if (m_clipType == AV && !isAudioOnly()) { - QRectF re = br; - re.setTop(re.y() + re.height() / 2); - mappedRect = painter->matrix().mapRect(re); - //painter->fillRect(mappedRect, QBrush(QColor(200, 200, 200, 140))); + mappedRect = mapped; + mappedRect.setTop(mappedRect.bottom() - mapped.height() / 2); } else mappedRect = mapped; + double scale = painter->matrix().m11(); int channels = baseClip()->getProperty("channels").toInt(); - if (scale != framePixelWidth) - audioThumbCachePic.clear(); - double cropLeft = m_cropStart.frames(m_fps); + 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; @@ -659,48 +711,91 @@ void ClipItem::paint(QPainter *painter, } for (int startCache = mappedStartPixel - (mappedStartPixel) % 100; startCache < mappedEndPixel; startCache += 100) { - if (audioThumbCachePic.contains(startCache) && !audioThumbCachePic[startCache].isNull()) - painter->drawPixmap(clipStart + startCache - cropLeft, mappedRect.y(), audioThumbCachePic[startCache]); + if (m_audioThumbCachePic.contains(startCache) && !m_audioThumbCachePic[startCache].isNull()) + painter->drawPixmap(clipStart + startCache - cropLeft, mappedRect.y(), m_audioThumbCachePic[startCache]); } } + // 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); + + // draw markers - QList < CommentedTime > markers = baseClip()->commentedSnapMarkers(); - QList < CommentedTime >::Iterator it = markers.begin(); - GenTime pos; - double framepos; - QBrush markerBrush; - markerBrush = QBrush(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() - cropStart(); - if (pos > GenTime()) { - if (pos > duration()) break; - QLineF l(br.x() + pos.frames(m_fps), br.y() + 5, br.x() + pos.frames(m_fps), br.bottom() - 5); - 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 = br.x() + pos.frames(m_fps); - const QRectF r1(framepos + 0.04, 10, itemWidth - framepos - 2, itemHeight - 10); - const QRectF r2 = painter->matrix().mapRect(r1); - const QRectF txtBounding = painter->boundingRect(r2, Qt::AlignLeft | Qt::AlignTop, ' ' + (*it).comment() + ' '); - painter->setBrush(markerBrush); - painter->setPen(Qt::NoPen); - painter->drawRoundedRect(txtBounding, 3, 3); - painter->setPen(Qt::white); - painter->drawText(txtBounding, Qt::AlignCenter, (*it).comment()); + if (isEnabled() && m_clip) { + QList < CommentedTime > markers = m_clip->commentedSnapMarkers(); + QList < CommentedTime >::Iterator it = markers.begin(); + GenTime pos; + double framepos; + QBrush markerBrush(QColor(120, 120, 0, 140)); + QPen pen = painter->pen(); + pen.setColor(QColor(255, 255, 255, 200)); + pen.setStyle(Qt::DotLine); + + for (; it != markers.end(); ++it) { + pos = GenTime((int)((*it).time().frames(m_fps) / m_speed + 0.5), m_fps) - cropStart(); + if (pos > GenTime()) { + if (pos > cropDuration()) break; + QLineF l(rect().x() + pos.frames(m_fps), rect().y(), rect().x() + pos.frames(m_fps), rect().bottom()); + QLineF l2 = painter->matrix().map(l); + painter->setPen(pen); + painter->drawLine(l2); + if (KdenliveSettings::showmarkers()) { + framepos = rect().x() + pos.frames(m_fps); + const QRectF r1(framepos + 0.04, 10, rect().width() - framepos - 2, rect().height() - 10); + const QRectF r2 = painter->matrix().mapRect(r1); + const QRectF txtBounding3 = painter->boundingRect(r2, Qt::AlignLeft | Qt::AlignTop, ' ' + (*it).comment() + ' '); + painter->setBrush(markerBrush); + painter->setPen(Qt::NoPen); + painter->drawRoundedRect(txtBounding3, 3, 3); + painter->setBrush(QBrush(Qt::NoBrush)); + painter->setPen(Qt::white); + painter->drawText(txtBounding3, Qt::AlignCenter, (*it).comment()); + } + //painter->fillRect(QRect(br.x() + framepos, br.y(), 10, br.height()), QBrush(QColor(0, 0, 0, 150))); } - //painter->fillRect(QRect(br.x() + framepos, br.y(), 10, br.height()), QBrush(QColor(0, 0, 0, 150))); } } - pen.setColor(Qt::black); - pen.setStyle(Qt::SolidLine); - painter->setPen(pen); // draw start / end fades QBrush fades; @@ -711,7 +806,7 @@ void ClipItem::paint(QPainter *painter, if (m_startFade != 0) { QPainterPath fadeInPath; fadeInPath.moveTo(0, 0); - fadeInPath.lineTo(0, itemHeight); + fadeInPath.lineTo(0, rect().height()); fadeInPath.lineTo(m_startFade, 0); fadeInPath.closeSubpath(); QPainterPath f1 = painter->matrix().map(fadeInPath); @@ -723,9 +818,9 @@ void ClipItem::paint(QPainter *painter, } if (m_endFade != 0) { QPainterPath fadeOutPath; - fadeOutPath.moveTo(itemWidth, 0); - fadeOutPath.lineTo(itemWidth, itemHeight); - fadeOutPath.lineTo(itemWidth - m_endFade, 0); + 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); @@ -735,119 +830,58 @@ void ClipItem::paint(QPainter *painter, }*/ } - // Draw effects names - if (!m_effectNames.isEmpty() && itemWidth * scale > 40) { - QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignLeft | Qt::AlignTop, m_effectNames); - txtBounding.setRight(txtBounding.right() + 15); - painter->setPen(Qt::white); - QBrush markerBrush(Qt::SolidPattern); - if (m_timeLine && m_timeLine->state() == QTimeLine::Running) { - qreal value = m_timeLine->currentValue(); - txtBounding.setWidth(txtBounding.width() * value); - markerBrush.setColor(QColor(50 + 200 * (1.0 - value), 50, 50, 100 + 50 * value)); - } else markerBrush.setColor(QColor(50, 50, 50, 150)); - painter->setBrush(markerBrush); - painter->setPen(Qt::NoPen); - painter->drawRoundedRect(txtBounding, 3, 3); - painter->setPen(Qt::white); - painter->drawText(txtBounding, Qt::AlignCenter, m_effectNames); - painter->setPen(Qt::black); - } - - // Draw clip name - // draw frame around clip - QColor frameColor(Qt::black); - int alphaBase = 60; - if (isSelected() || (parentItem() && parentItem()->isSelected())) { - frameColor = QColor(Qt::red); - alphaBase = 90; - } - frameColor.setAlpha(150); - QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignHCenter | Qt::AlignVCenter, ' ' + m_clipName + ' '); - painter->fillRect(txtBounding, frameColor); - //painter->setPen(QColor(0, 0, 0, 180)); - //painter->drawText(txtBounding, Qt::AlignCenter, m_clipName); - if (m_videoOnly) { - painter->drawPixmap(txtBounding.topLeft() - QPointF(17, -1), m_videoPix); - } else if (m_audioOnly) { - painter->drawPixmap(txtBounding.topLeft() - QPointF(17, -1), m_audioPix); - } - txtBounding.translate(QPointF(1, 1)); - painter->setPen(QColor(255, 255, 255, 255)); - painter->drawText(txtBounding, Qt::AlignCenter, m_clipName); - - - // draw transition handles on hover - if (m_hover && itemWidth * scale > 40) { - QPointF p1 = painter->matrix().map(QPointF(0, itemHeight / 2)) + QPointF(10, 0); - painter->drawPixmap(p1, projectScene()->m_transitionPixmap); - p1 = painter->matrix().map(QPointF(itemWidth, itemHeight / 2)) - QPointF(22, 0); - painter->drawPixmap(p1, projectScene()->m_transitionPixmap); - } + painter->setPen(QPen(Qt::lightGray)); // draw effect or transition keyframes - if (itemWidth > 20) drawKeyFrames(painter, exposed); + if (mapped.width() > 20) drawKeyFrames(painter, exposed); - painter->setMatrixEnabled(true); + //painter->setMatrixEnabled(true); // draw clip border // expand clip rect to allow correct painting of clip border - - exposed.setRight(exposed.right() + xoffset + 0.5); - exposed.setBottom(exposed.bottom() + 1); - painter->setClipRect(exposed); - - frameColor.setAlpha(alphaBase); - painter->setPen(frameColor); - QLineF line(br.left() + xoffset, br.top(), br.right() - xoffset, br.top()); - painter->drawLine(line); - - frameColor.setAlpha(alphaBase * 2); - painter->setPen(frameColor); - line.setLine(br.right(), br.top() + 1.0, br.right(), br.bottom() - 1.0); - painter->drawLine(line); - line.setLine(br.right() - xoffset, br.bottom(), br.left() + xoffset, br.bottom()); - painter->drawLine(line); - line.setLine(br.left(), br.bottom() - 1.0, br.left(), br.top() + 1.0); - painter->drawLine(line); - - painter->setPen(QColor(255, 255, 255, 60)); - line.setLine(br.right() - xoffset, br.bottom() - 1.0, br.left() + xoffset, br.bottom() - 1.0); - painter->drawLine(line); - //painter->drawRect(br); + QPen pen1(frameColor); + painter->setPen(pen1); + painter->setClipping(false); + painter->drawRect(painter->matrix().mapRect(rect())); } OPERATIONTYPE ClipItem::operationMode(QPointF pos) { if (isItemLocked()) return NONE; - - if (isSelected()) { - m_editedKeyframe = mouseOverKeyFrames(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; } QRectF rect = sceneBoundingRect(); - const double scale = projectScene()->scale(); - double maximumOffset = 6 / scale; + int addtransitionOffset = 10; + // Don't allow add transition if track height is very small + if (rect.height() < 30) addtransitionOffset = 0; if (qAbs((int)(pos.x() - (rect.x() + m_startFade))) < maximumOffset && qAbs((int)(pos.y() - rect.y())) < 6) { if (m_startFade == 0) setToolTip(i18n("Add audio fade")); + // xgettext:no-c-format else setToolTip(i18n("Audio fade duration: %1s", GenTime(m_startFade, m_fps).seconds())); return FADEIN; - } else if (pos.x() - rect.x() < maximumOffset) { + } 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 (qAbs((int)(pos.x() - (rect.x() + rect.width()))) < maximumOffset) { - setToolTip(i18n("Clip duration: %1s", duration().seconds())); + } 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 (qAbs((int)(pos.x() - (rect.x() + 16 / scale))) < maximumOffset && qAbs((int)(pos.y() - (rect.y() + rect.height() / 2 + 9))) < 6) { + } else if ((pos.x() - rect.x() < 16 / scale) && (rect.bottom() - pos.y() <= addtransitionOffset)) { setToolTip(i18n("Add transition")); return TRANSITIONSTART; - } else if (qAbs((int)(pos.x() - (rect.x() + rect.width() - 21 / scale))) < maximumOffset && qAbs((int)(pos.y() - (rect.y() + rect.height() / 2 + 9))) < 6) { + } else if ((rect.right() - pos.x() < 16 / scale) && (rect.bottom() - pos.y() <= addtransitionOffset)) { setToolTip(i18n("Add transition")); return TRANSITIONEND; } @@ -862,9 +896,10 @@ QList ClipItem::snapMarkers() const GenTime pos; for (int i = 0; i < markers.size(); i++) { - pos = markers.at(i) - cropStart(); + + pos = GenTime((int)(markers.at(i).frames(m_fps) / m_speed + 0.5), m_fps) - cropStart(); if (pos > GenTime()) { - if (pos > duration()) break; + if (pos > cropDuration()) break; else snaps.append(pos + startPos()); } } @@ -878,9 +913,9 @@ QList ClipItem::commentedSnapMarkers() const GenTime pos; for (int i = 0; i < markers.size(); i++) { - pos = markers.at(i).time() - cropStart(); + pos = GenTime((int)(markers.at(i).time().frames(m_fps) / m_speed + 0.5), m_fps) - cropStart(); if (pos > GenTime()) { - if (pos > duration()) break; + if (pos > cropDuration()) break; else snaps.append(CommentedTime(pos + startPos(), markers.at(i).comment())); } } @@ -895,19 +930,19 @@ void ClipItem::slotPrepareAudioThumb(double pixelForOneFrame, int startpixel, in //kDebug() << "// PREP AUDIO THMB FRMO : scale:" << pixelForOneFrame<< ", from: " << startpixel << ", to: " << endpixel; //if ( (!audioThumbWasDrawn || framePixelWidth!=pixelForOneFrame ) && !baseClip()->audioFrameChache.isEmpty()){ - for (int startCache = startpixel - startpixel % 100;startCache < endpixel;startCache += 100) { + for (int startCache = startpixel - startpixel % 100; startCache < endpixel; startCache += 100) { //kDebug() << "creating " << startCache; //if (framePixelWidth!=pixelForOneFrame || - if (framePixelWidth == pixelForOneFrame && audioThumbCachePic.contains(startCache)) + if (m_framePixelWidth == pixelForOneFrame && m_audioThumbCachePic.contains(startCache)) continue; - if (audioThumbCachePic[startCache].isNull() || framePixelWidth != pixelForOneFrame) { - audioThumbCachePic[startCache] = QPixmap(100, (int)(re.height())); - audioThumbCachePic[startCache].fill(QColor(180, 180, 200, 140)); + if (m_audioThumbCachePic[startCache].isNull() || m_framePixelWidth != pixelForOneFrame) { + m_audioThumbCachePic[startCache] = QPixmap(100, (int)(re.height())); + m_audioThumbCachePic[startCache].fill(QColor(180, 180, 200, 140)); } bool fullAreaDraw = pixelForOneFrame < 10; QMap positiveChannelPaths; QMap negativeChannelPaths; - QPainter pixpainter(&audioThumbCachePic[startCache]); + QPainter pixpainter(&m_audioThumbCachePic[startCache]); QPen audiopen; audiopen.setWidth(0); pixpainter.setPen(audiopen); @@ -919,22 +954,22 @@ void ClipItem::slotPrepareAudioThumb(double pixelForOneFrame, int startpixel, in return; } - int channelHeight = audioThumbCachePic[startCache].height() / channels; + int channelHeight = m_audioThumbCachePic[startCache].height() / channels; - for (int i = 0;i < channels;i++) { + for (int i = 0; i < channels; i++) { positiveChannelPaths[i].moveTo(0, channelHeight*i + channelHeight / 2); negativeChannelPaths[i].moveTo(0, channelHeight*i + channelHeight / 2); } - for (int samples = 0;samples <= 100;samples++) { + for (int samples = 0; samples <= 100; samples++) { double frame = (double)(samples + startCache - 0) / pixelForOneFrame; int sample = (int)((frame - (int)(frame)) * 20); // AUDIO_FRAME_SIZE if (frame < 0 || sample < 0 || sample > 19) continue; - QMap frame_channel_data = baseClip()->audioFrameChache[(int)frame]; + QMap frame_channel_data = baseClip()->m_audioFrameCache[(int)frame]; - for (int channel = 0;channel < channels && frame_channel_data[channel].size() > 0;channel++) { + for (int channel = 0; channel < channels && frame_channel_data[channel].size() > 0; channel++) { int y = channelHeight * channel + channelHeight / 2; int delta = (int)(frame_channel_data[channel][sample] - 127 / 2) * channelHeight / 64; @@ -946,7 +981,7 @@ void ClipItem::slotPrepareAudioThumb(double pixelForOneFrame, int startpixel, in negativeChannelPaths[channel].lineTo(samples, 0.1 + y - delta); } } - for (int channel = 0;channel < channels ;channel++) + for (int channel = 0; channel < channels ; channel++) if (fullAreaDraw && samples == 100) { positiveChannelPaths[channel].lineTo(samples, channelHeight*channel + channelHeight / 2); negativeChannelPaths[channel].lineTo(samples, channelHeight*channel + channelHeight / 2); @@ -958,7 +993,7 @@ void ClipItem::slotPrepareAudioThumb(double pixelForOneFrame, int startpixel, in pixpainter.setPen(QPen(QColor(0, 0, 0))); pixpainter.setBrush(QBrush(QColor(60, 60, 60))); - for (int i = 0;i < channels;i++) { + for (int i = 0; i < channels; i++) { if (fullAreaDraw) { //pixpainter.fillPath(positiveChannelPaths[i].united(negativeChannelPaths[i]),QBrush(Qt::SolidPattern));//or singleif looks better pixpainter.drawPath(positiveChannelPaths[i].united(negativeChannelPaths[i]));//or singleif looks better @@ -967,17 +1002,17 @@ void ClipItem::slotPrepareAudioThumb(double pixelForOneFrame, int startpixel, in } } //audioThumbWasDrawn=true; - framePixelWidth = pixelForOneFrame; + m_framePixelWidth = pixelForOneFrame; //} } -uint ClipItem::fadeIn() const +int ClipItem::fadeIn() const { return m_startFade; } -uint ClipItem::fadeOut() const +int ClipItem::fadeOut() const { return m_endFade; } @@ -988,7 +1023,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()); @@ -999,39 +1034,23 @@ 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()); } -// virtual -void ClipItem::mousePressEvent(QGraphicsSceneMouseEvent * event) -{ - /*m_resizeMode = operationMode(event->pos()); - if (m_resizeMode == MOVE) { - m_maxTrack = scene()->sceneRect().height(); - m_grabPoint = (int) (event->pos().x() - rect().x()); - }*/ - QGraphicsRectItem::mousePressEvent(event); -} - -// virtual -void ClipItem::mouseReleaseEvent(QGraphicsSceneMouseEvent * event) -{ - m_resizeMode = NONE; - QGraphicsRectItem::mouseReleaseEvent(event); -} - +/* //virtual -void ClipItem::hoverEnterEvent(QGraphicsSceneHoverEvent */*e*/) +void ClipItem::hoverEnterEvent(QGraphicsSceneHoverEvent *e) { //if (e->pos().x() < 20) m_hover = true; + return; if (isItemLocked()) return; m_hover = true; QRectF r = boundingRect(); - double width = 35 / projectScene()->scale(); + double width = 35 / projectScene()->scale().x(); double height = r.height() / 2; //WARNING: seems like it generates a full repaint of the clip, maybe not so good... update(r.x(), r.y() + height, width, height); @@ -1044,55 +1063,65 @@ void ClipItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *) if (isItemLocked()) return; m_hover = false; QRectF r = boundingRect(); - double width = 35 / projectScene()->scale(); + double width = 35 / projectScene()->scale().x(); double height = r.height() / 2; //WARNING: seems like it generates a full repaint of the clip, maybe not so good... update(r.x(), r.y() + height, width, height); update(r.right() - width, r.y() + height, width, height); } +*/ -void ClipItem::resizeStart(int posx, double /*speed*/) +void ClipItem::resizeStart(int posx) { const int min = (startPos() - cropStart()).frames(m_fps); if (posx < min) posx = min; if (posx == startPos().frames(m_fps)) return; const int previous = cropStart().frames(m_fps); - AbstractClipItem::resizeStart(posx, m_speed); + AbstractClipItem::resizeStart(posx); + + // set speed independant info + m_speedIndependantInfo = m_info; + m_speedIndependantInfo.cropStart = GenTime((int)(m_info.cropStart.frames(m_fps) * m_speed), m_fps); + m_speedIndependantInfo.cropDuration = GenTime((int)(m_info.cropDuration.frames(m_fps) * m_speed), m_fps); + if ((int) cropStart().frames(m_fps) != previous) { - checkEffectsKeyframesPos(previous, cropStart().frames(m_fps), true); if (m_hasThumbs && KdenliveSettings::videothumbnails()) { - /*connect(m_clip->thumbProducer(), SIGNAL(thumbReady(int, QPixmap)), this, SLOT(slotThumbReady(int, QPixmap)));*/ - startThumbTimer->start(150); + m_startThumbTimer.start(150); } } } -void ClipItem::resizeEnd(int posx, double /*speed*/, bool updateKeyFrames) +void ClipItem::resizeEnd(int posx) { - const int max = (startPos() - cropStart() + maxDuration()).frames(m_fps) + 1; - if (posx > max) posx = max; + 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 = (cropStart() + duration()).frames(m_fps); - AbstractClipItem::resizeEnd(posx, m_speed); - if ((int)(cropStart() + duration()).frames(m_fps) != previous) { - if (updateKeyFrames) checkEffectsKeyframesPos(previous, (cropStart() + duration()).frames(m_fps), false); + 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) * m_speed), m_fps); + m_speedIndependantInfo.cropDuration = GenTime((int)(m_info.cropDuration.frames(m_fps) * 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)));*/ - endThumbTimer->start(150); + m_endThumbTimer.start(150); } } } -void ClipItem::checkEffectsKeyframesPos(const int previous, const int current, bool fromStart) +bool ClipItem::checkEffectsKeyframesPos(const int previous, const int current, bool fromStart) { - for (int i = 0; i < m_effectList.size(); i++) { + bool modified = 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") { + 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; @@ -1101,29 +1130,40 @@ void ClipItem::checkEffectsKeyframesPos(const int previous, const int current, b foreach(const QString &str, keyframes) { pos = str.section(':', 0, 0).toInt(); val = str.section(':', 1, 1).toDouble(); - if (pos == previous) kfr[current] = val; - else { - if (fromStart && pos >= current) kfr[pos] = val; - else if (!fromStart && pos <= current) kfr[pos] = val; + if (pos == previous) { + kfr[current] = val; + modified = true; + } else { + if ((fromStart && pos >= current) || (!fromStart && pos <= current)) { + kfr[pos] = val; + modified = true; + } } } - QString newkfr; - QMap::const_iterator k = kfr.constBegin(); - while (k != kfr.constEnd()) { - newkfr.append(QString::number(k.key()) + ':' + QString::number(k.value()) + ';'); - ++k; + if (modified) { + QString newkfr; + QMap::const_iterator k = kfr.constBegin(); + while (k != kfr.constEnd()) { + newkfr.append(QString::number(k.key()) + ':' + QString::number(k.value()) + ';'); + ++k; + } + e.setAttribute("keyframes", newkfr); + break; } - e.setAttribute("keyframes", newkfr); - break; } } } - if (m_selectedEffect >= 0) setSelectedEffect(m_selectedEffect); + if (modified && m_selectedEffect >= 0) setSelectedEffect(m_selectedEffect); + return modified; } //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(); @@ -1139,12 +1179,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(); @@ -1168,21 +1211,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 || ix < 0) return QDomElement(); + if (ix > m_effectList.count() - 1 || ix < 0 || m_effectList.at(ix).isNull()) return QDomElement(); + return m_effectList.at(ix).cloneNode().toElement(); +} + +QDomElement ClipItem::getEffectAt(int ix) const +{ + if (ix > m_effectList.count() - 1 || ix < 0 || m_effectList.at(ix).isNull()) return QDomElement(); return m_effectList.at(ix); } void ClipItem::setEffectAt(int ix, QDomElement effect) { - kDebug() << "CHange EFFECT AT: " << ix << ", CURR: " << m_effectList.at(ix).attribute("tag") << ", NEW: " << effect.attribute("tag"); + if (ix < 0 || ix > (m_effectList.count() - 1) || effect.isNull()) { + kDebug() << "Invalid effect index: " << ix; + return; + } + //kDebug() << "CHange EFFECT AT: " << ix << ", CURR: " << m_effectList.at(ix).attribute("tag") << ", NEW: " << effect.attribute("tag"); effect.setAttribute("kdenlive_ix", ix + 1); - m_effectList.insert(ix, effect); - m_effectList.removeAt(ix + 1); + m_effectList.replace(ix, 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(boundingRect()); + update(); else { QRectF r = boundingRect(); r.setHeight(20); @@ -1236,24 +1291,27 @@ void ClipItem::setEffectAt(int ix, QDomElement effect) } } -EffectsParameterList ClipItem::addEffect(QDomElement effect, bool animate) +EffectsParameterList ClipItem::addEffect(const QDomElement effect, bool /*animate*/) { - bool needRepaint = false; - /*QDomDocument doc; - doc.appendChild(doc.importNode(effect, true)); - kDebug() << "/////// CLIP ADD EFFECT: " << doc.toString();*/ - m_effectList.append(effect); - + int ix; + if (!effect.hasAttribute("kdenlive_ix")) { + 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); 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("disabled")) parameters.addParam("disabled", effect.attribute("disabled")); - QString state = effect.attribute("disabled"); - if (!state.isEmpty()) { - parameters.addParam("disabled", state); - } QString effectId = effect.attribute("id"); if (effectId.isEmpty()) effectId = effect.attribute("tag"); @@ -1264,18 +1322,28 @@ EffectsParameterList ClipItem::addEffect(QDomElement effect, bool animate) 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")); - } - - double f = e.attribute("factor", "1").toDouble(); - - if (f == 1) { + } else if (e.attribute("factor", "1") == "1") { parameters.addParam(e.attribute("name"), e.attribute("value")); // check if it is a fade effect @@ -1321,45 +1389,62 @@ EffectsParameterList ClipItem::addEffect(QDomElement effect, bool animate) } } } else { - parameters.addParam(e.attribute("name"), QString::number(e.attribute("value").toDouble() / f)); + double fact; + if (e.attribute("factor").startsWith('%')) { + fact = ProfilesDialog::getStringEval(projectScene()->profile(), e.attribute("factor")); + } else fact = e.attribute("factor", "1").toDouble(); + parameters.addParam(e.attribute("name"), QString::number(e.attribute("value").toDouble() / fact)); } } } m_effectNames = m_effectList.effectNames().join(" / "); if (fade > 0) m_startFade = fade; else if (fade < 0) m_endFade = -fade; + + if (m_selectedEffect == -1) { + setSelectedEffect(0); + } else if (m_selectedEffect == ix - 1) setSelectedEffect(m_selectedEffect); if (needRepaint) update(boundingRect()); - if (animate) { + /*if (animate) { flashClip(); - } else if (!needRepaint) { + } */ + else { /*if (!needRepaint) */ QRectF r = boundingRect(); r.setHeight(20); update(r); } - if (m_selectedEffect == -1) { - m_selectedEffect = 0; - setSelectedEffect(m_selectedEffect); - } return parameters; } -EffectsParameterList ClipItem::getEffectArgs(QDomElement effect) +EffectsParameterList ClipItem::getEffectArgs(const QDomElement effect) { EffectsParameterList parameters; parameters.addParam("tag", effect.attribute("tag")); parameters.addParam("kdenlive_ix", effect.attribute("kdenlive_ix")); parameters.addParam("id", effect.attribute("id")); if (effect.hasAttribute("src")) parameters.addParam("src", effect.attribute("src")); - QString state = effect.attribute("disabled"); - if (!state.isEmpty()) { - parameters.addParam("disabled", state); - } + if (effect.hasAttribute("disabled")) parameters.addParam("disabled", effect.attribute("disabled")); 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")); @@ -1375,14 +1460,18 @@ EffectsParameterList ClipItem::getEffectArgs(QDomElement effect) QTextStream txtNeu(&neu); if (values.size() > 0) txtNeu << (int)values[0].toDouble(); - for (int i = 0;i < separators.size() && i + 1 < values.size();i++) { + for (int i = 0; i < separators.size() && i + 1 < values.size(); i++) { txtNeu << separators[i]; txtNeu << (int)(values[i+1].toDouble()); } parameters.addParam("start", neu); } else { if (e.attribute("factor", "1") != "1") { - parameters.addParam(e.attribute("name"), QString::number(e.attribute("value").toDouble() / e.attribute("factor").toDouble())); + double fact; + if (e.attribute("factor").startsWith('%')) { + fact = ProfilesDialog::getStringEval(projectScene()->profile(), e.attribute("factor")); + } else fact = e.attribute("factor", "1").toDouble(); + parameters.addParam(e.attribute("name"), QString::number(e.attribute("value").toDouble() / fact)); } else { parameters.addParam(e.attribute("name"), e.attribute("value")); } @@ -1396,7 +1485,7 @@ void ClipItem::deleteEffect(QString index) bool needRepaint = false; QString ix; - for (int i = 0; i < m_effectList.size(); ++i) { + 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"); @@ -1408,16 +1497,28 @@ void ClipItem::deleteEffect(QString index) (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[i].setAttribute("kdenlive_ix", ix.toInt() - 1); + m_effectList.item(i).setAttribute("kdenlive_ix", ix.toInt() - 1); } } m_effectNames = m_effectList.effectNames().join(" / "); + + if (m_effectList.isEmpty() || m_selectedEffect + 1 == index.toInt()) { + // Current effect was removed + if (index.toInt() > m_effectList.count() - 1) { + setSelectedEffect(m_effectList.count() - 1); + } else setSelectedEffect(index.toInt()); + } if (needRepaint) update(boundingRect()); - flashClip(); + else { + QRectF r = boundingRect(); + r.setHeight(20); + update(r); + } + //if (!m_effectList.isEmpty()) flashClip(); } double ClipItem::speed() const @@ -1425,43 +1526,55 @@ double ClipItem::speed() const return m_speed; } -void ClipItem::setSpeed(const double speed) +int ClipItem::strobe() const +{ + return m_strobe; +} + +void ClipItem::setSpeed(const double speed, const int strobe) { m_speed = speed; + m_strobe = strobe; if (m_speed == 1.0) m_clipName = baseClip()->name(); else m_clipName = baseClip()->name() + " - " + QString::number(speed * 100, 'f', 0) + '%'; + m_info.cropStart = GenTime((int)(m_speedIndependantInfo.cropStart.frames(m_fps) / m_speed + 0.5), m_fps); + m_info.cropDuration = GenTime((int)(m_speedIndependantInfo.cropDuration.frames(m_fps) / m_speed + 0.5), m_fps); //update(); } GenTime ClipItem::maxDuration() const { - return m_maxDuration / m_speed; + return GenTime((int)(m_maxDuration.frames(m_fps) / 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 void ClipItem::dropEvent(QGraphicsSceneDragDropEvent * event) { - QString effects = QString(event->mimeData()->data("kdenlive/effectslist")); + const QString effects = QString(event->mimeData()->data("kdenlive/effectslist")); QDomDocument doc; doc.setContent(effects, true); - QDomElement e = doc.documentElement(); - CustomTrackView *view = (CustomTrackView *) scene()->views()[0]; - if (view) view->slotAddEffect(e, m_startPos, track()); + const QDomElement e = doc.documentElement(); + if (scene() && !scene()->views().isEmpty()) { + event->accept(); + CustomTrackView *view = (CustomTrackView *) scene()->views()[0]; + if (view) view->slotAddEffect(e, m_info.startPos, track()); + } } //virtual @@ -1493,9 +1606,16 @@ void ClipItem::setVideoOnly(bool force) void ClipItem::setAudioOnly(bool force) { m_audioOnly = force; - if (m_audioOnly) setBrush(QColor(141, 215, 166)); - else setBrush(QColor(141, 166, 215)); - audioThumbCachePic.clear(); + if (m_audioOnly) m_baseColor = QColor(141, 215, 166); + 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(); } bool ClipItem::isAudioOnly() const @@ -1509,30 +1629,4 @@ bool ClipItem::isVideoOnly() const } -// virtual -/* -void CustomTrackView::mousePressEvent ( QMouseEvent * event ) -{ - int pos = event->x(); - if (event->modifiers() == Qt::ControlModifier) - setDragMode(QGraphicsView::ScrollHandDrag); - else if (event->modifiers() == Qt::ShiftModifier) - setDragMode(QGraphicsView::RubberBandDrag); - else { - QGraphicsItem * item = itemAt(event->pos()); - if (item) { - } - else emit cursorMoved((int) mapToScene(event->x(), 0).x()); - } - kDebug()<