#include "kthumb.h"
-ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps)
- : AbstractClipItem(info, QRectF(), fps), m_clip(clip), m_resizeMode(NONE), m_grabPoint(0), m_maxTrack(0), m_hasThumbs(false), startThumbTimer(NULL), endThumbTimer(NULL), m_effectsCounter(1), audioThumbWasDrawn(false), m_opacity(1.0), m_timeLine(0), m_startThumbRequested(false), m_endThumbRequested(false), m_startFade(0), m_endFade(0), m_hover(false), m_selectedEffect(-1), m_speed(1.0), framePixelWidth(0) {
+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()) {
setRect(0, 0, (info.endPos - info.startPos).frames(fps) - 0.02, (qreal)(KdenliveSettings::trackheight() - 2));
setPos((qreal) info.startPos.frames(fps), (qreal)(info.track * KdenliveSettings::trackheight()) + 1);
connect(this , SIGNAL(prepareAudioThumb(double, int, int, int)) , this, SLOT(slotPrepareAudioThumb(double, int, int, int)));
setBrush(QColor(141, 166, 215));
- if (m_clipType == VIDEO || m_clipType == AV || m_clipType == SLIDESHOW) {
+ if (m_clipType == VIDEO || m_clipType == AV || m_clipType == SLIDESHOW || m_clipType == PLAYLIST) {
m_hasThumbs = true;
startThumbTimer = new QTimer(this);
startThumbTimer->setSingleShot(true);
connect(endThumbTimer, SIGNAL(timeout()), this, SLOT(slotGetEndThumb()));
connect(this, SIGNAL(getThumb(int, int)), clip->thumbProducer(), SLOT(extractImage(int, int)));
+ //connect(this, SIGNAL(getThumb(int, int)), clip->thumbProducer(), SLOT(getVideoThumbs(int, int)));
+
connect(clip->thumbProducer(), SIGNAL(thumbReady(int, QPixmap)), this, SLOT(slotThumbReady(int, QPixmap)));
connect(clip, SIGNAL(gotAudioData()), this, SLOT(slotGotAudioData()));
- QTimer::singleShot(200, this, SLOT(slotFetchThumbs()));
+ if (generateThumbs) QTimer::singleShot(200, this, SLOT(slotFetchThumbs()));
/*if (m_clip->producer()) {
videoThumbProducer.init(this, m_clip->producer(), KdenliveSettings::trackheight() * KdenliveSettings::project_display_ratio(), KdenliveSettings::trackheight());
if (info.cropStart == 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);
+ duplicate->setEffectList(m_effectList.clone());
duplicate->setSpeed(m_speed);
return duplicate;
}
}
void ClipItem::slotThumbReady(int frame, QPixmap pix) {
+ if (scene() == NULL) return;
QRectF r = sceneBoundingRect();
double width = m_startPix.width() / projectScene()->scale();
if (m_startThumbRequested && frame == m_cropStart.frames(m_fps)) {
return m_clipName;
}
-int ClipItem::clipProducer() const {
+const QString &ClipItem::clipProducer() const {
return m_producer;
}
if (isSelected()) paintColor = QBrush(QColor(79, 93, 121));
QRectF br = rect();
QRectF exposed = option->exposedRect;
+ QRectF mapped = painter->matrix().mapRect(br);
+
const double itemWidth = br.width();
const double itemHeight = br.height();
- //kDebug() << "/// ITEM RECT: " << br << ", EPXOSED: " << option->exposedRect;
const double scale = option->matrix.m11();
- // kDebug()<<"/// EXPOSED RECT: "<<option->exposedRect.x()<<" X "<<option->exposedRect.right();
+
//painter->setRenderHints(QPainter::Antialiasing);
}
// draw audio thumbnails
- if (KdenliveSettings::audiothumbnails() && ((m_clipType == AV && option->exposedRect.bottom() > (itemHeight / 2)) || m_clipType == AUDIO) && audioThumbReady) {
+ if (KdenliveSettings::audiothumbnails() && ((m_clipType == AV && exposed.bottom() > (itemHeight / 2)) || m_clipType == AUDIO) && audioThumbReady) {
- double startpixel = option->exposedRect.left(); // - pos().x();
+ double startpixel = exposed.left();
if (startpixel < 0)
startpixel = 0;
- double endpixel = option->exposedRect.right();
+ double endpixel = exposed.right();
if (endpixel < 0)
endpixel = 0;
//kDebug()<<"/// REPAINTING AUDIO THMBS ZONE: "<<startpixel<<"x"<<endpixel;
/*QPainterPath path = m_clipType == AV ? roundRectPathLower : resultClipPath;*/
- QRectF re = br;
QRectF mappedRect;
if (m_clipType == AV) {
+ QRectF re = br;
re.setTop(re.y() + re.height() / 2);
mappedRect = painter->matrix().mapRect(re);
- painter->fillRect(mappedRect, QBrush(QColor(200, 200, 200, 140)));
- } else mappedRect = painter->matrix().mapRect(re);
+ //painter->fillRect(mappedRect, QBrush(QColor(200, 200, 200, 140)));
+ } else mappedRect = mapped;
int channels = baseClip()->getProperty("channels").toInt();
if (scale != framePixelWidth)
audioThumbCachePic.clear();
double cropLeft = m_cropStart.frames(m_fps);
- emit prepareAudioThumb(scale, startpixel + cropLeft, endpixel + cropLeft, channels);//200 more for less missing parts before repaint after scrolling
- int newstart = startpixel + cropLeft;
const int clipStart = mappedRect.x();
- for (int startCache = newstart - (newstart) % 100; startCache < endpixel + cropLeft; startCache += 100) {
+ const int mappedStartPixel = painter->matrix().map(QPointF(startpixel + cropLeft, 0)).x() - clipStart;
+ const int mappedEndPixel = painter->matrix().map(QPointF(endpixel + cropLeft, 0)).x() - clipStart;
+ cropLeft = cropLeft * scale;
+
+ emit prepareAudioThumb(scale, mappedStartPixel, mappedEndPixel, channels);
+
+ for (int startCache = mappedStartPixel - (mappedStartPixel) % 100; startCache < mappedEndPixel; startCache += 100) {
if (audioThumbCachePic.contains(startCache) && !audioThumbCachePic[startCache].isNull())
- //painter->drawPixmap((int)(startCache - cropLeft), (int)(path.boundingRect().y()), audioThumbCachePic[startCache]);
- painter->drawPixmap(clipStart + startCache, mappedRect.y(), audioThumbCachePic[startCache]);
+ painter->drawPixmap(clipStart + startCache - cropLeft, mappedRect.y(), audioThumbCachePic[startCache]);
}
}
double framepos;
const int markerwidth = 4;
QBrush markerBrush;
- markerBrush = QBrush(QColor(120, 120, 0, 100));
+ markerBrush = QBrush(QColor(120, 120, 0, 140));
QPen pen = painter->pen();
pen.setColor(QColor(255, 255, 255, 200));
pen.setStyle(Qt::DotLine);
if (KdenliveSettings::showmarkers()) {
framepos = br.x() + pos.frames(m_fps);
const QRectF r1(framepos + 0.04, 10, itemWidth - framepos - 2, itemHeight - 10);
- const QRectF r2 = painter->matrix().map(r1).boundingRect();
+ const QRectF r2 = painter->matrix().mapRect(r1);
const QRectF txtBounding = painter->boundingRect(r2, Qt::AlignLeft | Qt::AlignTop, " " + (*it).comment() + " ");
QPainterPath path;
// Draw effects names
if (!m_effectNames.isEmpty() && itemWidth * scale > 40) {
- QRectF txtBounding = painter->boundingRect(painter->matrix().map(br).boundingRect(), Qt::AlignLeft | Qt::AlignTop, m_effectNames);
+ QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignLeft | Qt::AlignTop, m_effectNames);
txtBounding.setRight(txtBounding.right() + 15);
painter->setPen(Qt::white);
QBrush markerBrush(Qt::SolidPattern);
painter->setPen(Qt::black);
}
-
// Draw clip name
- QRectF txtBounding = painter->boundingRect(painter->matrix().map(br).boundingRect(), Qt::AlignHCenter | Qt::AlignTop, " " + m_clipName + " ");
- //painter->fillRect(txtBounding, QBrush(QColor(255, 255, 255, 150)));
- painter->setPen(QColor(0, 0, 0, 180));
- painter->drawText(txtBounding, Qt::AlignCenter, 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);
txtBounding.translate(QPointF(1, 1));
painter->setPen(QColor(255, 255, 255, 255));
painter->drawText(txtBounding, Qt::AlignCenter, m_clipName);
// draw transition handles on hover
if (m_hover && itemWidth * scale > 40) {
- QPainterPath transitionHandle;
- const int handle_size = 4;
QPointF p1 = painter->matrix().map(QPointF(0, itemHeight / 2)) + QPointF(10, 0);
painter->drawPixmap(p1, projectScene()->m_transitionPixmap);
- p1 = painter->matrix().map(QPointF(itemWidth, itemHeight / 2)) - QPointF(10 + handle_size * 3, 0);
+ p1 = painter->matrix().map(QPointF(itemWidth, itemHeight / 2)) - QPointF(22, 0);
painter->drawPixmap(p1, projectScene()->m_transitionPixmap);
}
}
// draw effect or transition keyframes
- if (itemWidth > 20) drawKeyFrames(painter, option->exposedRect);
+ if (itemWidth > 20) drawKeyFrames(painter, exposed);
painter->setMatrixEnabled(true);
} else if (qAbs((int)(pos.x() - (rect.x() + rect.width()))) < maximumOffset) {
setToolTip(i18n("Clip duration: %1s", duration().seconds()));
return RESIZEEND;
- } else if (qAbs((int)(pos.x() - (rect.x() + 16))) < maximumOffset && qAbs((int)(pos.y() - (rect.y() + rect.height() / 2 + 5))) < 6) {
+ } else if (qAbs((int)(pos.x() - (rect.x() + 16 / scale))) < maximumOffset && qAbs((int)(pos.y() - (rect.y() + rect.height() / 2 + 9))) < 6) {
setToolTip(i18n("Add transition"));
return TRANSITIONSTART;
- } else if (qAbs((int)(pos.x() - (rect.x() + rect.width() - 21))) < maximumOffset && qAbs((int)(pos.y() - (rect.y() + rect.height() / 2 + 5))) < 6) {
+ } else if (qAbs((int)(pos.x() - (rect.x() + rect.width() - 21 / scale))) < maximumOffset && qAbs((int)(pos.y() - (rect.y() + rect.height() / 2 + 9))) < 6) {
setToolTip(i18n("Add transition"));
return TRANSITIONEND;
}
}
void ClipItem::slotPrepareAudioThumb(double pixelForOneFrame, int startpixel, int endpixel, int channels) {
-
- //QRectF re = path.boundingRect();
- QRectF re = rect();
+ QRectF re = sceneBoundingRect();
if (m_clipType == AV) re.setTop(re.y() + re.height() / 2);
- //QRectF re = rect(); //path.boundingRect();
- //kDebug() << "// PREP AUDIO THMB FRMO : " << startpixel << ", to: " << endpixel;
+ //kDebug() << "// PREP AUDIO THMB FRMO : scale:" << pixelForOneFrame<< ", from: " << startpixel << ", to: " << endpixel;
//if ( (!audioThumbWasDrawn || framePixelWidth!=pixelForOneFrame ) && !baseClip()->audioFrameChache.isEmpty()){
- for (int startCache = startpixel - startpixel % 100;startCache + 100 < endpixel + 100;startCache += 100) {
+ for (int startCache = startpixel - startpixel % 100;startCache < endpixel;startCache += 100) {
//kDebug() << "creating " << startCache;
//if (framePixelWidth!=pixelForOneFrame ||
if (framePixelWidth == pixelForOneFrame && audioThumbCachePic.contains(startCache))
continue;
if (audioThumbCachePic[startCache].isNull() || framePixelWidth != pixelForOneFrame) {
audioThumbCachePic[startCache] = QPixmap(100, (int)(re.height()));
- audioThumbCachePic[startCache].fill(QColor(200, 200, 200, 0));
+ audioThumbCachePic[startCache].fill(QColor(180, 180, 200, 140));
}
bool fullAreaDraw = pixelForOneFrame < 10;
QMap<int, QPainterPath > positiveChannelPaths;
QRectF r = boundingRect();
double width = 35 / projectScene()->scale();
double height = r.height() / 2;
+ //WARNING: seems like it generates a full repaint of the clip, maybe not so good...
update(r.x(), r.y() + height, width, height);
update(r.right() - width, r.y() + height, width, height);
}
QRectF r = boundingRect();
double width = 35 / projectScene()->scale();
double height = r.height() / 2;
+ //WARNING: seems like it generates a full repaint of the clip, maybe not so good...
update(r.x(), r.y() + height, width, height);
update(r.right() - width, r.y() + height, width, height);
}
// calculate new position.
if (group() != 0) return pos();
QPointF newPos = value.toPointF();
- kDebug() << "/// MOVING CLIP ITEM.------------";
+ //kDebug() << "/// MOVING CLIP ITEM.------------";
int xpos = projectScene()->getSnapPointForPos((int) newPos.x(), KdenliveSettings::snaptopoints());
xpos = qMax(xpos, 0);
newPos.setX(xpos);
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();
+ }
} 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);
+ 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();
+ }
}
m_track = newTrack;
m_startPos = GenTime((int) newPos.x(), m_fps);
}*/
int ClipItem::effectsCounter() {
- return m_effectsCounter++;
+ return effectsCount() + 1;
}
int ClipItem::effectsCount() {
return m_effectList.size();
}
+int ClipItem::hasEffect(const QString &tag, const QString &id) const {
+ return m_effectList.hasEffect(tag, id);
+}
+
QStringList ClipItem::effectNames() {
return m_effectList.effectNames();
}
void ClipItem::setEffectAt(int ix, QDomElement effect) {
kDebug() << "CHange EFFECT AT: " << ix << ", CURR: " << m_effectList.at(ix).attribute("tag") << ", NEW: " << effect.attribute("tag");
+ effect.setAttribute("kdenlive_ix", ix + 1);
m_effectList.insert(ix, effect);
m_effectList.removeAt(ix + 1);
m_effectNames = m_effectList.effectNames().join(" / ");
bool needRepaint = false;
/*QDomDocument doc;
doc.appendChild(doc.importNode(effect, true));
- kDebug() << "/////// CLIP ADD EFFECT: "<< doc.toString();*/
+ kDebug() << "/////// CLIP ADD EFFECT: " << doc.toString();*/
m_effectList.append(effect);
effectParams["tag"] = effect.attribute("tag");
QString effectId = effect.attribute("id");
else if (e.attribute("name") == "in") fade += e.attribute("value").toInt();
}
} else {
- effectParams[e.attribute("name")] = QString::number(effectParams[e.attribute("name")].toDouble() / f);
+ effectParams[e.attribute("name")] = QString::number(e.attribute("value").toDouble() / f);
}
}
}
void ClipItem::deleteEffect(QString index) {
bool needRepaint = false;
+ QString ix;
for (int i = 0; i < m_effectList.size(); ++i) {
- if (m_effectList.at(i).attribute("kdenlive_ix") == index) {
+ ix = m_effectList.at(i).attribute("kdenlive_ix");
+ if (ix == index) {
if (m_effectList.at(i).attribute("id") == "fadein") {
m_startFade = 0;
needRepaint = true;
needRepaint = true;
}
m_effectList.removeAt(i);
- break;
- }
+ } 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());
projects / kdenlive / blobdiff