#include "kdenlivesettings.h"
#include "kthumb.h"
#include "profilesdialog.h"
+#ifdef USE_QJSON
+#include "rotoscoping/rotowidget.h"
+#endif
#include <KDebug>
#include <KIcon>
#include <QGraphicsScene>
#include <QMimeData>
-ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, int strobe, bool generateThumbs) :
+static int FRAME_SIZE;
+
+ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, int strobe, int frame_width, bool generateThumbs) :
AbstractClipItem(info, QRectF(), fps),
m_clip(clip),
m_startFade(0),
//m_hover(false),
m_speed(speed),
m_strobe(strobe),
- m_framePixelWidth(0)
+ m_framePixelWidth(0),
+ m_limitedKeyFrames(false)
{
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);
+ m_effectList = EffectsList(true);
+ FRAME_SIZE = frame_width;
+ setRect(0, 0, (info.endPos - info.startPos).frames(fps) - 0.02, (double) itemHeight());
+ setPos(info.startPos.frames(fps), (double)(info.track * KdenliveSettings::trackheight()) + 1 + itemOffset());
// set speed independant info
if (m_speed <= 0 && m_speed > -1)
setAcceptDrops(true);
m_audioThumbReady = m_clip->audioThumbCreated();
//setAcceptsHoverEvents(true);
- connect(this , SIGNAL(prepareAudioThumb(double, int, int, int)) , this, SLOT(slotPrepareAudioThumb(double, int, int, int)));
+ connect(this , SIGNAL(prepareAudioThumb(double, int, int, int, int)) , this, SLOT(slotPrepareAudioThumb(double, int, int, int, int)));
if (m_clipType == VIDEO || m_clipType == AV || m_clipType == SLIDESHOW || m_clipType == PLAYLIST) {
m_baseColor = QColor(141, 166, 215);
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 == IMAGE || m_clipType == TEXT) {
m_baseColor = QColor(141, 166, 215);
if (m_clipType == TEXT) {
- connect(this, SIGNAL(getThumb(int, int)), m_clip->thumbProducer(), SLOT(extractImage(int, int)));
connect(m_clip->thumbProducer(), SIGNAL(thumbReady(int, QImage)), this, SLOT(slotThumbReady(int, QImage)));
}
//m_startPix = KThumb::getImage(KUrl(clip->getProperty("resource")), (int)(KdenliveSettings::trackheight() * KdenliveSettings::project_display_ratio()), KdenliveSettings::trackheight());
ClipItem::~ClipItem()
{
blockSignals(true);
+ m_endThumbTimer.stop();
+ m_startThumbTimer.stop();
if (scene()) scene()->removeItem(this);
if (m_clipType == VIDEO || m_clipType == AV || m_clipType == SLIDESHOW || m_clipType == PLAYLIST) {
//disconnect(m_clip->thumbProducer(), SIGNAL(thumbReady(int, QImage)), this, SLOT(slotThumbReady(int, QImage)));
ClipItem *ClipItem::clone(ItemInfo info) const
{
- ClipItem *duplicate = new ClipItem(m_clip, info, m_fps, m_speed, m_strobe);
+ ClipItem *duplicate = new ClipItem(m_clip, info, m_fps, m_speed, m_strobe, FRAME_SIZE);
if (m_clipType == IMAGE || m_clipType == TEXT) duplicate->slotSetStartThumb(m_startPix);
else if (m_clipType != COLOR) {
if (info.cropStart == m_info.cropStart) duplicate->slotSetStartThumb(m_startPix);
- if (info.cropStart + (info.endPos - info.startPos) == m_info.cropStart + (m_info.endPos - m_info.startPos)) duplicate->slotSetEndThumb(m_endPix);
+ if (info.cropStart + (info.endPos - info.startPos) == m_info.cropStart + m_info.cropDuration) {
+ duplicate->slotSetEndThumb(m_endPix);
+ }
}
//kDebug() << "// CLoning clip: " << (info.cropStart + (info.endPos - info.startPos)).frames(m_fps) << ", CURRENT end: " << (cropStart() + duration()).frames(m_fps);
duplicate->setEffectList(m_effectList);
m_effectNames = m_effectList.effectNames().join(" / ");
if (!m_effectList.isEmpty()) {
for (int i = 0; i < m_effectList.count(); i++) {
- QString effectId = m_effectList.item(i).attribute("id");
+ QDomElement effect = m_effectList.at(i);
+ QString effectId = effect.attribute("id");
// check if it is a fade effect
- QDomNodeList params = m_effectList.item(i).elementsByTagName("parameter");
+ QDomNodeList params = effect.elementsByTagName("parameter");
int fade = 0;
for (int j = 0; j < params.count(); j++) {
QDomElement e = params.item(j).toElement();
}
} else if (effectId == "fadeout") {
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();
+ 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();
+ 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") {
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();
+ 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();
+ if (fadeout.attribute("name") == "out") fade += fadeout.attribute("value").toInt();
+ else if (fadeout.attribute("name") == "in") fade -= fadeout.attribute("value").toInt();
}
}
}
return m_selectedEffect;
}
-void ClipItem::initEffect(QDomElement effect, int diff)
+void ClipItem::initEffect(QDomElement effect, int diff, int offset)
{
// the kdenlive_ix int is used to identify an effect in mlt's playlist, should
// not be changed
- if (effect.attribute("kdenlive_ix").toInt() == 0)
- effect.setAttribute("kdenlive_ix", QString::number(effectsCounter()));
if (effect.attribute("id") == "freeze" && diff > 0) {
EffectsList::setParameter(effect, "frame", QString::number(diff));
QDomNodeList params = effect.elementsByTagName("parameter");
for (int i = 0; i < params.count(); i++) {
QDomElement e = params.item(i).toElement();
- kDebug() << "// init eff: " << e.attribute("name");
+
+ if (e.isNull())
+ continue;
// Check if this effect has a variable parameter
- if (e.attribute("default").startsWith('%')) {
+ if (e.attribute("default").contains('%')) {
double evaluatedValue = ProfilesDialog::getStringEval(projectScene()->profile(), e.attribute("default"));
e.setAttribute("default", evaluatedValue);
if (e.hasAttribute("value") && e.attribute("value").startsWith('%')) {
}
}
- 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(cropStart().frames(m_fps)) + ':' + def);
- kDebug() << "///// EFFECT KEYFRAMES INITED: " << e.attribute("keyframes");
- //break;
- }
+ if (effect.attribute("id") == "crop") {
+ // default use_profile to 1 for clips with proxies to avoid problems when rendering
+ if (e.attribute("name") == "use_profile" && !(m_clip->getProperty("proxy").isEmpty() || m_clip->getProperty("proxy") == "-"))
+ e.setAttribute("value", "1");
}
+
+ if (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe") {
+ if (e.attribute("keyframes").isEmpty()) {
+ // Effect has a keyframe type parameter, we need to set the values
+ e.setAttribute("keyframes", QString::number(cropStart().frames(m_fps)) + ':' + e.attribute("default"));
+ }
+ else if (offset != 0) {
+ // adjust keyframes to this clip
+ QString adjusted = adjustKeyframes(e.attribute("keyframes"), offset - cropStart().frames(m_fps));
+ e.setAttribute("keyframes", adjusted);
+ }
+ }
+
+ if (e.attribute("type") == "geometry" && !e.hasAttribute("fixed")) {
+ // Effects with a geometry parameter need to sync in / out with parent clip
+ effect.setAttribute("in", QString::number(cropStart().frames(m_fps)));
+ effect.setAttribute("out", QString::number((cropStart() + cropDuration()).frames(m_fps) - 1));
+ effect.setAttribute("_sync_in_out", "1");
+ }
}
if (effect.attribute("tag") == "volume" || effect.attribute("tag") == "brightness") {
if (effect.attribute("id") == "fadeout" || effect.attribute("id") == "fade_to_black") {
int start = end;
if (effect.attribute("id") == "fadeout") {
if (m_effectList.hasEffect(QString(), "fade_to_black") == -1) {
- int effectDuration = EffectsList::parameter(effect, "in").toInt();
+ int effectDuration = EffectsList::parameter(effect, "out").toInt() - EffectsList::parameter(effect, "in").toInt();
if (effectDuration > cropDuration().frames(m_fps)) {
effectDuration = cropDuration().frames(m_fps) / 2;
}
}
} else if (effect.attribute("id") == "fade_to_black") {
if (m_effectList.hasEffect(QString(), "fadeout") == -1) {
- int effectDuration = EffectsList::parameter(effect, "in").toInt();
+ int effectDuration = EffectsList::parameter(effect, "out").toInt() - EffectsList::parameter(effect, "in").toInt();
if (effectDuration > cropDuration().frames(m_fps)) {
effectDuration = cropDuration().frames(m_fps) / 2;
}
if (effect.attribute("id") == "fadein") {
if (m_effectList.hasEffect(QString(), "fade_from_black") == -1) {
int effectDuration = EffectsList::parameter(effect, "out").toInt();
+ if (offset != 0) effectDuration -= offset;
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();
+ end += EffectsList::parameter(m_effectList.getEffectByTag(QString(), "fade_from_black"), "out").toInt() - offset;
} else if (effect.attribute("id") == "fade_from_black") {
if (m_effectList.hasEffect(QString(), "fadein") == -1) {
int effectDuration = EffectsList::parameter(effect, "out").toInt();
+ if (offset != 0) effectDuration -= offset;
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();
+ end += EffectsList::parameter(m_effectList.getEffectByTag(QString(), "fadein"), "out").toInt() - offset;
}
EffectsList::setParameter(effect, "in", QString::number(start));
EffectsList::setParameter(effect, "out", QString::number(end));
}
}
+const QString ClipItem::adjustKeyframes(QString keyframes, int offset)
+{
+ QStringList result;
+ // Simple keyframes
+ const QStringList list = keyframes.split(';', QString::SkipEmptyParts);
+ foreach(const QString &keyframe, list) {
+ int pos = keyframe.section(':', 0, 0).toInt() - offset;
+ QString newKey = QString::number(pos) + ":" + keyframe.section(':', 1);
+ result.append(newKey);
+ }
+ return result.join(";");
+}
+
bool ClipItem::checkKeyFrames()
{
bool clipEffectsModified = false;
+ QLocale locale;
// go through all effects this clip has
for (int ix = 0; ix < m_effectList.count(); ++ix) {
QStringList keyframeParams = keyframes(ix);
// go through all keyframes for one param
foreach(const QString &str, keyframes) {
int pos = str.section(':', 0, 0).toInt();
- double val = str.section(':', 1, 1).toDouble();
+ double val = locale.toDouble(str.section(':', 1, 1));
if (pos - start < 0) {
// a keyframe is defined before the start of the clip
cutKeyFrame = true;
int diff = pos - lastPos;
double ratio = (double)(start - lastPos) / diff;
double newValue = lastValue + (val - lastValue) * ratio;
- newKeyFrames.append(QString::number(start) + ':' + QString::number(newValue));
+ newKeyFrames.append(QString::number(start) + ':' + locale.toString(newValue));
modified = true;
}
cutKeyFrame = false;
if (diff != 0) {
double ratio = (double)(end - lastPos) / diff;
double newValue = lastValue + (val - lastValue) * ratio;
- newKeyFrames.append(QString::number(end) + ':' + QString::number(newValue));
+ newKeyFrames.append(QString::number(end) + ':' + locale.toString(newValue));
modified = true;
}
break;
} else {
- newKeyFrames.append(QString::number(pos) + ':' + QString::number(val));
+ newKeyFrames.append(QString::number(pos) + ':' + locale.toString(val));
}
}
lastPos = pos;
void ClipItem::setKeyframes(const int ix, const QStringList keyframes)
{
- QDomElement effect = getEffectAt(ix);
+ QDomElement effect = m_effectList.at(ix);
if (effect.attribute("disable") == "1") return;
+ QLocale locale;
QDomNodeList params = effect.elementsByTagName("parameter");
int keyframeParams = 0;
for (int i = 0; i < params.count(); i++) {
if (ix == m_selectedEffect && keyframeParams == 0) {
m_keyframes.clear();
m_visibleParam = i;
- double max = e.attribute("max").toDouble();
- double min = e.attribute("min").toDouble();
+ double max = locale.toDouble(e.attribute("max"));
+ double min = locale.toDouble(e.attribute("min"));
m_keyframeFactor = 100.0 / (max - min);
m_keyframeOffset = min;
- m_keyframeDefault = e.attribute("default").toDouble();
+ m_keyframeDefault = locale.toDouble(e.attribute("default"));
m_selectedKeyframe = 0;
// parse keyframes
const QStringList keyframes = e.attribute("keyframes").split(';', QString::SkipEmptyParts);
foreach(const QString &str, keyframes) {
int pos = str.section(':', 0, 0).toInt();
- double val = str.section(':', 1, 1).toDouble();
+ double val = locale.toDouble(str.section(':', 1, 1));
m_keyframes[pos] = val;
}
if (m_keyframes.find(m_editedKeyframe) == m_keyframes.end()) m_editedKeyframe = -1;
void ClipItem::setSelectedEffect(const int ix)
{
m_selectedEffect = ix;
- QDomElement effect = effectAt(m_selectedEffect);
- if (effect.isNull() == false) {
+ QLocale locale;
+ QDomElement effect = effectAtIndex(m_selectedEffect);
+ if (!effect.isNull() && effect.attribute("disable") != "1") {
QDomNodeList params = effect.elementsByTagName("parameter");
- if (effect.attribute("disable") != "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") && e.attribute("intimeline") == "1") {
- m_keyframes.clear();
- m_visibleParam = i;
- double max = e.attribute("max").toDouble();
- double min = e.attribute("min").toDouble();
- m_keyframeFactor = 100.0 / (max - min);
- m_keyframeOffset = min;
- m_keyframeDefault = e.attribute("default").toDouble();
- m_selectedKeyframe = 0;
-
- // parse keyframes
- const QStringList keyframes = e.attribute("keyframes").split(';', QString::SkipEmptyParts);
- foreach(const QString &str, keyframes) {
- int pos = str.section(':', 0, 0).toInt();
- double val = str.section(':', 1, 1).toDouble();
- m_keyframes[pos] = val;
- }
- if (m_keyframes.find(m_editedKeyframe) == m_keyframes.end()) m_editedKeyframe = -1;
- update();
- return;
+ for (int i = 0; i < params.count(); i++) {
+ QDomElement e = params.item(i).toElement();
+ if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe") && e.attribute("intimeline") == "1") {
+ m_keyframes.clear();
+ m_limitedKeyFrames = e.attribute("type") == "keyframe";
+ m_visibleParam = i;
+ double max = locale.toDouble(e.attribute("max"));
+ double min = locale.toDouble(e.attribute("min"));
+ m_keyframeFactor = 100.0 / (max - min);
+ m_keyframeOffset = min;
+ m_keyframeDefault = locale.toDouble(e.attribute("default"));
+ m_selectedKeyframe = 0;
+
+ // parse keyframes
+ const QStringList keyframes = e.attribute("keyframes").split(';', QString::SkipEmptyParts);
+ foreach(const QString &str, keyframes) {
+ int pos = str.section(':', 0, 0).toInt();
+ double val = locale.toDouble(str.section(':', 1, 1));
+ m_keyframes[pos] = val;
}
+ if (m_keyframes.find(m_editedKeyframe) == m_keyframes.end())
+ m_editedKeyframe = -1;
+ update();
+ return;
}
+ }
}
+
if (!m_keyframes.isEmpty()) {
m_keyframes.clear();
update();
QStringList ClipItem::keyframes(const int index)
{
QStringList result;
- QDomElement effect = effectAt(index);
+ QDomElement effect = m_effectList.at(index);
QDomNodeList params = effect.elementsByTagName("parameter");
for (int i = 0; i < params.count(); i++) {
void ClipItem::updateKeyframeEffect()
{
// regenerate xml parameter from the clip keyframes
- QDomElement effect = getEffectAt(m_selectedEffect);
+ QDomElement effect = getEffectAtIndex(m_selectedEffect);
if (effect.attribute("disable") == "1") return;
QDomNodeList params = effect.elementsByTagName("parameter");
QDomElement e = params.item(m_visibleParam).toElement();
QDomElement ClipItem::selectedEffect()
{
if (m_selectedEffect == -1 || m_effectList.isEmpty()) return QDomElement();
- return effectAt(m_selectedEffect);
+ return effectAtIndex(m_selectedEffect);
}
void ClipItem::resetThumbs(bool clearExistingThumbs)
}
-void ClipItem::refreshClip(bool checkDuration)
+void ClipItem::refreshClip(bool checkDuration, bool forceResetThumbs)
{
if (checkDuration && (m_maxDuration != m_clip->maxDuration())) {
m_maxDuration = m_clip->maxDuration();
colour = colour.replace(0, 2, "#");
m_baseColor = QColor(colour.left(7));
update();
- } else resetThumbs(checkDuration);
+ } else resetThumbs(forceResetThumbs);
}
void ClipItem::slotFetchThumbs()
return;
}
- if (m_endPix.isNull() && m_startPix.isNull()) {
+ QList <int> frames;
+ if (m_startPix.isNull()) {
m_startThumbRequested = true;
+ frames.append((int)m_speedIndependantInfo.cropStart.frames(m_fps));
+ }
+
+ if (m_endPix.isNull()) {
m_endThumbRequested = true;
- emit getThumb((int)m_speedIndependantInfo.cropStart.frames(m_fps), (int)(m_speedIndependantInfo.cropStart + m_speedIndependantInfo.cropDuration).frames(m_fps) - 1);
- } else {
- if (m_endPix.isNull()) {
- slotGetEndThumb();
- }
- if (m_startPix.isNull()) {
- slotGetStartThumb();
- }
+ frames.append((int)(m_speedIndependantInfo.cropStart + m_speedIndependantInfo.cropDuration).frames(m_fps) - 1);
}
+
+ if (!frames.isEmpty()) m_clip->slotExtractImage(frames);
+}
+
+void ClipItem::stopThumbs()
+{
+ // Clip is about to be deleted, make sure we don't request thumbnails
+ disconnect(&m_startThumbTimer, SIGNAL(timeout()), this, SLOT(slotGetStartThumb()));
+ disconnect(&m_endThumbTimer, SIGNAL(timeout()), this, SLOT(slotGetEndThumb()));
}
void ClipItem::slotGetStartThumb()
{
m_startThumbRequested = true;
- emit getThumb((int)m_speedIndependantInfo.cropStart.frames(m_fps), -1);
+ m_clip->slotExtractImage(QList<int>() << (int)m_speedIndependantInfo.cropStart.frames(m_fps));
}
void ClipItem::slotGetEndThumb()
{
m_endThumbRequested = true;
- emit getThumb(-1, (int)(m_speedIndependantInfo.cropStart + m_speedIndependantInfo.cropDuration).frames(m_fps) - 1);
+ m_clip->slotExtractImage(QList<int>() << (int)(m_speedIndependantInfo.cropStart + m_speedIndependantInfo.cropDuration).frames(m_fps) - 1);
}
const QStyleOptionGraphicsItem *option,
QWidget *)
{
+ QPalette palette = scene()->palette();
QColor paintColor;
+ QColor textColor;
+ QColor textBgColor;
+ QPen framePen;
if (parentItem()) paintColor = QColor(255, 248, 149);
else paintColor = m_baseColor;
- if (isSelected() || (parentItem() && parentItem()->isSelected())) paintColor = paintColor.darker();
-
- painter->setMatrixEnabled(false);
- const QRectF mapped = painter->matrix().mapRect(rect()).adjusted(0.5, 0, 0.5, 0);
+ if (isSelected() || (parentItem() && parentItem()->isSelected())) {
+ textColor = palette.highlightedText().color();
+ textBgColor = palette.highlight().color();
+ paintColor = paintColor.darker();
+ framePen.setColor(textBgColor);
+ }
+ else {
+ textColor = palette.text().color();
+ textBgColor = palette.window().color();
+ textBgColor.setAlpha(200);
+ framePen.setColor(paintColor.darker());
+ }
const QRectF exposed = option->exposedRect;
- painter->setClipRect(mapped);
- painter->fillRect(mapped, paintColor);
-
+ const QRectF mappedExposed = painter->worldTransform().mapRect(exposed);
+ const QRectF mapped = painter->worldTransform().mapRect(rect());
+ painter->setWorldMatrixEnabled(false);
+ QPainterPath p;
+ p.addRect(mappedExposed);
+ QPainterPath q;
+ q.addRoundedRect(mapped, 3, 3);
+ painter->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform, false);
+ painter->setClipPath(p.intersected(q));
+ painter->setPen(Qt::NoPen);
+ painter->fillRect(mappedExposed, paintColor);
+ painter->setPen(paintColor.darker());
// draw thumbnails
if (KdenliveSettings::videothumbnails() && !isAudioOnly()) {
- QPen pen = painter->pen();
- pen.setColor(QColor(255, 255, 255, 150));
- painter->setPen(pen);
+ QRectF thumbRect;
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);
+ if (thumbRect.isNull()) thumbRect = QRectF(0, 0, mapped.height() / m_startPix.height() * m_startPix.width(), mapped.height());
+ thumbRect.moveTopRight(mapped.topRight());
+ painter->drawPixmap(thumbRect, m_startPix, m_startPix.rect());
+ //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()) {
- 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 (thumbRect.isNull()) thumbRect = QRectF(0, 0, mapped.height() / m_endPix.height() * m_endPix.width(), mapped.height());
+ thumbRect.moveTopRight(mapped.topRight());
+ painter->drawPixmap(thumbRect, m_endPix, m_endPix.rect());
+ //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()) {
- 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);
+ if (thumbRect.isNull()) thumbRect = QRectF(0, 0, mapped.height() / m_startPix.height() * m_startPix.width(), mapped.height());
+ thumbRect.moveTopLeft(mapped.topLeft());
+ painter->drawPixmap(thumbRect, m_startPix, m_startPix.rect());
+ //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);
}
- if (painter->matrix().m11() == FRAME_SIZE) {
+
+ // if we are in full zoom, paint thumbnail for every frame
+ if (m_clip->thumbProducer() && clipType() != COLOR && clipType() != AUDIO && !m_audioOnly && painter->worldTransform().m11() == FRAME_SIZE) {
int offset = (m_info.startPos - m_info.cropStart).frames(m_fps);
- int left = qMax((int) m_info.startPos.frames(m_fps) + 1, (int) mapToScene(exposed.left(), 0).x());
- int right = qMin((int)(m_info.startPos + m_info.cropDuration).frames(m_fps) - 1, (int) mapToScene(exposed.right(), 0).x());
- doGetIntraThumbs(painter, mapped.topLeft(), m_info.cropStart.frames(m_fps), left - offset, right - offset);
+ int left = qMax((int) m_info.cropStart.frames(m_fps) + 1, (int) mapToScene(exposed.left(), 0).x() - offset);
+ int right = qMin((int)(m_info.cropStart + m_info.cropDuration).frames(m_fps) - 1, (int) mapToScene(exposed.right(), 0).x() - offset);
+ QPointF startPos = mapped.topLeft();
+ int startOffset = m_info.cropStart.frames(m_fps);
+ if (clipType() == IMAGE || clipType() == TEXT) {
+ for (int i = left; i <= right; i++) {
+ painter->drawPixmap(startPos + QPointF(FRAME_SIZE *(i - startOffset), 0), m_startPix);
+ }
+ }
+ else {
+#if KDE_IS_VERSION(4,5,0)
+ if (m_clip && m_clip->thumbProducer()) {
+ QString path = m_clip->fileURL().path() + '_';
+ QImage img;
+ QPen pen(Qt::white);
+ pen.setStyle(Qt::DotLine);
+ QList <int> missing;
+ for (int i = left; i <= right; i++) {
+ img = m_clip->thumbProducer()->findCachedThumb(path + QString::number(i));
+ QPointF xpos = startPos + QPointF(FRAME_SIZE *(i - startOffset), 0);
+ if (img.isNull()) missing << i;
+ else {
+ painter->drawImage(xpos, img);
+ }
+ painter->drawLine(xpos, xpos + QPointF(0, mapped.height()));
+ }
+ if (!missing.isEmpty()) {
+ m_clip->thumbProducer()->queryIntraThumbs(missing);
+ connect(m_clip->thumbProducer(), SIGNAL(thumbsCached()), this, SLOT(slotGotThumbsCache()));
+ }
+ }
+#endif
+ }
}
- painter->setPen(Qt::black);
}
-
// draw audio thumbnails
if (KdenliveSettings::audiothumbnails() && m_speed == 1.0 && !isVideoOnly() && ((m_clipType == AV && (exposed.bottom() > (rect().height() / 2) || isAudioOnly())) || m_clipType == AUDIO) && m_audioThumbReady) {
mappedRect.setTop(mappedRect.bottom() - mapped.height() / 2);
} else mappedRect = mapped;
- double scale = painter->matrix().m11();
+ double scale = painter->worldTransform().m11();
int channels = 0;
if (isEnabled() && m_clip) channels = m_clip->getProperty("channels").toInt();
if (scale != m_framePixelWidth)
m_audioThumbCachePic.clear();
double cropLeft = m_info.cropStart.frames(m_fps);
const int clipStart = mappedRect.x();
- const int mappedStartPixel = painter->matrix().map(QPointF(startpixel + cropLeft, 0)).x() - clipStart;
- const int mappedEndPixel = painter->matrix().map(QPointF(endpixel + cropLeft, 0)).x() - clipStart;
+ const int mappedStartPixel = painter->worldTransform().map(QPointF(startpixel + cropLeft, 0)).x() - clipStart;
+ const int mappedEndPixel = painter->worldTransform().map(QPointF(endpixel + cropLeft, 0)).x() - clipStart;
cropLeft = cropLeft * scale;
-
if (channels >= 1) {
- emit prepareAudioThumb(scale, mappedStartPixel, mappedEndPixel, channels);
+ emit prepareAudioThumb(scale, mappedStartPixel, mappedEndPixel, channels, (int) (mappedRect.height() + 0.5));
}
-
+ QRectF pixmapRect(0, mappedRect.y(), 100, mappedRect.height());
for (int startCache = mappedStartPixel - (mappedStartPixel) % 100; startCache < mappedEndPixel; startCache += 100) {
- if (m_audioThumbCachePic.contains(startCache) && !m_audioThumbCachePic[startCache].isNull())
- painter->drawPixmap(clipStart + startCache - cropLeft, mappedRect.y(), m_audioThumbCachePic[startCache]);
+ if (!m_audioThumbCachePic.value(startCache).isNull()) {
+ //painter->drawPixmap(clipStart + startCache - cropLeft, mappedRect.y(), m_audioThumbCachePic.value(startCache));
+ QPixmap pix(m_audioThumbCachePic.value(startCache));
+ pixmapRect.moveLeft(clipStart + startCache - cropLeft);
+ painter->drawPixmap(pixmapRect, pix, pix.rect());
+ }
}
}
-
- // 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);
+
+ if (m_isMainSelectedClip) {
+ framePen.setColor(Qt::red);
+ textBgColor = 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
- if (isEnabled() && m_clip) {
- QList < CommentedTime > markers = m_clip->commentedSnapMarkers();
- QList < CommentedTime >::Iterator it = markers.begin();
- GenTime pos;
- double framepos;
- QBrush markerBrush(QColor(120, 120, 0, 140));
- QPen pen = painter->pen();
- pen.setColor(QColor(255, 255, 255, 200));
- pen.setStyle(Qt::DotLine);
-
- for (; it != markers.end(); ++it) {
- pos = GenTime((int)((*it).time().frames(m_fps) / qAbs(m_speed) + 0.5), m_fps) - cropStart();
- if (pos > GenTime()) {
- if (pos > cropDuration()) break;
- QLineF l(rect().x() + pos.frames(m_fps), rect().y(), rect().x() + pos.frames(m_fps), rect().bottom());
- QLineF l2 = painter->matrix().map(l);
- painter->setPen(pen);
- painter->drawLine(l2);
- if (KdenliveSettings::showmarkers()) {
- framepos = rect().x() + pos.frames(m_fps);
- const QRectF r1(framepos + 0.04, 10, rect().width() - framepos - 2, rect().height() - 10);
- const QRectF r2 = painter->matrix().mapRect(r1);
- const QRectF txtBounding3 = painter->boundingRect(r2, Qt::AlignLeft | Qt::AlignTop, ' ' + (*it).comment() + ' ');
- painter->setBrush(markerBrush);
- painter->setPen(Qt::NoPen);
- painter->drawRoundedRect(txtBounding3, 3, 3);
- painter->setBrush(QBrush(Qt::NoBrush));
- painter->setPen(Qt::white);
- painter->drawText(txtBounding3, Qt::AlignCenter, (*it).comment());
+ // only paint details if clip is big enough
+ if (mapped.width() > 20) {
+
+ // Draw effects names
+ if (!m_effectNames.isEmpty() && mapped.width() > 40) {
+ QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignLeft | Qt::AlignTop, m_effectNames);
+ QColor bColor = palette.window().color();
+ QColor tColor = palette.text().color();
+ tColor.setAlpha(220);
+ if (m_timeLine && m_timeLine->state() == QTimeLine::Running) {
+ qreal value = m_timeLine->currentValue();
+ txtBounding.setWidth(txtBounding.width() * value);
+ bColor.setAlpha(100 + 50 * value);
+ };
+
+ painter->setBrush(bColor);
+ painter->setPen(Qt::NoPen);
+ painter->drawRoundedRect(txtBounding.adjusted(-1, -2, 4, -1), 3, 3);
+ painter->setPen(tColor);
+ painter->drawText(txtBounding.adjusted(2, 0, 1, -1), Qt::AlignCenter, m_effectNames);
+ }
+
+ // Draw clip name
+ const QRectF txtBounding2 = painter->boundingRect(mapped, Qt::AlignRight | Qt::AlignTop, m_clipName + ' ').adjusted(0, -1, 0, -1);
+ painter->setPen(Qt::NoPen);
+ painter->fillRect(txtBounding2.adjusted(-3, 0, 0, 0), textBgColor);
+ painter->setBrush(QBrush(Qt::NoBrush));
+ painter->setPen(textColor);
+ 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->drawText(txtBounding2, Qt::AlignLeft, m_clipName);
+
+
+ // draw markers
+ if (isEnabled() && m_clip) {
+ QList < CommentedTime > markers = m_clip->commentedSnapMarkers();
+ QList < CommentedTime >::Iterator it = markers.begin();
+ GenTime pos;
+ double framepos;
+ QBrush markerBrush(QColor(120, 120, 0, 140));
+ QPen pen = painter->pen();
+
+ for (; it != markers.end(); ++it) {
+ pos = GenTime((int)((*it).time().frames(m_fps) / qAbs(m_speed) + 0.5), m_fps) - cropStart();
+ if (pos > GenTime()) {
+ if (pos > cropDuration()) break;
+ QLineF l(rect().x() + pos.frames(m_fps), rect().y(), rect().x() + pos.frames(m_fps), rect().bottom());
+ QLineF l2 = painter->worldTransform().map(l);
+ pen.setColor(CommentedTime::markerColor((*it).markerType()));
+ pen.setStyle(Qt::DotLine);
+ painter->setPen(pen);
+ painter->drawLine(l2);
+ if (KdenliveSettings::showmarkers()) {
+ framepos = rect().x() + pos.frames(m_fps);
+ const QRectF r1(framepos + 0.04, rect().height()/3, rect().width() - framepos - 2, rect().height() / 2);
+ const QRectF r2 = painter->worldTransform().mapRect(r1);
+ const QRectF txtBounding3 = painter->boundingRect(r2, Qt::AlignLeft | Qt::AlignTop, ' ' + (*it).comment() + ' ');
+ painter->setBrush(markerBrush);
+ pen.setStyle(Qt::SolidLine);
+ painter->setPen(pen);
+ painter->drawRect(txtBounding3);
+ painter->setBrush(Qt::NoBrush);
+ painter->setPen(Qt::white);
+ painter->drawText(txtBounding3, Qt::AlignCenter, (*it).comment());
+ }
+ //painter->fillRect(QRect(br.x() + framepos, br.y(), 10, br.height()), QBrush(QColor(0, 0, 0, 150)));
}
- //painter->fillRect(QRect(br.x() + framepos, br.y(), 10, br.height()), QBrush(QColor(0, 0, 0, 150)));
}
}
- }
-
- // draw start / end fades
- QBrush fades;
- if (isSelected()) {
- fades = QBrush(QColor(200, 50, 50, 150));
- } else fades = QBrush(QColor(200, 200, 200, 200));
-
- if (m_startFade != 0) {
- QPainterPath fadeInPath;
- fadeInPath.moveTo(0, 0);
- fadeInPath.lineTo(0, rect().height());
- fadeInPath.lineTo(m_startFade, 0);
- fadeInPath.closeSubpath();
- QPainterPath f1 = painter->matrix().map(fadeInPath);
- painter->fillPath(f1/*.intersected(resultClipPath)*/, fades);
- /*if (isSelected()) {
- QLineF l(m_startFade * scale, 0, 0, itemHeight);
- painter->drawLine(l);
- }*/
- }
- if (m_endFade != 0) {
- QPainterPath fadeOutPath;
- fadeOutPath.moveTo(rect().width(), 0);
- fadeOutPath.lineTo(rect().width(), rect().height());
- fadeOutPath.lineTo(rect().width() - m_endFade, 0);
- fadeOutPath.closeSubpath();
- QPainterPath f1 = painter->matrix().map(fadeOutPath);
- painter->fillPath(f1/*.intersected(resultClipPath)*/, fades);
- /*if (isSelected()) {
- QLineF l(itemWidth - m_endFade * scale, 0, itemWidth, itemHeight);
- painter->drawLine(l);
- }*/
- }
-
- painter->setPen(QPen(Qt::lightGray));
- // draw effect or transition keyframes
- if (mapped.width() > 20) drawKeyFrames(painter, exposed);
+ // draw start / end fades
+ QBrush fades;
+ if (isSelected()) {
+ fades = QBrush(QColor(200, 50, 50, 150));
+ } else fades = QBrush(QColor(200, 200, 200, 200));
+
+ if (m_startFade != 0) {
+ QPainterPath fadeInPath;
+ fadeInPath.moveTo(0, 0);
+ fadeInPath.lineTo(0, rect().height());
+ fadeInPath.lineTo(m_startFade, 0);
+ fadeInPath.closeSubpath();
+ QPainterPath f1 = painter->worldTransform().map(fadeInPath);
+ painter->fillPath(f1/*.intersected(resultClipPath)*/, fades);
+ /*if (isSelected()) {
+ QLineF l(m_startFade * scale, 0, 0, itemHeight);
+ painter->drawLine(l);
+ }*/
+ }
+ if (m_endFade != 0) {
+ QPainterPath fadeOutPath;
+ fadeOutPath.moveTo(rect().width(), 0);
+ fadeOutPath.lineTo(rect().width(), rect().height());
+ fadeOutPath.lineTo(rect().width() - m_endFade, 0);
+ fadeOutPath.closeSubpath();
+ QPainterPath f1 = painter->worldTransform().map(fadeOutPath);
+ painter->fillPath(f1/*.intersected(resultClipPath)*/, fades);
+ /*if (isSelected()) {
+ QLineF l(itemWidth - m_endFade * scale, 0, itemWidth, itemHeight);
+ painter->drawLine(l);
+ }*/
+ }
- //painter->setMatrixEnabled(true);
+ painter->setPen(QPen(Qt::lightGray));
+ // draw effect or transition keyframes
+ drawKeyFrames(painter, m_limitedKeyFrames);
+ }
+
// draw clip border
// expand clip rect to allow correct painting of clip border
- QPen pen1(frameColor);
- painter->setPen(pen1);
painter->setClipping(false);
- painter->drawRect(painter->matrix().mapRect(rect()));
+ painter->setRenderHint(QPainter::Antialiasing, true);
+ framePen.setWidthF(1.5);
+ painter->setPen(framePen);
+ painter->drawRoundedRect(mapped.adjusted(0.5, 0, -0.5, 0), 3, 3);
}
}
QRectF rect = sceneBoundingRect();
int addtransitionOffset = 10;
- // Don't allow add transition if track height is very small
- if (rect.height() < 30) addtransitionOffset = 0;
+ // Don't allow add transition if track height is very small. No transitions for audio only clips
+ if (rect.height() < 30 || isAudioOnly() || m_clipType == AUDIO) 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 && (rect.bottom() - pos.y() > addtransitionOffset)) {
- // xgettext:no-c-format
- setToolTip(i18n("Crop from start: %1s", cropStart().seconds()));
+ } else if ((pos.x() <= rect.x() + rect.width() / 2) && pos.x() - rect.x() < maximumOffset && (rect.bottom() - pos.y() > addtransitionOffset)) {
return RESIZESTART;
} else if (qAbs((int)(pos.x() - (rect.x() + rect.width() - m_endFade))) < maximumOffset && qAbs((int)(pos.y() - rect.y())) < 6) {
- 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 ((rect.right() - pos.x() < maximumOffset) && (rect.bottom() - pos.y() > addtransitionOffset)) {
- // xgettext:no-c-format
- setToolTip(i18n("Clip duration: %1s", cropDuration().seconds()));
+ } else if ((pos.x() >= rect.x() + rect.width() / 2) && (rect.right() - pos.x() < maximumOffset) && (rect.bottom() - pos.y() > addtransitionOffset)) {
return RESIZEEND;
} else if ((pos.x() - rect.x() < 16 / scale) && (rect.bottom() - pos.y() <= addtransitionOffset)) {
- setToolTip(i18n("Add transition"));
return TRANSITIONSTART;
} else if ((rect.right() - pos.x() < 16 / scale) && (rect.bottom() - pos.y() <= addtransitionOffset)) {
- setToolTip(i18n("Add transition"));
return TRANSITIONEND;
}
- QString tooltip = "<b>" + m_clipName + "</b>";
- if (!baseClip()->fileURL().isEmpty())
- tooltip.append("<br />" + baseClip()->fileURL().path());
- if (!baseClip()->description().isEmpty())
- tooltip.append("<br />" + baseClip()->description());
- setToolTip(tooltip);
+
return MOVE;
}
+int ClipItem::itemHeight()
+{
+ return KdenliveSettings::trackheight() - 2;
+}
+
+void ClipItem::resetFrameWidth(int width)
+{
+ FRAME_SIZE = width;
+ update();
+}
+
QList <GenTime> ClipItem::snapMarkers() const
{
QList < GenTime > snaps;
- QList < GenTime > markers = baseClip()->snapMarkers();
+ if (!m_clip) return snaps;
+ QList < GenTime > markers = m_clip->snapMarkers();
GenTime pos;
for (int i = 0; i < markers.size(); i++) {
QList <CommentedTime> ClipItem::commentedSnapMarkers() const
{
QList < CommentedTime > snaps;
- QList < CommentedTime > markers = baseClip()->commentedSnapMarkers();
+ if (!m_clip) return snaps;
+ QList < CommentedTime > markers = m_clip->commentedSnapMarkers();
GenTime pos;
for (int i = 0; i < markers.size(); i++) {
pos = GenTime((int)(markers.at(i).time().frames(m_fps) / qAbs(m_speed) + 0.5), m_fps) - cropStart();
if (pos > GenTime()) {
if (pos > cropDuration()) break;
- else snaps.append(CommentedTime(pos + startPos(), markers.at(i).comment()));
+ else snaps.append(CommentedTime(pos + startPos(), markers.at(i).comment(), markers.at(i).markerType()));
}
}
return snaps;
}
-void ClipItem::slotPrepareAudioThumb(double pixelForOneFrame, int startpixel, int endpixel, int channels)
+void ClipItem::slotPrepareAudioThumb(double pixelForOneFrame, int startpixel, int endpixel, int channels, int pixelHeight)
{
- QRectF re = sceneBoundingRect();
- if (m_clipType == AV && !isAudioOnly()) re.setTop(re.y() + re.height() / 2);
+ // Bail out, if caller provided invalid data
+ if (channels <= 0) {
+ kWarning() << "Unable to draw image with " << channels << "number of channels";
+ return;
+ }
+ int factor = 64;
+ if (KdenliveSettings::normaliseaudiothumbs()) {
+ factor = m_clip->getProperty("audio_max").toInt();
+ }
//kDebug() << "// PREP AUDIO THMB FRMO : scale:" << pixelForOneFrame<< ", from: " << startpixel << ", to: " << endpixel;
//if ( (!audioThumbWasDrawn || framePixelWidth!=pixelForOneFrame ) && !baseClip()->audioFrameChache.isEmpty()){
+ bool fullAreaDraw = pixelForOneFrame < 10;
+ bool simplifiedAudio = !KdenliveSettings::displayallchannels();
+ QPen audiopen;
+ audiopen.setWidth(0);
+ if (simplifiedAudio) channels = 1;
+ int channelHeight = pixelHeight / channels;
+ QMap<int, QPainterPath > positiveChannelPaths;
+ QMap<int, QPainterPath > negativeChannelPaths;
for (int startCache = startpixel - startpixel % 100; startCache < endpixel; startCache += 100) {
- //kDebug() << "creating " << startCache;
- //if (framePixelWidth!=pixelForOneFrame ||
if (m_framePixelWidth == pixelForOneFrame && m_audioThumbCachePic.contains(startCache))
continue;
- 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));
+ if (m_audioThumbCachePic.value(startCache).isNull() || m_framePixelWidth != pixelForOneFrame) {
+ QPixmap pix(100, pixelHeight);
+ pix.fill(QColor(180, 180, 180, 150));
+ m_audioThumbCachePic[startCache] = pix;
}
- bool fullAreaDraw = pixelForOneFrame < 10;
- QMap<int, QPainterPath > positiveChannelPaths;
- QMap<int, QPainterPath > negativeChannelPaths;
+ positiveChannelPaths.clear();
+ negativeChannelPaths.clear();
+
QPainter pixpainter(&m_audioThumbCachePic[startCache]);
- QPen audiopen;
- audiopen.setWidth(0);
- pixpainter.setPen(audiopen);
- //pixpainter.setRenderHint(QPainter::Antialiasing,true);
- //pixpainter.drawLine(0,0,100,re.height());
- // Bail out, if caller provided invalid data
- if (channels <= 0) {
- kWarning() << "Unable to draw image with " << channels << "number of channels";
- return;
- }
- int channelHeight = m_audioThumbCachePic[startCache].height() / channels;
-
- 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 i = 0; i < channels; i++) {
+ if (simplifiedAudio) {
+ positiveChannelPaths[i].moveTo(-1, channelHeight);
+ }
+ else if (fullAreaDraw) {
+ positiveChannelPaths[i].moveTo(-1, channelHeight*i + channelHeight / 2);
+ negativeChannelPaths[i].moveTo(-1, channelHeight*i + channelHeight / 2);
+ }
+ else {
+ positiveChannelPaths[i].moveTo(-1, channelHeight*i + channelHeight / 2);
+ audiopen.setColor(QColor(60, 60, 60, 50));
+ pixpainter.setPen(audiopen);
+ pixpainter.drawLine(0, channelHeight*i + channelHeight / 2, 100, channelHeight*i + channelHeight / 2);
+ }
+ }
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<int, QByteArray> frame_channel_data = baseClip()->m_audioFrameCache[(int)frame];
-
- 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;
- if (fullAreaDraw) {
- positiveChannelPaths[channel].lineTo(samples, 0.1 + y + qAbs(delta));
- negativeChannelPaths[channel].lineTo(samples, 0.1 + y - qAbs(delta));
+ const QMap<int, QByteArray> frame_channel_data = baseClip()->audioFrameCache.value((int)frame);
+
+ for (int channel = 0; channel < channels && !frame_channel_data.value(channel).isEmpty(); channel++) {
+ int y = channelHeight * channel + channelHeight / 2;
+ if (simplifiedAudio) {
+ double delta = qAbs((frame_channel_data.value(channel).at(sample) - 63.5) * channelHeight / factor);
+ positiveChannelPaths[channel].lineTo(samples, channelHeight - delta);
+ } else if (fullAreaDraw) {
+ double delta = qAbs((frame_channel_data.value(channel).at(sample) - 63.5) * channelHeight / (2 * factor));
+ positiveChannelPaths[channel].lineTo(samples, y + delta);
+ negativeChannelPaths[channel].lineTo(samples, y - delta);
} else {
- positiveChannelPaths[channel].lineTo(samples, 0.1 + y + delta);
- negativeChannelPaths[channel].lineTo(samples, 0.1 + y - delta);
+ double delta = (frame_channel_data.value(channel).at(sample) - 63.5) * channelHeight / (2 * factor);
+ positiveChannelPaths[channel].lineTo(samples, y + delta);
}
}
- 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);
- positiveChannelPaths[channel].lineTo(0, channelHeight*channel + channelHeight / 2);
- negativeChannelPaths[channel].lineTo(0, channelHeight*channel + channelHeight / 2);
- }
-
}
- pixpainter.setPen(QPen(QColor(0, 0, 0)));
- pixpainter.setBrush(QBrush(QColor(60, 60, 60)));
-
+ for (int channel = 0; channel < channels; channel++) {
+ if (simplifiedAudio) {
+ positiveChannelPaths[channel].lineTo(101, channelHeight);
+ } else if (fullAreaDraw) {
+ int y = channelHeight * channel + channelHeight / 2;
+ positiveChannelPaths[channel].lineTo(101, y);
+ negativeChannelPaths[channel].lineTo(101, y);
+ }
+ }
+ if (fullAreaDraw || simplifiedAudio) {
+ audiopen.setColor(QColor(80, 80, 80, 200));
+ pixpainter.setPen(audiopen);
+ pixpainter.setBrush(QBrush(QColor(120, 120, 120, 200)));
+ }
+ else {
+ audiopen.setColor(QColor(60, 60, 60, 100));
+ pixpainter.setPen(audiopen);
+ pixpainter.setBrush(Qt::NoBrush);
+ }
+ pixpainter.setRenderHint(QPainter::Antialiasing, false);
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
+ pixpainter.drawPath(positiveChannelPaths[i].united(negativeChannelPaths.value(i)));
} else
- pixpainter.drawPath(positiveChannelPaths[i]);
+ pixpainter.drawPath(positiveChannelPaths.value(i));
}
}
- //audioThumbWasDrawn=true;
m_framePixelWidth = pixelForOneFrame;
-
- //}
}
int ClipItem::fadeIn() const
{
if (pos == m_startFade) return;
int oldIn = m_startFade;
- if (pos < 0) pos = 0;
- if (pos > cropDuration().frames(m_fps)) pos = (int)(cropDuration().frames(m_fps));
- m_startFade = pos;
+ m_startFade = qBound(0, pos, (int)cropDuration().frames(m_fps));
QRectF rect = boundingRect();
- update(rect.x(), rect.y(), qMax(oldIn, pos), rect.height());
+ update(rect.x(), rect.y(), qMax(oldIn, m_startFade), rect.height());
}
void ClipItem::setFadeOut(int pos)
{
if (pos == m_endFade) return;
int oldOut = m_endFade;
- if (pos < 0) pos = 0;
- if (pos > cropDuration().frames(m_fps)) pos = (int)(cropDuration().frames(m_fps));
- m_endFade = pos;
+ m_endFade = qBound(0, pos, (int)cropDuration().frames(m_fps));
QRectF rect = boundingRect();
- update(rect.x() + rect.width() - qMax(oldOut, pos), rect.y(), qMax(oldOut, pos), rect.height());
+ update(rect.x() + rect.width() - qMax(oldOut, m_endFade), rect.y(), qMax(oldOut, m_endFade), rect.height());
}
}
*/
-void ClipItem::resizeStart(int posx, bool /*size*/)
+void ClipItem::resizeStart(int posx, bool /*size*/, bool emitChange)
{
bool sizeLimit = false;
if (clipType() != IMAGE && clipType() != COLOR && clipType() != TEXT) {
m_startThumbTimer.start(150);
}
}
+ if (emitChange) slotUpdateRange();
}
-void ClipItem::resizeEnd(int posx)
+void ClipItem::slotUpdateRange()
+{
+ if (m_isMainSelectedClip) emit updateRange();
+}
+
+void ClipItem::resizeEnd(int posx, bool emitChange)
{
const int max = (startPos() - cropStart() + maxDuration()).frames(m_fps);
if (posx > max && maxDuration() != GenTime()) posx = max;
m_endThumbTimer.start(150);
}
}
-}
-
-
-bool ClipItem::checkEffectsKeyframesPos(const int previous, const int current, bool fromStart)
-{
- bool effModified = 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++) {
- bool modified = false;
- QDomElement e = params.item(j).toElement();
- 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 <int, double> kfr;
- int pos;
- double val;
- foreach(const QString &str, keyframes) {
- pos = str.section(':', 0, 0).toInt();
- val = str.section(':', 1, 1).toDouble();
- if (pos == previous) {
- // first or last keyframe
- kfr[current] = val;
- modified = true;
- } else {
- if ((fromStart && pos >= current) || (!fromStart && pos <= current)) {
- // only keyframes in range
- kfr[pos] = val;
- modified = true;
- }
- }
- }
- if (modified) {
- effModified = true;
- 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);
- }
- }
- }
- }
- if (effModified && m_selectedEffect >= 0) setSelectedEffect(m_selectedEffect);
- return effModified;
+ if (emitChange) slotUpdateRange();
}
//virtual
int xpos = projectScene()->getSnapPointForPos((int) newPos.x(), KdenliveSettings::snaptopoints());
xpos = qMax(xpos, 0);
newPos.setX(xpos);
- int newTrack = newPos.y() / KdenliveSettings::trackheight();
+ // Warning: newPos gives a position relative to the click event, so hack to get absolute pos
+ int yOffset = property("y_absolute").toInt() + newPos.y();
+ int newTrack = yOffset / KdenliveSettings::trackheight();
newTrack = qMin(newTrack, projectScene()->tracksCount() - 1);
newTrack = qMax(newTrack, 0);
+ QStringList lockedTracks = property("locked_tracks").toStringList();
+ if (lockedTracks.contains(QString::number(newTrack))) {
+ // Trying to move to a locked track
+ return pos();
+ }
newPos.setY((int)(newTrack * KdenliveSettings::trackheight() + 1));
// Only one clip is moving
QRectF sceneShape = rect();
return m_effectList.effectNames();
}
-QDomElement ClipItem::effectAt(int ix) const
+QDomElement ClipItem::effect(int ix) const
{
- if (ix > m_effectList.count() - 1 || ix < 0 || m_effectList.at(ix).isNull()) return QDomElement();
+ if (ix >= m_effectList.count() || ix < 0) return QDomElement();
return m_effectList.at(ix).cloneNode().toElement();
}
-QDomElement ClipItem::getEffectAt(int ix) const
+QDomElement ClipItem::effectAtIndex(int ix) const
+{
+ if (ix > m_effectList.count() || ix <= 0) return QDomElement();
+ return m_effectList.itemFromIndex(ix).cloneNode().toElement();
+}
+
+QDomElement ClipItem::getEffectAtIndex(int ix) const
+{
+ if (ix > m_effectList.count() || ix <= 0) return QDomElement();
+ return m_effectList.itemFromIndex(ix);
+}
+
+void ClipItem::updateEffect(QDomElement effect)
+{
+ //kDebug() << "CHange EFFECT AT: " << ix << ", CURR: " << m_effectList.at(ix).attribute("tag") << ", NEW: " << effect.attribute("tag");
+ m_effectList.updateEffect(effect);
+ m_effectNames = m_effectList.effectNames().join(" / ");
+ QString id = effect.attribute("id");
+ if (id == "fadein" || id == "fadeout" || id == "fade_from_black" || id == "fade_to_black")
+ update();
+ else {
+ QRectF r = boundingRect();
+ r.setHeight(20);
+ update(r);
+ }
+}
+
+void ClipItem::enableEffects(QList <int> indexes, bool disable)
{
- if (ix > m_effectList.count() - 1 || ix < 0 || m_effectList.at(ix).isNull()) return QDomElement();
- return m_effectList.at(ix);
+ m_effectList.enableEffects(indexes, disable);
}
-void ClipItem::setEffectAt(int ix, QDomElement effect)
+bool ClipItem::moveEffect(QDomElement effect, int ix)
{
- if (ix < 0 || ix > (m_effectList.count() - 1) || effect.isNull()) {
+ if (ix <= 0 || ix > (m_effectList.count()) || effect.isNull()) {
kDebug() << "Invalid effect index: " << ix;
- return;
+ return false;
}
- //kDebug() << "CHange EFFECT AT: " << ix << ", CURR: " << m_effectList.at(ix).attribute("tag") << ", NEW: " << effect.attribute("tag");
- effect.setAttribute("kdenlive_ix", ix + 1);
- m_effectList.replace(ix, effect);
+ m_effectList.removeAt(effect.attribute("kdenlive_ix").toInt());
+ effect.setAttribute("kdenlive_ix", ix);
+ m_effectList.insert(effect);
m_effectNames = m_effectList.effectNames().join(" / ");
QString id = effect.attribute("id");
if (id == "fadein" || id == "fadeout" || id == "fade_from_black" || id == "fade_to_black")
r.setHeight(20);
update(r);
}
+ return true;
}
-EffectsParameterList ClipItem::addEffect(const QDomElement effect, bool /*animate*/)
+EffectsParameterList ClipItem::addEffect(QDomElement effect, bool /*animate*/)
{
bool needRepaint = false;
+ QLocale locale;
int ix;
+ QDomElement insertedEffect;
if (!effect.hasAttribute("kdenlive_ix")) {
+ // effect dropped from effect list
ix = effectsCounter();
} else ix = effect.attribute("kdenlive_ix").toInt();
if (!m_effectList.isEmpty() && ix <= m_effectList.count()) {
needRepaint = true;
- m_effectList.insert(ix - 1, effect);
- for (int i = ix; i < m_effectList.count(); i++) {
- int index = m_effectList.item(i).attribute("kdenlive_ix").toInt();
- if (index >= ix) m_effectList.item(i).setAttribute("kdenlive_ix", index + 1);
- }
- } else m_effectList.append(effect);
+ insertedEffect = m_effectList.insert(effect);
+ } else insertedEffect = m_effectList.append(effect);
+
+ // Update index to the real one
+ effect.setAttribute("kdenlive_ix", insertedEffect.attribute("kdenlive_ix"));
+ int effectIn;
+ int effectOut;
+
+ if (effect.attribute("tag") == "affine") {
+ // special case: the affine effect needs in / out points
+ effectIn = effect.attribute("in").toInt();
+ effectOut = effect.attribute("out").toInt();
+ }
+ else {
+ effectIn = EffectsList::parameter(effect, "in").toInt();
+ effectOut = EffectsList::parameter(effect, "out").toInt();
+ }
+
EffectsParameterList parameters;
- parameters.addParam("tag", effect.attribute("tag"));
- parameters.addParam("kdenlive_ix", effect.attribute("kdenlive_ix"));
- if (effect.hasAttribute("src")) parameters.addParam("src", effect.attribute("src"));
- if (effect.hasAttribute("disable")) parameters.addParam("disable", effect.attribute("disable"));
+ parameters.addParam("tag", insertedEffect.attribute("tag"));
+ parameters.addParam("kdenlive_ix", insertedEffect.attribute("kdenlive_ix"));
+ if (insertedEffect.hasAttribute("src")) parameters.addParam("src", insertedEffect.attribute("src"));
+ if (insertedEffect.hasAttribute("disable")) parameters.addParam("disable", insertedEffect.attribute("disable"));
- QString effectId = effect.attribute("id");
- if (effectId.isEmpty()) effectId = effect.attribute("tag");
+ QString effectId = insertedEffect.attribute("id");
+ if (effectId.isEmpty()) effectId = insertedEffect.attribute("tag");
parameters.addParam("id", effectId);
- // special case:Â the affine effect needs in / out points
- if (effectId == "pan_zoom") {
- parameters.addParam("in", QString::number(cropStart().frames(m_fps)));
- parameters.addParam("out", QString::number((cropStart() + cropDuration()).frames(m_fps)));
+ QDomNodeList params = insertedEffect.elementsByTagName("parameter");
+ int fade = 0;
+ bool needInOutSync = false;
+
+ // check if it is a fade effect
+ if (effectId == "fadein") {
+ needRepaint = true;
+ if (m_effectList.hasEffect(QString(), "fade_from_black") == -1) {
+ fade = effectOut - effectIn;
+ }/* 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) {
+ fade = effectOut - effectIn;
+ }/* 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 (m_effectList.hasEffect(QString(), "fade_to_black") == -1) {
+ fade = effectIn - effectOut;
+ } /*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) {
+ fade = effectIn - effectOut;
+ }/* 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();
+ }*/
}
- 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") == "geometry" && !e.hasAttribute("fixed")) {
+ // Effects with a geometry parameter need to sync in / out with parent clip
+ needInOutSync = true;
+ }
if (e.attribute("type") == "simplekeyframe") {
- QStringList values = e.attribute("keyframes").split(";", QString::SkipEmptyParts);
- double factor = e.attribute("factor", "1").toDouble();
- if (factor != 1) {
+ QStringList values = e.attribute("keyframes").split(';', QString::SkipEmptyParts);
+ double factor = locale.toDouble(e.attribute("factor", "1"));
+ double offset = e.attribute("offset", "0").toDouble();
+ if (factor != 1 || offset != 0) {
for (int j = 0; j < values.count(); j++) {
QString pos = values.at(j).section(':', 0, 0);
- double val = values.at(j).section(':', 1, 1).toDouble() / factor;
- values[j] = pos + "=" + QString::number(val);
+ double val = (locale.toDouble(values.at(j).section(':', 1, 1)) - offset) / factor;
+ values[j] = pos + '=' + locale.toString(val);
}
}
parameters.addParam(e.attribute("name"), values.join(";"));
parameters.addParam("max", e.attribute("max"));
parameters.addParam("min", e.attribute("min"));
parameters.addParam("factor", e.attribute("factor", "1"));
+ parameters.addParam("offset", e.attribute("offset", "0"));
parameters.addParam("starttag", e.attribute("starttag", "start"));
parameters.addParam("endtag", e.attribute("endtag", "end"));
- } else if (e.attribute("factor", "1") == "1") {
+ } else if (e.attribute("factor", "1") == "1" && e.attribute("offset", "0") == "0") {
parameters.addParam(e.attribute("name"), e.attribute("value"));
- // check if it is a fade effect
- if (effectId == "fadein") {
- needRepaint = true;
- 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 (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 {
double fact;
- if (e.attribute("factor").startsWith('%')) {
+ if (e.attribute("factor").contains('%')) {
fact = ProfilesDialog::getStringEval(projectScene()->profile(), e.attribute("factor"));
- } else fact = e.attribute("factor", "1").toDouble();
- parameters.addParam(e.attribute("name"), QString::number(e.attribute("value").toDouble() / fact));
+ } else {
+ fact = locale.toDouble(e.attribute("factor", "1"));
+ }
+ double offset = e.attribute("offset", "0").toDouble();
+ parameters.addParam(e.attribute("name"), locale.toString((locale.toDouble(e.attribute("value")) - offset) / fact));
}
}
}
+ if (needInOutSync) {
+ parameters.addParam("in", QString::number(cropStart().frames(m_fps)));
+ parameters.addParam("out", QString::number((cropStart() + cropDuration()).frames(m_fps) - 1));
+ parameters.addParam("_sync_in_out", "1");
+ }
m_effectNames = m_effectList.effectNames().join(" / ");
if (fade > 0) m_startFade = fade;
else if (fade < 0) m_endFade = -fade;
void ClipItem::deleteEffect(QString index)
{
bool needRepaint = false;
- QString ix;
-
- for (int i = 0; i < m_effectList.count(); ++i) {
- ix = m_effectList.at(i).attribute("kdenlive_ix");
- if (ix == index) {
- QString effectId = m_effectList.at(i).attribute("id");
- if ((effectId == "fadein" && hasEffect(QString(), "fade_from_black") == -1) ||
- (effectId == "fade_from_black" && hasEffect(QString(), "fadein") == -1)) {
- m_startFade = 0;
- needRepaint = true;
- } else if ((effectId == "fadeout" && hasEffect(QString(), "fade_to_black") == -1) ||
- (effectId == "fade_to_black" && hasEffect(QString(), "fadeout") == -1)) {
- m_endFade = 0;
- needRepaint = true;
- } else if (EffectsList::hasKeyFrames(m_effectList.at(i))) needRepaint = true;
- m_effectList.removeAt(i);
- i--;
- } else if (ix.toInt() > index.toInt()) {
- m_effectList.item(i).setAttribute("kdenlive_ix", ix.toInt() - 1);
- }
- }
+ int ix = index.toInt();
+
+ QDomElement effect = m_effectList.itemFromIndex(ix);
+ QString effectId = effect.attribute("id");
+ if ((effectId == "fadein" && hasEffect(QString(), "fade_from_black") == -1) ||
+ (effectId == "fade_from_black" && hasEffect(QString(), "fadein") == -1)) {
+ m_startFade = 0;
+ needRepaint = true;
+ } else if ((effectId == "fadeout" && hasEffect(QString(), "fade_to_black") == -1) ||
+ (effectId == "fade_to_black" && hasEffect(QString(), "fadeout") == -1)) {
+ m_endFade = 0;
+ needRepaint = true;
+ } else if (EffectsList::hasKeyFrames(effect)) needRepaint = true;
+ m_effectList.removeAt(ix);
m_effectNames = m_effectList.effectNames().join(" / ");
- if (m_effectList.isEmpty() || m_selectedEffect + 1 == index.toInt()) {
+ if (m_effectList.isEmpty() || m_selectedEffect == ix) {
// Current effect was removed
- if (index.toInt() > m_effectList.count() - 1) {
- setSelectedEffect(m_effectList.count() - 1);
- } else setSelectedEffect(index.toInt());
+ if (ix > m_effectList.count()) {
+ setSelectedEffect(m_effectList.count());
+ } else setSelectedEffect(ix);
}
if (needRepaint) update(boundingRect());
else {
if (m_speed <= 0 && m_speed > -1)
m_speed = -1.0;
m_strobe = strobe;
- if (m_speed == 1.0) m_clipName = baseClip()->name();
- else m_clipName = baseClip()->name() + " - " + QString::number(speed * 100, 'f', 0) + '%';
+ if (m_speed == 1.0) m_clipName = m_clip->name();
+ else m_clipName = m_clip->name() + " - " + QString::number(speed * 100, 'f', 0) + '%';
m_info.cropStart = GenTime((int)(m_speedIndependantInfo.cropStart.frames(m_fps) / qAbs(m_speed) + 0.5), m_fps);
m_info.cropDuration = GenTime((int)(m_speedIndependantInfo.cropDuration.frames(m_fps) / qAbs(m_speed) + 0.5), m_fps);
//update();
return m_speedIndependantInfo;
}
+int ClipItem::nextFreeEffectGroupIndex() const
+{
+ int freeGroupIndex = 0;
+ for (int i = 0; i < m_effectList.count(); i++) {
+ QDomElement effect = m_effectList.at(i);
+ EffectInfo effectInfo;
+ effectInfo.fromString(effect.attribute("kdenlive_info"));
+ if (effectInfo.groupIndex >= freeGroupIndex) {
+ freeGroupIndex = effectInfo.groupIndex + 1;
+ }
+ }
+ return freeGroupIndex;
+}
+
//virtual
void ClipItem::dropEvent(QGraphicsSceneDragDropEvent * event)
{
- const QString effects = QString(event->mimeData()->data("kdenlive/effectslist"));
- QDomDocument doc;
- doc.setContent(effects, true);
- const QDomElement e = doc.documentElement();
- if (scene() && !scene()->views().isEmpty()) {
- event->accept();
+ if (event->proposedAction() == Qt::CopyAction && scene() && !scene()->views().isEmpty()) {
+ const QString effects = QString::fromUtf8(event->mimeData()->data("kdenlive/effectslist"));
+ event->acceptProposedAction();
+ QDomDocument doc;
+ doc.setContent(effects, true);
+ QDomElement e = doc.documentElement();
+ if (e.tagName() == "effectgroup") {
+ // dropped an effect group
+ QDomNodeList effectlist = e.elementsByTagName("effect");
+ int freeGroupIndex = nextFreeEffectGroupIndex();
+ EffectInfo effectInfo;
+ for (int i = 0; i < effectlist.count(); i++) {
+ QDomElement effect = effectlist.at(i).toElement();
+ effectInfo.fromString(effect.attribute("kdenlive_info"));
+ effectInfo.groupIndex = freeGroupIndex;
+ effect.setAttribute("kdenlive_info", effectInfo.toString());
+ effect.removeAttribute("kdenlive_ix");
+ }
+ } else {
+ // single effect dropped
+ e.removeAttribute("kdenlive_ix");
+ }
CustomTrackView *view = (CustomTrackView *) scene()->views()[0];
if (view) view->slotAddEffect(e, m_info.startPos, track());
}
+ else return;
}
//virtual
void ClipItem::dragEnterEvent(QGraphicsSceneDragDropEvent *event)
{
if (isItemLocked()) event->setAccepted(false);
- else event->setAccepted(event->mimeData()->hasFormat("kdenlive/effectslist"));
+ else if (event->mimeData()->hasFormat("kdenlive/effectslist")) {
+ event->acceptProposedAction();
+ } else event->setAccepted(false);
}
void ClipItem::dragLeaveEvent(QGraphicsSceneDragDropEvent *event)
{
- Q_UNUSED(event);
+ Q_UNUSED(event)
}
void ClipItem::addTransition(Transition* t)
void ClipItem::insertKeyframe(QDomElement effect, int pos, int val)
{
if (effect.attribute("disable") == "1") return;
+ QLocale locale;
effect.setAttribute("active_keyframe", pos);
m_editedKeyframe = pos;
QDomNodeList params = effect.elementsByTagName("parameter");
bool added = false;
foreach(const QString &str, keyframes) {
int kpos = str.section(':', 0, 0).toInt();
- double newval = str.section(':', 1, 1).toDouble();
+ double newval = locale.toDouble(str.section(':', 1, 1));
if (kpos < pos) {
newkfr.append(str);
} else if (!added) {
if (i == m_visibleParam)
- newkfr.append(QString::number(pos) + ":" + QString::number(val));
+ newkfr.append(QString::number(pos) + ':' + QString::number(val));
else
- newkfr.append(QString::number(pos) + ":" + QString::number(newval));
+ newkfr.append(QString::number(pos) + ':' + locale.toString(newval));
if (kpos > pos) newkfr.append(str);
added = true;
} else newkfr.append(str);
}
if (!added) {
if (i == m_visibleParam)
- newkfr.append(QString::number(pos) + ":" + QString::number(val));
+ newkfr.append(QString::number(pos) + ':' + QString::number(val));
else
- newkfr.append(QString::number(pos) + ":" + e.attribute("default"));
+ newkfr.append(QString::number(pos) + ':' + e.attribute("default"));
}
e.setAttribute("keyframes", newkfr.join(";"));
}
void ClipItem::movedKeyframe(QDomElement effect, int oldpos, int newpos, double value)
{
if (effect.attribute("disable") == "1") return;
+ QLocale locale;
effect.setAttribute("active_keyframe", newpos);
QDomNodeList params = effect.elementsByTagName("parameter");
int start = cropStart().frames(m_fps);
newpos = qMax(newpos, start);
newpos = qMin(newpos, end);
if (i == m_visibleParam)
- newkfr.append(QString::number(newpos) + ":" + QString::number(value));
+ newkfr.append(QString::number(newpos) + ':' + locale.toString(value));
else
- newkfr.append(QString::number(newpos) + ":" + str.section(':', 1, 1));
+ newkfr.append(QString::number(newpos) + ':' + str.section(':', 1, 1));
}
}
e.setAttribute("keyframes", newkfr.join(";"));
void ClipItem::updateKeyframes(QDomElement effect)
{
m_keyframes.clear();
+ QLocale locale;
// parse keyframes
QDomNodeList params = effect.elementsByTagName("parameter");
QDomElement e = params.item(m_visibleParam).toElement();
setSelectedEffect(m_selectedEffect);
return;
}
+ m_limitedKeyFrames = e.attribute("type") == "keyframe";
const QStringList keyframes = e.attribute("keyframes").split(';', QString::SkipEmptyParts);
foreach(const QString &str, keyframes) {
int pos = str.section(':', 0, 0).toInt();
- double val = str.section(':', 1, 1).toDouble();
+ double val = locale.toDouble(str.section(':', 1, 1));
m_keyframes[pos] = val;
}
if (!m_keyframes.contains(m_selectedKeyframe)) m_selectedKeyframe = -1;
}
-void ClipItem::doGetIntraThumbs(QPainter *painter, const QPointF startPos, int offset, int start, int end)
+Mlt::Producer *ClipItem::getProducer(int track, bool trackSpecific)
{
- if (!m_clip->thumbProducer() || clipType() == COLOR) return;
- if (scene() && scene()->views().isEmpty()) return;
- CustomTrackView *view = (CustomTrackView *) scene()->views()[0];
- if (view == NULL) return;
- const int theight = KdenliveSettings::trackheight();
- const int twidth = FRAME_SIZE;
-
- if (clipType() == IMAGE || clipType() == TEXT) {
- for (int i = start; i <= end; i++)
- painter->drawPixmap(startPos + QPointF(twidth *(i - offset), 0), m_startPix);
- }
- QPixmap p;
- for (int i = start; i <= end; i++) {
- if (!view->pixmapCache->find(m_clip->fileURL().path() + "%" + QString::number(i), p)) {
- p = m_clip->thumbProducer()->extractImage(i, twidth, theight);
- view->pixmapCache->insert(m_clip->fileURL().path() + "%" + QString::number(i), p);
- }
- painter->drawPixmap(startPos + QPointF(twidth *(i - offset), 0), p);
- }
+ if (isAudioOnly())
+ return m_clip->audioProducer(track);
+ else if (isVideoOnly())
+ return m_clip->videoProducer(track);
+ else
+ return m_clip->getProducer(trackSpecific ? track : -1);
}
-QList <int> ClipItem::updatePanZoom(int width, int height, int cut)
+QMap<int, QDomElement> ClipItem::adjustEffectsToDuration(int width, int height, ItemInfo oldInfo)
{
- QList <int> effectPositions;
+ QMap<int, QDomElement> effects;
for (int i = 0; i < m_effectList.count(); i++) {
QDomElement effect = m_effectList.at(i);
+
+ if (effect.attribute("id").startsWith("fade")) {
+ QString id = effect.attribute("id");
+ int in = EffectsList::parameter(effect, "in").toInt();
+ int out = EffectsList::parameter(effect, "out").toInt();
+ int clipEnd = (cropStart() + cropDuration()).frames(m_fps) - 1;
+ if (id == "fade_from_black" || id == "fadein") {
+ if (in != cropStart().frames(m_fps)) {
+ effects[i] = effect.cloneNode().toElement();
+ int duration = out - in;
+ in = cropStart().frames(m_fps);
+ out = in + duration;
+ EffectsList::setParameter(effect, "in", QString::number(in));
+ EffectsList::setParameter(effect, "out", QString::number(out));
+ }
+ if (out > clipEnd) {
+ if (!effects.contains(i))
+ effects[i] = effect.cloneNode().toElement();
+ EffectsList::setParameter(effect, "out", QString::number(clipEnd));
+ }
+ if (effects.contains(i)) {
+ setFadeIn(out - in);
+ }
+ } else {
+ if (out != clipEnd) {
+ effects[i] = effect.cloneNode().toElement();
+ int diff = out - clipEnd;
+ in = qMax(in - diff, (int) cropStart().frames(m_fps));
+ out -= diff;
+ EffectsList::setParameter(effect, "in", QString::number(in));
+ EffectsList::setParameter(effect, "out", QString::number(out));
+ }
+ if (in < cropStart().frames(m_fps)) {
+ if (!effects.contains(i))
+ effects[i] = effect.cloneNode().toElement();
+ EffectsList::setParameter(effect, "in", QString::number(cropStart().frames(m_fps)));
+ }
+ if (effects.contains(i))
+ setFadeOut(out - in);
+ }
+ continue;
+ } else if (effect.attribute("id") == "freeze" && cropStart() != oldInfo.cropStart) {
+ effects[i] = effect.cloneNode().toElement();
+ int diff = (oldInfo.cropStart - cropStart()).frames(m_fps);
+ int frame = EffectsList::parameter(effect, "frame").toInt();
+ EffectsList::setParameter(effect, "frame", QString::number(frame - diff));
+ continue;
+ } else if (effect.attribute("id") == "pan_zoom") {
+ effect.setAttribute("in", cropStart().frames(m_fps));
+ effect.setAttribute("out", (cropStart() + cropDuration()).frames(m_fps) - 1);
+ }
+
QDomNodeList params = effect.elementsByTagName("parameter");
for (int j = 0; j < params.count(); j++) {
- QDomElement e = params.item(j).toElement();
- if (e.isNull())
- continue;
- if (e.attribute("type") == "geometry" && !e.hasAttribute("fixed")) {
- effectPositions << i;
-
- int in = cropStart().frames(fps());
- int out = in + cropDuration().frames(fps());
- int dur = out - in - 1;
-
- effect.setAttribute("in", in);
- effect.setAttribute("out", out);
-
- Mlt::Geometry geometry(e.attribute("value").toUtf8().data(), dur, width, height);
- Mlt::GeometryItem item;
- bool endFrameAdded = false;
- if (cut == 0) {
- while (!geometry.next_key(&item, dur)) {
- if (!endFrameAdded) {
- // add keyframe at the end with interpolated value
-
- // but only once ;)
- endFrameAdded = true;
-
- Mlt::GeometryItem endItem;
- Mlt::GeometryItem interp;
- geometry.fetch(&interp, dur - 1);
- endItem.frame(dur - 1);
- endItem.x(interp.x());
- endItem.y(interp.y());
- endItem.w(interp.w());
- endItem.h(interp.h());
- endItem.mix(interp.mix());
- geometry.insert(&endItem);
- }
- geometry.remove(item.frame());
- }
- } else {
- Mlt::Geometry origGeometry(e.attribute("value").toUtf8().data(), dur, width, height);
- // remove keyframes before cut point
- while (!geometry.prev_key(&item, cut - 1) && item.frame() < cut)
- geometry.remove(item.frame());
-
- // add a keyframe at new pos 0
- origGeometry.fetch(&item, cut);
- item.frame(0);
- geometry.insert(&item);
-
- // move exisiting keyframes by -cut
- while (!origGeometry.next_key(&item, cut)) {
- geometry.remove(item.frame());
- origGeometry.remove(item.frame());
- item.frame(item.frame() - cut);
- geometry.insert(&item);
- }
-
- }
+ QDomElement param = params.item(j).toElement();
+
+ QString type = param.attribute("type");
+ if (type == "geometry" && !param.hasAttribute("fixed")) {
+ if (!effects.contains(i))
+ effects[i] = effect.cloneNode().toElement();
+ updateGeometryKeyframes(effect, j, width, height, oldInfo);
+ } else if (type == "simplekeyframe" || type == "keyframe") {
+ if (!effects.contains(i))
+ effects[i] = effect.cloneNode().toElement();
+ updateNormalKeyframes(param, oldInfo);
+#ifdef USE_QJSON
+ } else if (type == "roto-spline") {
+ if (!effects.contains(i))
+ effects[i] = effect.cloneNode().toElement();
+ QString value = param.attribute("value");
+ if (adjustRotoDuration(&value, cropStart().frames(m_fps), (cropStart() + cropDuration()).frames(m_fps) - 1))
+ param.setAttribute("value", value);
+#endif
+ }
+ }
+ }
+ return effects;
+}
+
+bool ClipItem::updateNormalKeyframes(QDomElement parameter, ItemInfo oldInfo)
+{
+ int in = cropStart().frames(m_fps);
+ int out = (cropStart() + cropDuration()).frames(m_fps) - 1;
+ int oldin = oldInfo.cropStart.frames(m_fps);
+ QLocale locale;
+ bool keyFrameUpdated = false;
+
+ const QStringList data = parameter.attribute("keyframes").split(';', QString::SkipEmptyParts);
+ QMap <int, double> keyframes;
+ foreach (QString keyframe, data) {
+ int keyframepos = keyframe.section(':', 0, 0).toInt();
+ // if keyframe was at clip start, update it
+ if (keyframepos == oldin) {
+ keyframepos = in;
+ keyFrameUpdated = true;
+ }
+ keyframes[keyframepos] = locale.toDouble(keyframe.section(':', 1, 1));
+ }
+
- e.setAttribute("value", geometry.serialise());
+ QMap<int, double>::iterator i = keyframes.end();
+ int lastPos = -1;
+ double lastValue = 0;
+ qreal relPos;
+
+ /*
+ * Take care of resize from start
+ */
+ bool startFound = false;
+ while (i-- != keyframes.begin()) {
+ if (i.key() < in && !startFound) {
+ startFound = true;
+ if (lastPos < 0) {
+ keyframes[in] = i.value();
+ } else {
+ relPos = (in - i.key()) / (qreal)(lastPos - i.key() + 1);
+ keyframes[in] = i.value() + (lastValue - i.value()) * relPos;
}
}
+ lastPos = i.key();
+ lastValue = i.value();
+ if (startFound)
+ i = keyframes.erase(i);
+ }
+
+ /*
+ * Take care of resize from end
+ */
+ i = keyframes.begin();
+ lastPos = -1;
+ bool endFound = false;
+ while (i != keyframes.end()) {
+ if (i.key() > out && !endFound) {
+ endFound = true;
+ if (lastPos < 0) {
+ keyframes[out] = i.value();
+ } else {
+ relPos = (out - lastPos) / (qreal)(i.key() - lastPos + 1);
+ keyframes[out] = lastValue + (i.value() - lastValue) * relPos;
+ }
+ }
+ lastPos = i.key();
+ lastValue = i.value();
+ if (endFound)
+ i = keyframes.erase(i);
+ else
+ ++i;
+ }
+
+ if (startFound || endFound || keyFrameUpdated) {
+ QString newkfr;
+ QMap<int, double>::const_iterator k = keyframes.constBegin();
+ while (k != keyframes.constEnd()) {
+ newkfr.append(QString::number(k.key()) + ':' + QString::number(qRound(k.value())) + ';');
+ ++k;
+ }
+ parameter.setAttribute("keyframes", newkfr);
+ return true;
}
- return effectPositions;
+ return false;
}
-Mlt::Producer *ClipItem::getProducer(int track, bool trackSpecific)
+void ClipItem::updateGeometryKeyframes(QDomElement effect, int paramIndex, int width, int height, ItemInfo oldInfo)
{
- if (isAudioOnly())
- return m_clip->audioProducer(track);
- else if (isVideoOnly())
- return m_clip->videoProducer();
- else
- return m_clip->producer(trackSpecific ? track : -1);
+ QDomElement param = effect.elementsByTagName("parameter").item(paramIndex).toElement();
+ int offset = oldInfo.cropStart.frames(m_fps);
+ QString data = param.attribute("value");
+ if (offset > 0) {
+ QStringList kfrs = data.split(';');
+ data.clear();
+ foreach (const QString &keyframe, kfrs) {
+ if (keyframe.contains('=')) {
+ int pos = keyframe.section('=', 0, 0).toInt();
+ pos += offset;
+ data.append(QString::number(pos) + '=' + keyframe.section('=', 1) + ";");
+ }
+ else data.append(keyframe + ';');
+ }
+ }
+ Mlt::Geometry geometry(data.toUtf8().data(), oldInfo.cropDuration.frames(m_fps), width, height);
+ param.setAttribute("value", geometry.serialise(cropStart().frames(m_fps), (cropStart() + cropDuration()).frames(m_fps) - 1));
}
+void ClipItem::slotGotThumbsCache()
+{
+ disconnect(m_clip->thumbProducer(), SIGNAL(thumbsCached()), this, SLOT(slotGotThumbsCache()));
+ update();
+}
+
+
#include "clipitem.moc"
+
projects / kdenlive / blobdiff