X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipitem.cpp;h=773a810ab504216c929f683e40f0587b66a49d43;hb=d32938da41916fbc37d6f47c1618b679c0aaf718;hp=e1810bf531c70e07945e43ac498a42cfc7abf695;hpb=26f30bafb1668a975be53463a75e8457abb30095;p=kdenlive diff --git a/src/clipitem.cpp b/src/clipitem.cpp index e1810bf5..773a810a 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -18,18 +18,6 @@ ***************************************************************************/ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include - #include "clipitem.h" #include "customtrackview.h" #include "customtrackscene.h" @@ -39,14 +27,29 @@ #include "kdenlivesettings.h" #include "kthumb.h" +#include +#include + +#include +#include +#include +#include +#include -ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, 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(1.0), framePixelWidth(0), m_startPix(QPixmap()), m_endPix(QPixmap()) { +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); 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); - m_clipName = clip->name(); + m_videoPix = KIcon("video-x-generic").pixmap(QSize(15, 15)); + m_audioPix = KIcon("audio-x-generic").pixmap(QSize(15, 15)); + + if (m_speed == 1.0) m_clipName = clip->name(); + else { + m_clipName = clip->name() + " - " + QString::number(m_speed * 100, 'f', 0) + '%'; + m_cropDuration = m_cropDuration * m_speed; + } m_producer = clip->getId(); m_clipType = clip->clipType(); m_cropStart = info.cropStart; @@ -104,16 +107,16 @@ ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, bool generateTh ClipItem::~ClipItem() { if (startThumbTimer) delete startThumbTimer; if (endThumbTimer) delete endThumbTimer; - if (m_timeLine) m_timeLine; + if (m_timeLine) delete m_timeLine; } ClipItem *ClipItem::clone(ItemInfo info) const { - ClipItem *duplicate = new ClipItem(m_clip, info, m_fps); - if (info.cropStart == cropStart()) duplicate->slotSetStartThumb(m_startPix); + 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()); - duplicate->setSpeed(m_speed); + //duplicate->setSpeed(m_speed); return duplicate; } @@ -139,26 +142,53 @@ void ClipItem::initEffect(QDomElement effect) { 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") { 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(m_cropStart.frames(m_fps)) + ':' + def + ';' + QString::number((m_cropStart + m_cropDuration).frames(m_fps)) + ':' + def); //kDebug() << "///// EFFECT KEYFRAMES INITED: " << e.attribute("keyframes"); break; } } } - if (effect.attribute("tag") == "volume") { - if (effect.attribute("id") == "fadeout") { + 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 start = end - EffectsList::parameter(effect, "in").toInt(); + int start = end; + if (effect.attribute("id") == "fadeout") { + if (m_effectList.hasEffect(QString(), "fade_to_black") == -1) { + start -= EffectsList::parameter(effect, "in").toInt(); + } 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(); + } else { + QDomElement fadeout = m_effectList.getEffectByTag(QString(), "fadeout"); + start -= EffectsList::parameter(fadeout, "out").toInt() - EffectsList::parameter(fadeout, "in").toInt(); + } + } EffectsList::setParameter(effect, "in", QString::number(start)); EffectsList::setParameter(effect, "out", QString::number(end)); - } else if (effect.attribute("id") == "fadein") { + } else if (effect.attribute("id") == "fadein" || effect.attribute("id") == "fade_from_black") { int start = cropStart().frames(m_fps); - int end = start + EffectsList::parameter(effect, "out").toInt(); + int end = start; + if (effect.attribute("id") == "fadein") { + if (m_effectList.hasEffect(QString(), "fade_from_black") == -1) + end += EffectsList::parameter(effect, "out").toInt(); + 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 + end += EffectsList::parameter(m_effectList.getEffectByTag(QString(), "fadein"), "out").toInt(); + } EffectsList::setParameter(effect, "in", QString::number(start)); EffectsList::setParameter(effect, "out", QString::number(end)); } @@ -170,7 +200,7 @@ bool ClipItem::checkKeyFrames() { for (int ix = 0; ix < m_effectList.count(); ix ++) { QString kfr = keyframes(ix); if (!kfr.isEmpty()) { - const QStringList keyframes = kfr.split(";", QString::SkipEmptyParts); + const QStringList keyframes = kfr.split(';', QString::SkipEmptyParts); QStringList newKeyFrames; bool cutKeyFrame = false; bool modified = false; @@ -178,9 +208,9 @@ bool ClipItem::checkKeyFrames() { double lastValue = -1; int start = m_cropStart.frames(m_fps); int end = (m_cropStart + m_cropDuration).frames(m_fps); - foreach(const QString str, keyframes) { - int pos = str.section(":", 0, 0).toInt(); - double val = str.section(":", 1, 1).toDouble(); + foreach(const QString &str, keyframes) { + int pos = str.section(':', 0, 0).toInt(); + double val = str.section(':', 1, 1).toDouble(); if (pos - start < 0) { // a keyframe is defined before the start of the clip cutKeyFrame = true; @@ -190,7 +220,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) + ':' + QString::number(newValue)); modified = true; } cutKeyFrame = false; @@ -202,12 +232,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) + ':' + QString::number(newValue)); modified = true; } break; } else { - newKeyFrames.append(QString::number(pos) + ":" + QString::number(val)); + newKeyFrames.append(QString::number(pos) + ':' + QString::number(val)); } } lastPos = pos; @@ -238,10 +268,10 @@ void ClipItem::setKeyframes(const int ix, const QString keyframes) { 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(); + 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(); @@ -267,10 +297,10 @@ void ClipItem::setSelectedEffect(const int ix) { 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(); + 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(); @@ -310,10 +340,8 @@ void ClipItem::updateKeyframeEffect() { QString keyframes; if (m_keyframes.count() > 1) { QMap::const_iterator i = m_keyframes.constBegin(); - double x1; - double y1; while (i != m_keyframes.constEnd()) { - keyframes.append(QString::number(i.key()) + ":" + QString::number(i.value()) + ";"); + keyframes.append(QString::number(i.key()) + ':' + QString::number(i.value()) + ';'); ++i; } } @@ -427,14 +455,22 @@ void ClipItem::slotThumbReady(int frame, QPixmap pix) { } } -void ClipItem::slotSetStartThumb(QPixmap pix) { +void ClipItem::slotSetStartThumb(const QPixmap pix) { m_startPix = pix; } -void ClipItem::slotSetEndThumb(QPixmap pix) { +void ClipItem::slotSetEndThumb(const QPixmap pix) { m_endPix = pix; } +QPixmap ClipItem::startThumb() const { + return m_startPix; +} + +QPixmap ClipItem::endThumb() const { + return m_endPix; +} + void ClipItem::slotGotAudioData() { audioThumbReady = true; if (m_clipType == AV) { @@ -453,7 +489,9 @@ DocClipBase *ClipItem::baseClip() const { } QDomElement ClipItem::xml() const { - return m_clip->toXML(); + QDomElement xml = m_clip->toXML(); + if (m_speed != 1.0) xml.setAttribute("speed", m_speed); + return xml; } int ClipItem::clipType() const { @@ -464,6 +502,10 @@ QString ClipItem::clipName() const { return m_clipName; } +void ClipItem::setClipName(const QString &name) { + m_clipName = name; +} + const QString &ClipItem::clipProducer() const { return m_producer; } @@ -477,7 +519,7 @@ void ClipItem::flashClip() { m_timeLine->start(); } -void ClipItem::animate(qreal value) { +void ClipItem::animate(qreal /*value*/) { QRectF r = boundingRect(); r.setHeight(20); update(r); @@ -487,9 +529,13 @@ void ClipItem::animate(qreal value) { void ClipItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *) { - painter->setOpacity(m_opacity); - QBrush paintColor = brush(); - if (isSelected()) paintColor = QBrush(QColor(79, 93, 121)); + /*if (parentItem()) m_opacity = 0.5; + else m_opacity = 1.0; + painter->setOpacity(m_opacity);*/ + QBrush paintColor; + if (parentItem()) paintColor = QBrush(QColor(255, 248, 149)); + else paintColor = brush(); + if (isSelected() || parentItem() && parentItem()->isSelected()) paintColor = QBrush(paintColor.color().darker()); QRectF br = rect(); QRectF exposed = option->exposedRect; QRectF mapped = painter->matrix().mapRect(br); @@ -507,7 +553,7 @@ void ClipItem::paint(QPainter *painter, //build path around clip //QPainterPath resultClipPath = roundRectPathUpper.united(roundRectPathLower); //painter->fillPath(resultClipPath, paintColor); - painter->fillRect(br, paintColor); + painter->fillRect(exposed, paintColor); //painter->setClipPath(resultClipPath, Qt::IntersectClip); @@ -586,7 +632,6 @@ void ClipItem::paint(QPainter *painter, QList < CommentedTime >::Iterator it = markers.begin(); GenTime pos; double framepos; - const int markerwidth = 4; QBrush markerBrush; markerBrush = QBrush(QColor(120, 120, 0, 140)); QPen pen = painter->pen(); @@ -606,7 +651,7 @@ void ClipItem::paint(QPainter *painter, 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() + " "); + const QRectF txtBounding = painter->boundingRect(r2, Qt::AlignLeft | Qt::AlignTop, ' ' + (*it).comment() + ' '); QPainterPath path; path.addRoundedRect(txtBounding, 3, 3); @@ -672,10 +717,16 @@ void ClipItem::paint(QPainter *painter, } // Draw clip name - QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignHCenter | Qt::AlignVCenter, " " + m_clipName + " "); + + QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignHCenter | Qt::AlignVCenter, ' ' + m_clipName + ' '); painter->fillRect(txtBounding, QBrush(QColor(0, 0, 0, 150))); //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); @@ -691,12 +742,10 @@ void ClipItem::paint(QPainter *painter, // draw frame around clip - if (isSelected()) { + if (isSelected() || parentItem() && parentItem()->isSelected()) { pen.setColor(Qt::red); - //pen.setWidth(2); } else { pen.setColor(Qt::black); - //pen.setWidth(1); } // draw effect or transition keyframes @@ -705,9 +754,6 @@ void ClipItem::paint(QPainter *painter, painter->setMatrixEnabled(true); // draw clip border - - //kDebug()<<"/// ITEM PAINTING:: exposed="<thumbProducer(), SIGNAL(thumbReady(int, QPixmap)), this, SLOT(slotThumbReady(int, QPixmap)));*/ - endThumbTimer->start(100); + if ((int)(cropStart() + duration()).frames(m_fps) != previous) { + if (updateKeyFrames) checkEffectsKeyframesPos(previous, (cropStart() + duration()).frames(m_fps), false); + if (m_hasThumbs && KdenliveSettings::videothumbnails()) { + /*connect(m_clip->thumbProducer(), SIGNAL(thumbReady(int, QPixmap)), this, SLOT(slotThumbReady(int, QPixmap)));*/ + endThumbTimer->start(150); + } } } @@ -974,13 +1026,13 @@ void ClipItem::checkEffectsKeyframesPos(const int previous, const int current, b QDomElement e = params.item(i).toElement(); if (e.attribute("type") == "keyframe") { // parse keyframes and adjust values - const QStringList keyframes = e.attribute("keyframes").split(";", QString::SkipEmptyParts); + const QStringList keyframes = e.attribute("keyframes").split(';', QString::SkipEmptyParts); QMap kfr; int pos; double val; - foreach(const QString str, keyframes) { - pos = str.section(":", 0, 0).toInt(); - val = str.section(":", 1, 1).toDouble(); + 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; @@ -990,7 +1042,7 @@ void ClipItem::checkEffectsKeyframesPos(const int previous, const int current, b QString newkfr; QMap::const_iterator k = kfr.constBegin(); while (k != kfr.constEnd()) { - newkfr.append(QString::number(k.key()) + ":" + QString::number(k.value()) + ";"); + newkfr.append(QString::number(k.key()) + ':' + QString::number(k.value()) + ';'); ++k; } e.setAttribute("keyframes", newkfr); @@ -1005,9 +1057,9 @@ void ClipItem::checkEffectsKeyframesPos(const int previous, const int current, b QVariant ClipItem::itemChange(GraphicsItemChange change, const QVariant &value) { if (change == ItemPositionChange && scene()) { // calculate new position. - if (group()) return pos(); + //if (parentItem()) return pos(); QPointF newPos = value.toPointF(); - kDebug() << "/// MOVING CLIP ITEM.------------\n++++++++++"; + //kDebug() << "/// MOVING CLIP ITEM.------------\n++++++++++"; int xpos = projectScene()->getSnapPointForPos((int) newPos.x(), KdenliveSettings::snaptopoints()); xpos = qMax(xpos, 0); newPos.setX(xpos); @@ -1020,38 +1072,40 @@ QVariant ClipItem::itemChange(GraphicsItemChange change, const QVariant &value) sceneShape.translate(newPos); QList 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)->type() == type()) { // Collision! QPointF otherPos = items.at(i)->pos(); - if ((int) otherPos.y() != (int) pos().y()) return pos(); - if (pos().x() < otherPos.x()) { - // move clip just before colliding clip - int npos = (static_cast < AbstractClipItem* >(items.at(i))->startPos() - m_cropDuration).frames(m_fps); - // check we don't run into another clip - newPos.setX(npos); - sceneShape = rect(); - sceneShape.translate(newPos); - QList subitems = scene()->items(sceneShape, Qt::IntersectsItemShape); - items.removeAll(this); - for (int j = 0; j < subitems.count(); j++) { - if (subitems.at(j)->type() == type()) return pos(); - } + if ((int) otherPos.y() != (int) pos().y()) { + return pos(); + } + if (forwardMove) { + offset = qMax(offset, (int)(newPos.x() - (static_cast < AbstractClipItem* >(items.at(i))->startPos() - cropDuration()).frames(m_fps))); } else { - // get pos just after colliding clip - int npos = static_cast < AbstractClipItem* >(items.at(i))->endPos().frames(m_fps); - // check we don't run into another clip - newPos.setX(npos); - sceneShape = rect(); - sceneShape.translate(newPos); + offset = qMax(offset, (int)((static_cast < AbstractClipItem* >(items.at(i))->endPos().frames(m_fps)) - newPos.x())); + } + + if (offset > 0) { + if (forwardMove) { + sceneShape.translate(QPointF(-offset, 0)); + newPos.setX(newPos.x() - offset); + } else { + sceneShape.translate(QPointF(offset, 0)); + newPos.setX(newPos.x() + offset); + } QList subitems = scene()->items(sceneShape, Qt::IntersectsItemShape); - items.removeAll(this); + subitems.removeAll(this); for (int j = 0; j < subitems.count(); j++) { - if (subitems.at(j)->type() == type()) return pos(); + if (subitems.at(j)->type() == type()) { + m_startPos = GenTime((int) pos().x(), m_fps); + return pos(); + } } } + m_track = newTrack; m_startPos = GenTime((int) newPos.x(), m_fps); return newPos; @@ -1097,7 +1151,9 @@ void ClipItem::setEffectAt(int ix, QDomElement effect) { m_effectList.insert(ix, effect); m_effectList.removeAt(ix + 1); m_effectNames = m_effectList.effectNames().join(" / "); - if (effect.attribute("id") == "fadein" || effect.attribute("id") == "fadeout") update(boundingRect()); + QString id = effect.attribute("id"); + if (id == "fadein" || id == "fadeout" || id == "fade_from_black" || id == "fade_to_black") + update(boundingRect()); else { QRectF r = boundingRect(); r.setHeight(20); @@ -1105,50 +1161,91 @@ void ClipItem::setEffectAt(int ix, QDomElement effect) { } } -QHash ClipItem::addEffect(QDomElement effect, bool animate) { - QHash effectParams; +EffectsParameterList ClipItem::addEffect(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); - effectParams["tag"] = effect.attribute("tag"); + + 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")); + + QString state = effect.attribute("disabled"); + if (!state.isEmpty()) { + parameters.addParam("disabled", state); + } + QString effectId = effect.attribute("id"); if (effectId.isEmpty()) effectId = effect.attribute("tag"); - effectParams["id"] = effectId; - effectParams["kdenlive_ix"] = effect.attribute("kdenlive_ix"); - QString state = effect.attribute("disabled"); - if (!state.isEmpty()) effectParams["disabled"] = state; + parameters.addParam("id", effectId); + QDomNodeList params = effect.elementsByTagName("parameter"); int fade = 0; for (int i = 0; i < params.count(); i++) { QDomElement e = params.item(i).toElement(); if (!e.isNull()) { if (e.attribute("type") == "keyframe") { - effectParams["keyframes"] = e.attribute("keyframes"); - effectParams["min"] = e.attribute("min"); - effectParams["max"] = e.attribute("max"); - effectParams["factor"] = e.attribute("factor", "1"); - effectParams["starttag"] = e.attribute("starttag", "start"); - effectParams["endtag"] = e.attribute("endtag", "end"); + 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) { - effectParams[e.attribute("name")] = e.attribute("value"); + parameters.addParam(e.attribute("name"), e.attribute("value")); + // check if it is a fade effect if (effectId == "fadein") { needRepaint = true; - if (e.attribute("name") == "out") fade += e.attribute("value").toInt(); - else if (e.attribute("name") == "in") fade -= e.attribute("value").toInt(); + if (m_effectList.hasEffect(QString(), "fade_from_black") == -1) { + if (e.attribute("name") == "out") fade += e.attribute("value").toInt(); + else if (e.attribute("name") == "in") fade -= e.attribute("value").toInt(); + } else { + QDomElement fadein = m_effectList.getEffectByTag(QString(), "fade_from_black"); + if (fadein.attribute("name") == "out") fade += fadein.attribute("value").toInt(); + else if (fadein.attribute("name") == "in") fade -= fadein.attribute("value").toInt(); + } + } else if (effectId == "fade_from_black") { + needRepaint = true; + if (m_effectList.hasEffect(QString(), "fadein") == -1) { + if (e.attribute("name") == "out") fade += e.attribute("value").toInt(); + else if (e.attribute("name") == "in") fade -= e.attribute("value").toInt(); + } else { + QDomElement fadein = m_effectList.getEffectByTag(QString(), "fadein"); + if (fadein.attribute("name") == "out") fade += fadein.attribute("value").toInt(); + else if (fadein.attribute("name") == "in") fade -= fadein.attribute("value").toInt(); + } } else if (effectId == "fadeout") { needRepaint = true; - if (e.attribute("name") == "out") fade -= e.attribute("value").toInt(); - else if (e.attribute("name") == "in") fade += e.attribute("value").toInt(); + if (m_effectList.hasEffect(QString(), "fade_to_black") == -1) { + if (e.attribute("name") == "out") fade -= e.attribute("value").toInt(); + else if (e.attribute("name") == "in") fade += e.attribute("value").toInt(); + } else { + QDomElement fadeout = m_effectList.getEffectByTag(QString(), "fade_to_black"); + if (fadeout.attribute("name") == "out") fade -= fadeout.attribute("value").toInt(); + else if (fadeout.attribute("name") == "in") fade += fadeout.attribute("value").toInt(); + } + } else if (effectId == "fade_to_black") { + needRepaint = true; + if (m_effectList.hasEffect(QString(), "fadeout") == -1) { + if (e.attribute("name") == "out") fade -= e.attribute("value").toInt(); + else if (e.attribute("name") == "in") fade += e.attribute("value").toInt(); + } else { + QDomElement fadeout = m_effectList.getEffectByTag(QString(), "fadeout"); + if (fadeout.attribute("name") == "out") fade -= fadeout.attribute("value").toInt(); + else if (fadeout.attribute("name") == "in") fade += fadeout.attribute("value").toInt(); + } } } else { - effectParams[e.attribute("name")] = QString::number(e.attribute("value").toDouble() / f); + parameters.addParam(e.attribute("name"), QString::number(e.attribute("value").toDouble() / f)); } } } @@ -1167,29 +1264,33 @@ QHash ClipItem::addEffect(QDomElement effect, bool animate) { m_selectedEffect = 0; setSelectedEffect(m_selectedEffect); } - return effectParams; + return parameters; } -QHash ClipItem::getEffectArgs(QDomElement effect) { - QHash effectParams; - effectParams["tag"] = effect.attribute("tag"); - effectParams["kdenlive_ix"] = effect.attribute("kdenlive_ix"); - effectParams["id"] = effect.attribute("id"); +EffectsParameterList ClipItem::getEffectArgs(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()) effectParams["disabled"] = state; + if (!state.isEmpty()) { + parameters.addParam("disabled", state); + } + 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") { kDebug() << "/ / / /SENDING KEYFR EFFECT TYPE"; - effectParams["keyframes"] = e.attribute("keyframes"); - effectParams["max"] = e.attribute("max"); - effectParams["min"] = e.attribute("min"); - effectParams["factor"] = e.attribute("factor", "1"); - effectParams["starttag"] = e.attribute("starttag", "start"); - effectParams["endtag"] = e.attribute("endtag", "end"); - } else if (e.attribute("namedesc").contains(";")) { + parameters.addParam("keyframes", e.attribute("keyframes")); + parameters.addParam("max", e.attribute("max")); + parameters.addParam("min", e.attribute("min")); + parameters.addParam("factor", e.attribute("factor", "1")); + parameters.addParam("starttag", e.attribute("starttag", "start")); + parameters.addParam("endtag", e.attribute("endtag", "end")); + } else if (e.attribute("namedesc").contains(';')) { QString format = e.attribute("format"); QStringList separators = format.split("%d", QString::SkipEmptyParts); QStringList values = e.attribute("value").split(QRegExp("[,:;x]")); @@ -1201,31 +1302,40 @@ QHash ClipItem::getEffectArgs(QDomElement effect) { txtNeu << separators[i]; txtNeu << (int)(values[i+1].toDouble()); } - effectParams["start"] = neu; + parameters.addParam("start", neu); } else { - if (e.attribute("factor", "1") != "1") - effectParams[e.attribute("name")] = QString::number(e.attribute("value").toDouble() / e.attribute("factor").toDouble()); - else effectParams[e.attribute("name")] = e.attribute("value"); + if (e.attribute("factor", "1") != "1") { + parameters.addParam(e.attribute("name"), QString::number(e.attribute("value").toDouble() / e.attribute("factor").toDouble())); + } else { + parameters.addParam(e.attribute("name"), e.attribute("value")); + } } } - return effectParams; + return parameters; } void ClipItem::deleteEffect(QString index) { bool needRepaint = false; QString ix; + for (int i = 0; i < m_effectList.size(); ++i) { ix = m_effectList.at(i).attribute("kdenlive_ix"); if (ix == index) { - if (m_effectList.at(i).attribute("id") == "fadein") { + 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 (m_effectList.at(i).attribute("id") == "fadeout") { + } else if ((effectId == "fadeout" && hasEffect(QString(), "fade_to_black") == -1) || + (effectId == "fade_to_black" && hasEffect(QString(), "fadeout") == -1)) { m_endFade = 0; needRepaint = true; } m_effectList.removeAt(i); - } else if (ix.toInt() > index.toInt()) m_effectList[i].setAttribute("kdenlive_ix", ix.toInt() - 1); + i--; + } else if (ix.toInt() > index.toInt()) { + m_effectList[i].setAttribute("kdenlive_ix", ix.toInt() - 1); + } } m_effectNames = m_effectList.effectNames().join(" / "); if (needRepaint) update(boundingRect()); @@ -1239,7 +1349,7 @@ double ClipItem::speed() const { void ClipItem::setSpeed(const double speed) { m_speed = speed; if (m_speed == 1.0) m_clipName = baseClip()->name(); - else m_clipName = baseClip()->name() + " - " + QString::number(speed * 100, 'f', 0) + "%"; + else m_clipName = baseClip()->name() + " - " + QString::number(speed * 100, 'f', 0) + '%'; //update(); } @@ -1271,19 +1381,39 @@ void ClipItem::dropEvent(QGraphicsSceneDragDropEvent * event) { //virtual void ClipItem::dragEnterEvent(QGraphicsSceneDragDropEvent *event) { - event->setAccepted(event->mimeData()->hasFormat("kdenlive/effectslist")); + if (isItemLocked()) event->setAccepted(false); + else event->setAccepted(event->mimeData()->hasFormat("kdenlive/effectslist")); } void ClipItem::dragLeaveEvent(QGraphicsSceneDragDropEvent *event) { Q_UNUSED(event); } + void ClipItem::addTransition(Transition* t) { m_transitionsList.append(t); - CustomTrackView *view = (CustomTrackView *) scene()->views()[0]; + //CustomTrackView *view = (CustomTrackView *) scene()->views()[0]; QDomDocument doc; QDomElement e = doc.documentElement(); //if (view) view->slotAddTransition(this, t->toXML() , t->startPos(), track()); } + +void ClipItem::setVideoOnly(bool force) { + m_videoOnly = force; +} + +void ClipItem::setAudioOnly(bool force) { + m_audioOnly = force; +} + +bool ClipItem::isAudioOnly() const { + return m_audioOnly; +} + +bool ClipItem::isVideoOnly() const { + return m_videoOnly; +} + + // virtual /* void CustomTrackView::mousePressEvent ( QMouseEvent * event )