#include "kthumb.h"
ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, GenTime cropStart, double scale, double fps)
- : AbstractClipItem(info, QRectF(), fps), m_clip(clip), m_resizeMode(NONE), m_grabPoint(0), m_maxTrack(0), m_hasThumbs(false), startThumbTimer(NULL), endThumbTimer(NULL), m_effectsCounter(1), audioThumbWasDrawn(false), m_opacity(1.0), m_timeLine(0), m_thumbsRequested(0), m_startFade(0), m_endFade(0), m_hover(false) {
+ : AbstractClipItem(info, QRectF(), fps), m_clip(clip), m_resizeMode(NONE), m_grabPoint(0), m_maxTrack(0), m_hasThumbs(false), startThumbTimer(NULL), endThumbTimer(NULL), m_effectsCounter(1), audioThumbWasDrawn(false), m_opacity(1.0), m_timeLine(0), m_thumbsRequested(0), m_startFade(0), m_endFade(0), m_hover(false), m_selectedEffect(-1) {
QRectF rect((double) info.startPos.frames(fps) * scale, (double)(info.track * KdenliveSettings::trackheight() + 1), (double)(info.endPos - info.startPos).frames(fps) * scale, (double)(KdenliveSettings::trackheight() - 1));
setRect(rect);
m_producer = clip->getId();
m_clipType = clip->clipType();
m_cropStart = cropStart;
-
m_maxDuration = clip->maxDuration();
setAcceptDrops(true);
audioThumbReady = clip->audioThumbCreated();
+
/*
m_cropStart = xml.attribute("in", 0).toInt();
m_maxDuration = xml.attribute("duration", 0).toInt();
if (endThumbTimer) delete endThumbTimer;
}
+int ClipItem::selectedEffectIndex() const {
+ return m_selectedEffect;
+}
+
+void ClipItem::initEffect(QDomElement effect) {
+ // 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
+ 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") {
+ 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);
+ //kDebug() << "///// EFFECT KEYFRAMES INITED: " << e.attribute("keyframes");
+ break;
+ }
+ }
+ }
+}
+
+void ClipItem::setKeyframes(const int ix, const QString keyframes) {
+ QDomElement effect = effectAt(ix);
+ QDomNodeList params = effect.elementsByTagName("parameter");
+ for (int i = 0; i < params.count(); i++) {
+ QDomElement e = params.item(i).toElement();
+ if (!e.isNull() && e.attribute("type") == "keyframe") {
+ e.setAttribute("keyframes", keyframes);
+ if (ix == m_selectedEffect) {
+ 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
+ QStringList keyframes = e.attribute("keyframes").split(";", QString::SkipEmptyParts);
+ foreach(QString str, keyframes) {
+ int pos = str.section(":", 0, 0).toInt();
+ double val = str.section(":", 1, 1).toDouble();
+ m_keyframes[pos] = val;
+ }
+ update();
+ return;
+ }
+ break;
+ }
+ }
+
+}
+
+
+void ClipItem::setSelectedEffect(const int ix) {
+ m_selectedEffect = ix;
+ QDomElement effect = effectAt(m_selectedEffect);
+ 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") {
+ 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
+ QStringList keyframes = e.attribute("keyframes").split(";", QString::SkipEmptyParts);
+ foreach(QString str, keyframes) {
+ int pos = str.section(":", 0, 0).toInt();
+ double val = str.section(":", 1, 1).toDouble();
+ m_keyframes[pos] = val;
+ }
+ update();
+ return;
+ }
+ }
+ if (!m_keyframes.isEmpty()) {
+ m_keyframes.clear();
+ update();
+ }
+}
+
+QString ClipItem::keyframes(const int index) {
+ QString result;
+ QDomElement effect = effectAt(index);
+ QDomNodeList params = effect.elementsByTagName("parameter");
+
+ for (int i = 0; i < params.count(); i++) {
+ QDomElement e = params.item(i).toElement();
+ if (!e.isNull() && e.attribute("type") == "keyframe") {
+ result = e.attribute("keyframes");
+ break;
+ }
+ }
+ return result;
+}
+
+void ClipItem::updateKeyframeEffect() {
+ // regenerate xml parameter from the clip keyframes
+ QDomElement effect = effectAt(m_selectedEffect);
+ 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") {
+ QString keyframes;
+ if (m_keyframes.count() > 1) {
+ QMap<int, double>::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()) + ";");
+ ++i;
+ }
+ }
+ // Effect has a keyframe type parameter, we need to set the values
+ //kDebug() << "::::::::::::::: SETTING EFFECT KEYFRAMES: " << keyframes;
+ e.setAttribute("keyframes", keyframes);
+ break;
+ }
+ }
+}
+
+QDomElement ClipItem::selectedEffect() {
+ if (m_selectedEffect == -1 || m_effectList.isEmpty()) return QDomElement();
+ return effectAt(m_selectedEffect);
+}
+
void ClipItem::resetThumbs() {
slotFetchThumbs();
audioThumbCachePic.clear();
void ClipItem::slotThumbReady(int frame, QPixmap pix) {
if (m_thumbsRequested == 0) return;
if (frame == m_cropStart.frames(m_fps)) {
- m_startPix = pix;
- QRectF r = boundingRect();
- r.setRight(pix.width() + 2);
- update(r);
- }
- else {
- m_endPix = pix;
- QRectF r = boundingRect();
- r.setLeft(r.right() - pix.width() - 2);
- update(r);
- }
+ m_startPix = pix;
+ QRectF r = boundingRect();
+ r.setRight(pix.width() + 2);
+ update(r);
+ } else {
+ m_endPix = pix;
+ QRectF r = boundingRect();
+ r.setLeft(r.right() - pix.width() - 2);
+ update(r);
+ }
m_thumbsRequested--;
}
void ClipItem::slotGotAudioData() {
audioThumbReady = true;
- if (m_clipType == AV) {
- QRectF r = boundingRect();
- r.setTop(r.top() + r.height() / 2 - 1);
- update(r);
- }
- else update();
+ if (m_clipType == AV) {
+ QRectF r = boundingRect();
+ r.setTop(r.top() + r.height() / 2 - 1);
+ update(r);
+ } else update();
}
int ClipItem::type() const {
return AVWIDGET;
}
-DocClipBase *ClipItem::baseClip() {
+DocClipBase *ClipItem::baseClip() const {
return m_clip;
}
return m_clip->toXML();
}
-int ClipItem::clipType() {
+int ClipItem::clipType() const {
return m_clipType;
}
-QString ClipItem::clipName() {
+QString ClipItem::clipName() const {
return m_clipName;
}
-int ClipItem::clipProducer() {
+int ClipItem::clipProducer() const {
return m_producer;
}
void ClipItem::flashClip() {
if (m_timeLine == 0) {
- m_timeLine = new QTimeLine(750, this);
- m_timeLine->setCurveShape(QTimeLine::EaseInOutCurve);
- connect(m_timeLine, SIGNAL(valueChanged(qreal)), this, SLOT(animate(qreal)));
- }
+ m_timeLine = new QTimeLine(750, this);
+ m_timeLine->setCurveShape(QTimeLine::EaseInOutCurve);
+ connect(m_timeLine, SIGNAL(valueChanged(qreal)), this, SLOT(animate(qreal)));
+ }
m_timeLine->start();
}
void ClipItem::animate(qreal value) {
- QRectF r = boundingRect();
- r.setHeight(20);
- update(r);
+ QRectF r = boundingRect();
+ r.setHeight(20);
+ update(r);
}
// virtual
void ClipItem::paint(QPainter *painter,
const QStyleOptionGraphicsItem *option,
- QWidget *widget) {
+ QWidget *) {
painter->setOpacity(m_opacity);
QBrush paintColor = brush();
if (isSelected()) paintColor = QBrush(QColor(79, 93, 121));
QRectF br = rect();
double scale = br.width() / m_cropDuration.frames(m_fps);
- // kDebug()<<"/// EXPOSED RECT: "<<option->exposedRect.x()<<" X "<<option->exposedRect.right();
- painter->setClipRect(option->exposedRect);
+ // kDebug()<<"/// EXPOSED RECT: "<<option->exposedRect.x()<<" X "<<option->exposedRect.right();
+
int startpixel = (int)option->exposedRect.x() - rect().x();
if (startpixel < 0)
//painter->setRenderHints(QPainter::Antialiasing);
QPainterPath roundRectPathUpper = upperRectPart(br), roundRectPathLower = lowerRectPart(br);
-
+ painter->setClipRect(option->exposedRect);
// build path around clip
QPainterPath resultClipPath = roundRectPathUpper.united(roundRectPathLower);
painter->fillPath(resultClipPath, paintColor);
+ painter->setClipPath(resultClipPath, Qt::IntersectClip);
// draw thumbnails
if (!m_startPix.isNull() && KdenliveSettings::videothumbnails()) {
if (m_clipType == IMAGE) {
- painter->drawPixmap(QPointF(br.x() + br.width() - m_startPix.width(), br.y()), m_startPix);
- QLineF l(br.x() + br.width() - m_startPix.width(), br.y(), br.x() + br.width() - m_startPix.width(), br.y() + br.height());
+ painter->drawPixmap(QPointF(br.right() - m_startPix.width(), br.y()), m_startPix);
+ QLine l(br.right() - m_startPix.width(), br.y(), br.right() - m_startPix.width(), br.y() + br.height());
painter->drawLine(l);
} else {
- painter->drawPixmap(QPointF(br.x() + br.width() - m_endPix.width(), br.y()), m_endPix);
- QLineF l(br.x() + br.width() - m_endPix.width(), br.y(), br.x() + br.width() - m_endPix.width(), br.y() + br.height());
+ painter->drawPixmap(QPointF(br.right() - m_endPix.width(), br.y()), m_endPix);
+ QLine l(br.right() - m_endPix.width(), br.y(), br.right() - m_endPix.width(), br.y() + br.height());
painter->drawLine(l);
}
painter->drawPixmap(QPointF(br.x(), br.y()), m_startPix);
- QLineF l2(br.x() + m_startPix.width(), br.y(), br.x() + m_startPix.width(), br.y() + br.height());
+ QLine l2(br.x() + m_startPix.width(), br.y(), br.x() + m_startPix.width(), br.y() + br.height());
painter->drawLine(l2);
}
// draw audio thumbnails
- if (KdenliveSettings::audiothumbnails() && ((m_clipType == AV && option->exposedRect.height() > br.height() / 2) || m_clipType == AUDIO) && audioThumbReady) {
+ if (KdenliveSettings::audiothumbnails() && ((m_clipType == AV && option->exposedRect.bottom() > br.height() / 2) || m_clipType == AUDIO) && audioThumbReady) {
QPainterPath path = m_clipType == AV ? roundRectPathLower : resultClipPath;
if (m_clipType == AV) painter->fillPath(path, QBrush(QColor(200, 200, 200, 140)));
pen.setStyle(Qt::SolidLine);
painter->setPen(pen);
-
// draw start / end fades
QBrush fades;
if (isSelected()) {
fadeInPath.lineTo(br.x() , br.bottom());
fadeInPath.lineTo(br.x() + m_startFade * scale, br.y());
fadeInPath.closeSubpath();
- painter->fillPath(fadeInPath.intersected(resultClipPath), fades);
+ painter->fillPath(fadeInPath/*.intersected(resultClipPath)*/, fades);
if (isSelected()) {
QLineF l(br.x() + m_startFade * scale, br.y(), br.x(), br.bottom());
painter->drawLine(l);
fadeOutPath.lineTo(br.right(), br.bottom());
fadeOutPath.lineTo(br.right() - m_endFade * scale, br.y());
fadeOutPath.closeSubpath();
- painter->fillPath(fadeOutPath.intersected(resultClipPath), fades);
+ painter->fillPath(fadeOutPath/*.intersected(resultClipPath)*/, fades);
if (isSelected()) {
QLineF l(br.right() - m_endFade * scale, br.y(), br.x() + br.width(), br.bottom());
painter->drawLine(l);
} else markerBrush.setColor(QColor(50, 50, 50, 150));
QPainterPath path;
path.addRoundedRect(txtBounding, 4, 4);
- painter->fillPath(path.intersected(resultClipPath), markerBrush);
+ painter->fillPath(path/*.intersected(resultClipPath)*/, markerBrush);
painter->drawText(txtBounding, Qt::AlignCenter, m_effectNames);
painter->setPen(Qt::black);
}
pen.setColor(Qt::black);
//pen.setWidth(1);
}
+
+
+ // draw effect or transition keyframes
+ if (br.width() > 20) drawKeyFrames(painter, option->exposedRect);
+
+ // draw clip border
+ painter->setClipRect(option->exposedRect);
painter->setPen(pen);
//painter->setClipRect(option->exposedRect);
painter->drawPath(resultClipPath);
OPERATIONTYPE ClipItem::operationMode(QPointF pos, double scale) {
- if (qAbs((int)(pos.x() - (rect().x() + scale * m_startFade))) < 6 && qAbs((int)(pos.y() - rect().y())) < 6) return FADEIN;
- else if (qAbs((int)(pos.x() - rect().x())) < 6) return RESIZESTART;
- else if (qAbs((int)(pos.x() - (rect().x() + rect().width() - scale * m_endFade))) < 6 && qAbs((int)(pos.y() - rect().y())) < 6) return FADEOUT;
- else if (qAbs((int)(pos.x() - (rect().x() + rect().width()))) < 6) return RESIZEEND;
- else if (qAbs((int)(pos.x() - (rect().x() + 16))) < 10 && qAbs((int)(pos.y() - (rect().y() + rect().height() / 2 + 5))) < 8) return TRANSITIONSTART;
- else if (qAbs((int)(pos.x() - (rect().x() + rect().width() - 21))) < 10 && qAbs((int)(pos.y() - (rect().y() + rect().height() / 2 + 5))) < 8) return TRANSITIONEND;
-
+ if (isSelected()) {
+ m_editedKeyframe = mouseOverKeyFrames(pos);
+ if (m_editedKeyframe != -1) return KEYFRAME;
+ }
+ if (qAbs((int)(pos.x() - (rect().x() + scale * m_startFade))) < 6 && qAbs((int)(pos.y() - rect().y())) < 6) {
+ if (m_startFade == 0) setToolTip(i18n("Add audio fade"));
+ else setToolTip(i18n("Audio fade duration: %1s", GenTime(m_startFade, m_fps).seconds()));
+ return FADEIN;
+ } else if (qAbs((int)(pos.x() - rect().x())) < 6) {
+ setToolTip(i18n("Crop from start: %1s", cropStart().seconds()));
+ return RESIZESTART;
+ } else if (qAbs((int)(pos.x() - (rect().x() + rect().width() - scale * m_endFade))) < 6 && qAbs((int)(pos.y() - rect().y())) < 6) {
+ if (m_endFade == 0) setToolTip(i18n("Add audio fade"));
+ 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()))) < 6) {
+ setToolTip(i18n("Clip duration: %1s", duration().seconds()));
+ return RESIZEEND;
+ } else if (qAbs((int)(pos.x() - (rect().x() + 16))) < 10 && qAbs((int)(pos.y() - (rect().y() + rect().height() / 2 + 5))) < 8) {
+ setToolTip(i18n("Add transition"));
+ return TRANSITIONSTART;
+ } else if (qAbs((int)(pos.x() - (rect().x() + rect().width() - 21))) < 10 && qAbs((int)(pos.y() - (rect().y() + rect().height() / 2 + 5))) < 8) {
+ setToolTip(i18n("Add transition"));
+ return TRANSITIONEND;
+ }
+ setToolTip(QString());
return MOVE;
}
-QList <GenTime> ClipItem::snapMarkers() {
+QList <GenTime> ClipItem::snapMarkers() const {
QList < GenTime > snaps;
QList < GenTime > markers = baseClip()->snapMarkers();
GenTime pos;
//virtual
void ClipItem::hoverEnterEvent(QGraphicsSceneHoverEvent *) {
m_hover = true;
- QRectF r = boundingRect();
- qreal width = qMin(25.0, r.width());
+ QRectF r = boundingRect();
+ qreal width = qMin(25.0, r.width());
update(r.x(), r.y(), width, r.height());
update(r.right() - width, r.y(), width, r.height());
}
//virtual
void ClipItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *) {
m_hover = false;
- QRectF r = boundingRect();
- qreal width = qMin(25.0, r.width());
+ QRectF r = boundingRect();
+ qreal width = qMin(25.0, r.width());
update(r.x(), r.y(), width, r.height());
update(r.right() - width, r.y(), width, r.height());
}
void ClipItem::resizeStart(int posx, double scale) {
+ const int previous = cropStart().frames(m_fps);
AbstractClipItem::resizeStart(posx, scale);
- if (m_hasThumbs) startThumbTimer->start(100);
+ checkEffectsKeyframesPos(previous, cropStart().frames(m_fps), true);
+ if (m_hasThumbs && KdenliveSettings::videothumbnails()) startThumbTimer->start(100);
}
void ClipItem::resizeEnd(int posx, double scale) {
+ const int previous = (cropStart() + duration()).frames(m_fps);
AbstractClipItem::resizeEnd(posx, scale);
- if (m_hasThumbs) endThumbTimer->start(100);
+ checkEffectsKeyframesPos(previous, (cropStart() + duration()).frames(m_fps), false);
+ if (m_hasThumbs && KdenliveSettings::videothumbnails()) endThumbTimer->start(100);
+}
+
+
+void ClipItem::checkEffectsKeyframesPos(const int previous, const int current, bool fromStart) {
+ for (int i = 0; i < m_effectList.size(); 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") {
+ // parse keyframes and adjust values
+ QStringList keyframes = e.attribute("keyframes").split(";", QString::SkipEmptyParts);
+ QMap <int, double> kfr;
+ foreach(QString str, keyframes) {
+ int pos = str.section(":", 0, 0).toInt();
+ double 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;
+ }
+ }
+ QString newkfr;
+ QMap<int, double>::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;
+ }
+ }
+ }
+ if (m_selectedEffect >= 0) setSelectedEffect(m_selectedEffect);
}
+
// virtual
-void ClipItem::mouseMoveEvent(QGraphicsSceneMouseEvent * event) {
-}
+/*void ClipItem::mouseMoveEvent(QGraphicsSceneMouseEvent * event) {
+}*/
int ClipItem::effectsCounter() {
return m_effectsCounter++;
}
QDomElement ClipItem::effectAt(int ix) {
+ if (ix > m_effectList.count() - 1 || ix < 0) return QDomElement();
return m_effectList.at(ix);
}
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());
- else {
- QRectF r = boundingRect();
- r.setHeight(20);
- update(r);
- }
+ if (effect.attribute("id") == "fadein" || effect.attribute("id") == "fadeout") update(boundingRect());
+ else {
+ QRectF r = boundingRect();
+ r.setHeight(20);
+ update(r);
+ }
}
QMap <QString, QString> ClipItem::addEffect(QDomElement effect, bool animate) {
QMap <QString, QString> effectParams;
- bool needRepaint = false;
+ bool needRepaint = false;
/*QDomDocument doc;
doc.appendChild(doc.importNode(effect, true));
kDebug() << "/////// CLIP ADD EFFECT: "<< doc.toString();*/
for (int i = 0; i < params.count(); i++) {
QDomElement e = params.item(i).toElement();
if (!e.isNull()) {
- if (e.attribute("factor").isEmpty()) {
+ 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");
+ }
+
+ double f = e.attribute("factor", "1").toDouble();
+
+ if (f == 1) {
effectParams[e.attribute("name")] = e.attribute("value");
// check if it is a fade effect
if (effectId == "fadein") {
- needRepaint = true;
+ needRepaint = true;
if (e.attribute("name") == "out") fade += e.attribute("value").toInt();
else if (e.attribute("name") == "in") fade -= e.attribute("value").toInt();
} else if (effectId == "fadeout") {
- needRepaint = true;
+ needRepaint = true;
if (e.attribute("name") == "out") fade -= e.attribute("value").toInt();
else if (e.attribute("name") == "in") fade += e.attribute("value").toInt();
}
} else {
- effectParams[e.attribute("name")] = QString::number(effectParams[e.attribute("name")].toDouble() / e.attribute("factor").toDouble());
+ effectParams[e.attribute("name")] = QString::number(effectParams[e.attribute("name")].toDouble() / f);
}
}
}
m_effectNames = m_effectList.effectNames().join(" / ");
if (fade > 0) m_startFade = fade;
else if (fade < 0) m_endFade = -fade;
- if (needRepaint) update(boundingRect());
+ if (needRepaint) update(boundingRect());
if (animate) {
flashClip();
} else if (!needRepaint) {
- QRectF r = boundingRect();
- r.setHeight(20);
- update(r);
- }
+ QRectF r = boundingRect();
+ r.setHeight(20);
+ update(r);
+ }
+ if (m_selectedEffect == -1) {
+ m_selectedEffect = 0;
+ setSelectedEffect(m_selectedEffect);
+ }
return effectParams;
}
QDomNodeList params = effect.elementsByTagName("parameter");
for (int i = 0; i < params.count(); i++) {
QDomElement e = params.item(i).toElement();
- if (e.attribute("namedesc").contains(";")) {
+ 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(";")) {
QString format = e.attribute("format");
QStringList separators = format.split("%d", QString::SkipEmptyParts);
QStringList values = e.attribute("value").split(QRegExp("[,:;x]"));
txtNeu << (int)(values[i+1].toDouble());
}
effectParams["start"] = neu;
- } else if (!e.isNull()) {
- if (!e.attribute("factor").isEmpty())
- effectParams[e.attribute("name")] = QString::number(effectParams[e.attribute("name")].toDouble() / e.attribute("factor").toDouble());
+ } 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");
}
}
}
void ClipItem::deleteEffect(QString index) {
- bool needRepaint = false;
+ bool needRepaint = false;
for (int i = 0; i < m_effectList.size(); ++i) {
if (m_effectList.at(i).attribute("kdenlive_ix") == index) {
if (m_effectList.at(i).attribute("id") == "fadein") {
- m_startFade = 0;
- needRepaint = true;
- }
- else if (m_effectList.at(i).attribute("id") == "fadeout") {
- m_endFade = 0;
- needRepaint = true;
- }
+ m_startFade = 0;
+ needRepaint = true;
+ } else if (m_effectList.at(i).attribute("id") == "fadeout") {
+ m_endFade = 0;
+ needRepaint = true;
+ }
m_effectList.removeAt(i);
break;
}
}
m_effectNames = m_effectList.effectNames().join(" / ");
- if (needRepaint) update(boundingRect());
+ if (needRepaint) update(boundingRect());
flashClip();
}
projects / kdenlive / blobdiff