***************************************************************************/
-
-#include <QPainter>
-#include <QTimer>
-#include <QStyleOptionGraphicsItem>
-#include <QGraphicsScene>
-#include <QGraphicsView>
-#include <QScrollBar>
-#include <QMimeData>
-#include <QApplication>
-
-#include <KDebug>
-
#include "clipitem.h"
#include "customtrackview.h"
#include "customtrackscene.h"
#include "kdenlivesettings.h"
#include "kthumb.h"
+#include <KDebug>
+
+#include <QPainter>
+#include <QTimer>
+#include <QStyleOptionGraphicsItem>
+#include <QGraphicsScene>
+#include <QMimeData>
+
-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()) {
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();
+ 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;
}
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;
}
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));
}
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;
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;
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;
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;
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();
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();
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;
}
}
}
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 {
return m_clipName;
}
+void ClipItem::setClipName(const QString &name) {
+ m_clipName = name;
+}
+
const QString &ClipItem::clipProducer() const {
return m_producer;
}
void ClipItem::paint(QPainter *painter,
const QStyleOptionGraphicsItem *option,
QWidget *) {
- painter->setOpacity(m_opacity);
+ /*if (parentItem()) m_opacity = 0.5;
+ else m_opacity = 1.0;
+ painter->setOpacity(m_opacity);*/
QBrush paintColor = brush();
if (isSelected()) paintColor = QBrush(QColor(79, 93, 121));
QRectF br = rect();
//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);
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);
}
// 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);
OPERATIONTYPE ClipItem::operationMode(QPointF pos) {
+ if (isItemLocked()) return NONE;
+
if (isSelected()) {
m_editedKeyframe = mouseOverKeyFrames(pos);
if (m_editedKeyframe != -1) return KEYFRAME;
//virtual
void ClipItem::hoverEnterEvent(QGraphicsSceneHoverEvent *e) {
//if (e->pos().x() < 20) m_hover = true;
+ if (isItemLocked()) return;
m_hover = true;
QRectF r = boundingRect();
double width = 35 / projectScene()->scale();
//virtual
void ClipItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *) {
+ if (isItemLocked()) return;
m_hover = false;
QRectF r = boundingRect();
double width = 35 / projectScene()->scale();
if (posx == startPos().frames(m_fps)) return;
const int previous = cropStart().frames(m_fps);
AbstractClipItem::resizeStart(posx, m_speed);
- 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(100);
+ 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);
+ }
}
}
//kDebug() << "// NEW POS: " << posx << ", OLD END: " << endPos().frames(m_fps);
const int previous = (cropStart() + duration()).frames(m_fps);
AbstractClipItem::resizeEnd(posx, m_speed);
- 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(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);
+ }
}
}
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 <int, double> 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;
QString newkfr;
QMap<int, double>::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);
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);
sceneShape.translate(newPos);
QList<QGraphicsItem*> 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<QGraphicsItem*> 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<QGraphicsItem*> 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;
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);
}
}
-QHash <QString, QString> ClipItem::addEffect(QDomElement effect, bool animate) {
- QHash <QString, QString> 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));
}
}
}
m_selectedEffect = 0;
setSelectedEffect(m_selectedEffect);
}
- return effectParams;
+ return parameters;
}
-QHash <QString, QString> ClipItem::getEffectArgs(QDomElement effect) {
- QHash <QString, QString> 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]"));
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());
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();
}
//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) {
projects / kdenlive / blobdiff