#include <KDebug>
-#include <mlt++/Mlt.h>
-
#include "clipitem.h"
#include "customtrackview.h"
#include "renderer.h"
+#include "docclipbase.h"
+#include "transition.h"
#include "events.h"
#include "kdenlivesettings.h"
+#include "kthumb.h"
+
+ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, GenTime cropStart, double scale, double fps)
+ : AbstractClipItem(info, QRectF(), fps), m_clip(clip), m_resizeMode(NONE), m_grabPoint(0), m_maxTrack(0), m_hasThumbs(false), startThumbTimer(NULL), endThumbTimer(NULL), m_effectsCounter(1), audioThumbWasDrawn(false), m_opacity(1.0), m_timeLine(0), m_thumbsRequested(0), m_hover(false) {
+ QRectF rect((double) info.startPos.frames(fps) * scale, (double)(info.track * KdenliveSettings::trackheight() + 1), (double)(info.endPos - info.startPos).frames(fps) * scale, (double)(KdenliveSettings::trackheight() - 1));
+ setRect(rect);
-ClipItem::ClipItem(DocClipBase *clip, int track, GenTime startpos, const QRectF & rect, GenTime duration, double fps)
- : QGraphicsRectItem(rect), m_clip(clip), m_resizeMode(NONE), m_grabPoint(0), m_maxTrack(0), m_track(track), m_startPos(startpos), m_hasThumbs(false), startThumbTimer(NULL), endThumbTimer(NULL), m_startFade(0), m_endFade(0), m_effectsCounter(1), audioThumbWasDrawn(false), m_opacity(1.0), m_timeLine(0), m_thumbsRequested(0), m_fps(fps), m_hover(false) {
- //setToolTip(name);
- // kDebug() << "******* CREATING NEW TML CLIP, DUR: " << duration;
- m_xml = clip->toXML();
m_clipName = clip->name();
m_producer = clip->getId();
m_clipType = clip->clipType();
- m_cropStart = GenTime();
- m_maxDuration = duration;
- if (duration != GenTime()) m_cropDuration = duration;
- else m_cropDuration = m_maxDuration;
+ m_cropStart = cropStart;
+
+ m_maxDuration = clip->maxDuration();
setAcceptDrops(true);
audioThumbReady = clip->audioThumbCreated();
/*
else m_cropDuration = m_maxDuration;*/
- setFlags(QGraphicsItem::ItemClipsToShape | QGraphicsItem::ItemClipsChildrenToShape | QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+ setFlags(QGraphicsItem::ItemClipsToShape | QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
setAcceptsHoverEvents(true);
connect(this , SIGNAL(prepareAudioThumb(double, QPainterPath, int, int)) , this, SLOT(slotPrepareAudioThumb(double, QPainterPath, int, int)));
- setBrush(QColor(100, 100, 150));
- if (m_clipType == VIDEO || m_clipType == AV) {
+ setBrush(QColor(141, 166, 215));
+ if (m_clipType == VIDEO || m_clipType == AV || m_clipType == SLIDESHOW) {
m_hasThumbs = true;
connect(this, SIGNAL(getThumb(int, int)), clip->thumbProducer(), SLOT(extractImage(int, int)));
connect(clip->thumbProducer(), SIGNAL(thumbReady(int, QPixmap)), this, SLOT(slotThumbReady(int, QPixmap)));
endThumbTimer = new QTimer(this);
endThumbTimer->setSingleShot(true);
connect(endThumbTimer, SIGNAL(timeout()), this, SLOT(slotGetEndThumb()));
-
} else if (m_clipType == COLOR) {
- QString colour = m_xml.attribute("colour");
+ QString colour = clip->getProperty("colour");
colour = colour.replace(0, 2, "#");
setBrush(QColor(colour.left(7)));
- } else if (m_clipType == IMAGE) {
- m_startPix = KThumb::getImage(KUrl(m_xml.attribute("resource")), 50 * KdenliveSettings::project_display_ratio(), 50);
+ } else if (m_clipType == IMAGE || m_clipType == TEXT) {
+ m_startPix = KThumb::getImage(KUrl(clip->getProperty("resource")), (int)(50 * KdenliveSettings::project_display_ratio()), 50);
+ m_endPix = m_startPix;
} else if (m_clipType == AUDIO) {
connect(clip, SIGNAL(gotAudioData()), this, SLOT(slotGotAudioData()));
}
if (endThumbTimer) delete endThumbTimer;
}
+void ClipItem::resetThumbs() {
+ slotFetchThumbs();
+ audioThumbCachePic.clear();
+}
+
+
+void ClipItem::refreshClip() {
+ m_maxDuration = m_clip->maxDuration();
+ if (m_clipType == VIDEO || m_clipType == AV || m_clipType == SLIDESHOW) slotFetchThumbs();
+ else if (m_clipType == COLOR) {
+ QString colour = m_clip->getProperty("colour");
+ colour = colour.replace(0, 2, "#");
+ setBrush(QColor(colour.left(7)));
+ } else if (m_clipType == IMAGE || m_clipType == TEXT) {
+ m_startPix = KThumb::getImage(KUrl(m_clip->getProperty("resource")), (int)(50 * KdenliveSettings::project_display_ratio()), 50);
+ m_endPix = m_startPix;
+ }
+}
+
void ClipItem::slotFetchThumbs() {
m_thumbsRequested += 2;
- emit getThumb(m_cropStart.frames(m_fps), (m_cropStart + m_cropDuration).frames(m_fps));
+ emit getThumb((int)m_cropStart.frames(m_fps), (int)(m_cropStart + m_cropDuration).frames(m_fps));
}
void ClipItem::slotGetStartThumb() {
m_thumbsRequested++;
- emit getThumb(m_cropStart.frames(m_fps), -1);
+ emit getThumb((int)m_cropStart.frames(m_fps), -1);
}
void ClipItem::slotGetEndThumb() {
m_thumbsRequested++;
- emit getThumb(-1, (m_cropStart + m_cropDuration).frames(m_fps));
+ emit getThumb(-1, (int)(m_cropStart + m_cropDuration).frames(m_fps));
}
void ClipItem::slotThumbReady(int frame, QPixmap pix) {
}
int ClipItem::type() const {
- return 70000;
+ return AVWIDGET;
}
DocClipBase *ClipItem::baseClip() {
}
QDomElement ClipItem::xml() const {
- return m_xml;
+ return m_clip->toXML();
}
int ClipItem::clipType() {
return m_producer;
}
-GenTime ClipItem::maxDuration() {
- return m_maxDuration;
-}
-
-GenTime ClipItem::duration() {
- return m_cropDuration;
-}
-
-GenTime ClipItem::startPos() {
- return m_startPos;
-}
-
-GenTime ClipItem::cropStart() {
- return m_cropStart;
-}
-
-GenTime ClipItem::endPos() {
- return m_startPos + m_cropDuration;
-}
-
void ClipItem::flashClip() {
if (m_timeLine == 0) {
m_timeLine = new QTimeLine(750, this);
QWidget *widget) {
painter->setOpacity(m_opacity);
QBrush paintColor = brush();
- if (isSelected()) paintColor = QBrush(QColor(150, 50, 100));
+ if (isSelected()) paintColor = QBrush(QColor(79, 93, 121));
QRectF br = rect();
- QRect rectInView;//this is the rect that is visible by the user
- if (scene()->views().size() > 0) {
- rectInView = scene()->views()[0]->viewport()->rect();
- rectInView.moveTo(scene()->views()[0]->horizontalScrollBar()->value(), scene()->views()[0]->verticalScrollBar()->value());
- rectInView.adjust(-10, -10, 10, 10);//make view rect 10 pixel greater on each site, or repaint after scroll event
- //kDebug() << scene()->views()[0]->viewport()->rect() << " " << scene()->views()[0]->horizontalScrollBar()->value();
- }
+ double scale = br.width() / m_cropDuration.frames(m_fps);
+ QRect rectInView = visibleRect();//this is the rect that is visible by the user
+
if (rectInView.isNull())
return;
QPainterPath clippath;
clippath.addRect(rectInView);
- int startpixel = rectInView.x() - rect().x();//start and endpixel that is viewable from rect()
+
+ int startpixel = (int)(rectInView.x() - rect().x()); //start and endpixel that is viewable from rect()
+
if (startpixel < 0)
startpixel = 0;
int endpixel = rectInView.width() + rectInView.x();
if (endpixel < 0)
endpixel = 0;
- painter->setRenderHints(QPainter::Antialiasing);
- QPainterPath roundRectPathUpper, roundRectPathLower;
- double roundingY = 20;
- double roundingX = 20;
- double offset = 1;
+ //painter->setRenderHints(QPainter::Antialiasing);
+
+ QPainterPath roundRectPathUpper = upperRectPart(br), roundRectPathLower = lowerRectPart(br);
painter->setClipRect(option->exposedRect);
- if (roundingX > br.width() / 2) roundingX = br.width() / 2;
- //kDebug()<<"-----PAINTING, SCAL: "<<scale<<", height: "<<br.height();
- roundRectPathUpper.moveTo(br.x() + br .width() - offset, br.y() + br.height() / 2 - offset);
- roundRectPathUpper.arcTo(br.x() + br .width() - roundingX - offset, br.y(), roundingX, roundingY, 0.0, 90.0);
- roundRectPathUpper.lineTo(br.x() + roundingX, br.y());
- roundRectPathUpper.arcTo(br.x() + offset, br.y(), roundingX, roundingY, 90.0, 90.0);
- roundRectPathUpper.lineTo(br.x() + offset, br.y() + br.height() / 2 - offset);
- roundRectPathUpper.closeSubpath();
-
- roundRectPathLower.moveTo(br.x() + offset, br.y() + br.height() / 2 - offset);
- roundRectPathLower.arcTo(br.x() + offset, br.y() + br.height() - roundingY - offset, roundingX, roundingY, 180.0, 90.0);
- roundRectPathLower.lineTo(br.x() + br .width() - roundingX, br.y() + br.height() - offset);
- roundRectPathLower.arcTo(br.x() + br .width() - roundingX - offset, br.y() + br.height() - roundingY - offset, roundingX, roundingY, 270.0, 90.0);
- roundRectPathLower.lineTo(br.x() + br .width() - offset, br.y() + br.height() / 2 - offset);
- roundRectPathLower.closeSubpath();
-
- painter->setClipPath(roundRectPathUpper.united(roundRectPathLower).intersected(clippath), Qt::IntersectClip);
+
+ // build path around clip
+
+ QPainterPath resultClipPath = roundRectPathUpper.united(roundRectPathLower);
+
+ painter->setClipPath(resultClipPath.intersected(clippath), Qt::IntersectClip);
//painter->fillPath(roundRectPath, brush()); //, QBrush(QColor(Qt::red)));
painter->fillRect(br.intersected(rectInView), paintColor);
//painter->fillRect(QRectF(br.x() + br.width() - m_endPix.width(), br.y(), m_endPix.width(), br.height()), QBrush(QColor(Qt::black)));
QLineF l2(br.x() + m_startPix.width(), br.y(), br.x() + m_startPix.width(), br.y() + br.height());
painter->drawLine(l2);
}
+
+ // draw audio thumbnails
if ((m_clipType == AV || m_clipType == AUDIO) && audioThumbReady && KdenliveSettings::audiothumbnails()) {
QPainterPath path = m_clipType == AV ? roundRectPathLower : roundRectPathUpper.united(roundRectPathLower);
- painter->fillPath(path, QBrush(QColor(200, 200, 200, 127)));
+ if (m_clipType == AV) painter->fillPath(path, QBrush(QColor(200, 200, 200, 140)));
int channels = 2;
- double pixelForOneFrame = (double)br.width() / duration().frames(m_fps);
- if (pixelForOneFrame != framePixelWidth)
+ if (scale != framePixelWidth)
audioThumbCachePic.clear();
- emit prepareAudioThumb(pixelForOneFrame, path, startpixel, endpixel + 200);//200 more for less missing parts before repaint after scrolling
-
+ emit prepareAudioThumb(scale, path, startpixel, endpixel + 200);//200 more for less missing parts before repaint after scrolling
+ int cropLeft = (int)((m_cropStart).frames(m_fps) * scale);
for (int startCache = startpixel - startpixel % 100; startCache < endpixel + 300;startCache += 100) {
if (audioThumbCachePic.contains(startCache) && !audioThumbCachePic[startCache].isNull())
- painter->drawPixmap(path.boundingRect().x() + startCache, path.boundingRect().y(), audioThumbCachePic[startCache]);
+ painter->drawPixmap((int)(roundRectPathUpper.united(roundRectPathLower).boundingRect().x() + startCache - cropLeft), (int)(path.boundingRect().y()), audioThumbCachePic[startCache]);
}
-
}
- // draw start / end fades
- double scale = br.width() / m_cropDuration.frames(m_fps);
- 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(br.x() - offset, br.y());
- fadeInPath.lineTo(br.x() - offset, br.y() + br.height());
- fadeInPath.lineTo(br.x() + m_startFade * scale, br.y());
- fadeInPath.closeSubpath();
- painter->fillPath(fadeInPath, fades);
- if (isSelected()) {
- QLineF l(br.x() + m_startFade * scale, br.y(), br.x(), br.y() + br.height());
- painter->drawLine(l);
- }
- }
- if (m_endFade != 0) {
- QPainterPath fadeOutPath;
- fadeOutPath.moveTo(br.x() + br.width(), br.y());
- fadeOutPath.lineTo(br.x() + br.width(), br.y() + br.height());
- fadeOutPath.lineTo(br.x() + br.width() - m_endFade * scale, br.y());
- fadeOutPath.closeSubpath();
- painter->fillPath(fadeOutPath, fades);
- if (isSelected()) {
- QLineF l(br.x() + br.width() - m_endFade * scale, br.y(), br.x() + br.width(), br.y() + br.height());
+ // draw markers
+ QList < CommentedTime > markers = baseClip()->commentedSnapMarkers();
+ QList < CommentedTime >::Iterator it = markers.begin();
+ GenTime pos;
+ double framepos;
+ const int markerwidth = 4;
+ QBrush markerBrush;
+ markerBrush = QBrush(QColor(120, 120, 0, 100));
+ QPen pen = painter->pen();
+ pen.setColor(QColor(255, 255, 255, 200));
+ pen.setStyle(Qt::DotLine);
+ painter->setPen(pen);
+ for (; it != markers.end(); ++it) {
+ pos = (*it).time() - cropStart();
+ if (pos > GenTime()) {
+ if (pos > duration()) break;
+ framepos = scale * pos.frames(m_fps);
+ QLineF l(br.x() + framepos, br.y() + 5, br.x() + framepos, br.y() + br.height() - 5);
painter->drawLine(l);
+ if (KdenliveSettings::showmarkers()) {
+ const QRectF txtBounding = painter->boundingRect(br.x() + framepos + 1, br.y() + 5, br.width() - framepos - 2, br.height() - 10, Qt::AlignLeft | Qt::AlignTop, " " + (*it).comment() + " ");
+ QPainterPath path;
+ path.addRoundedRect(txtBounding, 3, 3);
+ painter->fillPath(path, markerBrush);
+ painter->drawText(txtBounding, Qt::AlignCenter, (*it).comment());
+ }
+ //painter->fillRect(QRect(br.x() + framepos, br.y(), 10, br.height()), QBrush(QColor(0, 0, 0, 150)));
}
}
+ pen.setColor(Qt::black);
+ pen.setStyle(Qt::SolidLine);
+
+
+ /*
+ // 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(br.x() , br.y());
+ fadeInPath.lineTo(br.x() , br.y() + br.height());
+ fadeInPath.lineTo(br.x() + m_startFade * scale, br.y());
+ fadeInPath.closeSubpath();
+ painter->fillPath(fadeInPath, fades);
+ if (isSelected()) {
+ QLineF l(br.x() + m_startFade * scale, br.y(), br.x(), br.y() + br.height());
+ painter->drawLine(l);
+ }
+ }
+ if (m_endFade != 0) {
+ QPainterPath fadeOutPath;
+ fadeOutPath.moveTo(br.x() + br.width(), br.y());
+ fadeOutPath.lineTo(br.x() + br.width(), br.y() + br.height());
+ fadeOutPath.lineTo(br.x() + br.width() - m_endFade * scale, br.y());
+ fadeOutPath.closeSubpath();
+ painter->fillPath(fadeOutPath, fades);
+ if (isSelected()) {
+ QLineF l(br.x() + br.width() - m_endFade * scale, br.y(), br.x() + br.width(), br.y() + br.height());
+ painter->drawLine(l);
+ }
+ }
+ */
- QPen pen = painter->pen();
- pen.setColor(Qt::white);
//pen.setStyle(Qt::DashDotDotLine); //Qt::DotLine);
- // Draw clip name
+
+ // Draw effects names
QString effects = effectNames().join(" / ");
if (!effects.isEmpty()) {
painter->setPen(pen);
painter->setFont(font);
}
- pen.setColor(Qt::red);
- //pen.setStyle(Qt::DashDotDotLine); //Qt::DotLine);
- if (isSelected()) painter->setPen(pen);
- painter->setClipRect(option->exposedRect);
- painter->drawPath(roundRectPathUpper.united(roundRectPathLower).intersected(clippath));
+ /*
+ // For testing puspose only: draw transitions count
+ {
+ painter->setPen(pen);
+ QFont font = painter->font();
+ QFont smallFont = font;
+ smallFont.setPointSize(8);
+ painter->setFont(smallFont);
+ QString txt = " Transitions: " + QString::number(m_transitionsList.count()) + " ";
+ QRectF txtBoundin = painter->boundingRect(br, Qt::AlignRight | Qt::AlignTop, txt);
+ painter->fillRect(txtBoundin, QBrush(QColor(0, 0, 0, 150)));
+ painter->drawText(txtBoundin, Qt::AlignCenter, txt);
+ pen.setColor(Qt::black);
+ painter->setPen(pen);
+ painter->setFont(font);
+ }
+ */
- QRectF txtBounding = painter->boundingRect(br, Qt::AlignCenter, " " + m_clipName + " ");
- painter->fillRect(txtBounding, QBrush(QColor(255, 255, 255, 150)));
+ // Draw clip name
+ QRectF txtBounding = painter->boundingRect(br, 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);
-
+ txtBounding.translate(QPointF(1, 1));
+ painter->setPen(QColor(255, 255, 255, 255));
+ painter->drawText(txtBounding, Qt::AlignCenter, m_clipName);
+ // draw frame around clip
+ if (isSelected()) {
+ pen.setColor(Qt::red);
+ pen.setWidth(2);
+ } else {
+ pen.setColor(Qt::black);
+ pen.setWidth(1);
+ }
+ painter->setPen(pen);
+ painter->setClipRect(option->exposedRect);
+ painter->drawPath(resultClipPath.intersected(clippath));
//painter->fillRect(startpixel,0,startpixel+endpixel,(int)br.height(), QBrush(QColor(255,255,255,150)));
//painter->fillRect(QRect(br.x(), br.y(), roundingX, roundingY), QBrush(QColor(Qt::green)));
// painter->drawRect(boundingRect());
//painter->drawRoundRect(-10, -10, 20, 20);
if (m_hover) {
+ int pointy = (int)(br.y() + br.height() / 2 - 5);
+ int pointx1 = (int)(br.x() + 10);
+ int pointx2 = (int)(br.x() + br.width() - 20);
+#if 0
painter->setPen(QPen(Qt::black));
- painter->setBrush(QBrush(Qt::yellow));
- painter->drawEllipse(br.x() + 10, br.y() + br.height() / 2 - 5 , 10, 10);
- painter->drawEllipse(br.x() + br.width() - 20, br.y() + br.height() / 2 - 5, 10, 10);
+ painter->setBrush(QBrush(QColor(50, 50, 0)));
+#else
+ QRadialGradient gradient(pointx1 + 5, pointy + 5 , 5, 2, 2);
+ gradient.setColorAt(0.2, Qt::white);
+ gradient.setColorAt(0.8, Qt::yellow);
+ gradient.setColorAt(1, Qt::black);
+ painter->setBrush(gradient);
+#endif
+ painter->drawEllipse(pointx1, pointy , 10, 10);
+
+ QRadialGradient gradient1(pointx2 + 5, pointy + 5 , 5, 2, 2);
+ gradient1.setColorAt(0.2, Qt::white);
+ gradient1.setColorAt(0.8, Qt::yellow);
+ gradient1.setColorAt(1, Qt::black);
+ painter->setBrush(gradient1);
+ painter->drawEllipse(pointx2, pointy, 10, 10);
+
}
}
OPERATIONTYPE ClipItem::operationMode(QPointF pos, double scale) {
- if (abs(pos.x() - (rect().x() + scale * m_startFade)) < 6 && abs(pos.y() - rect().y()) < 6) return FADEIN;
- else if (abs(pos.x() - rect().x()) < 6) return RESIZESTART;
- else if (abs(pos.x() - (rect().x() + rect().width() - scale * m_endFade)) < 6 && abs(pos.y() - rect().y()) < 6) return FADEOUT;
- else if (abs(pos.x() - (rect().x() + rect().width())) < 6) return RESIZEEND;
- else if (abs(pos.x() - (rect().x() + 10)) < 6 && abs(pos.y() - (rect().y() + rect().height() / 2 - 5)) < 6) return TRANSITIONSTART;
- else if (abs(pos.x() - (rect().x() + rect().width() - 20)) < 6 && abs(pos.y() - (rect().y() + rect().height() / 2 - 5)) < 6) return TRANSITIONEND;
+ if (qAbs((int)(pos.x() - (rect().x() + scale * m_startFade))) < 6 && qAbs((int)(pos.y() - rect().y())) < 6) return FADEIN;
+ else if (qAbs((int)(pos.x() - rect().x())) < 6) return RESIZESTART;
+ else if (qAbs((int)(pos.x() - (rect().x() + rect().width() - scale * m_endFade))) < 6 && qAbs((int)(pos.y() - rect().y())) < 6) return FADEOUT;
+ else if (qAbs((int)(pos.x() - (rect().x() + rect().width()))) < 6) return RESIZEEND;
+ else if (qAbs((int)(pos.x() - (rect().x() + 10))) < 6 && qAbs((int)(pos.y() - (rect().y() + rect().height() / 2 - 5))) < 6) return TRANSITIONSTART;
+ else if (qAbs((int)(pos.x() - (rect().x() + rect().width() - 20))) < 6 && qAbs((int)(pos.y() - (rect().y() + rect().height() / 2 - 5))) < 6) return TRANSITIONEND;
+
return MOVE;
}
+QList <GenTime> ClipItem::snapMarkers() {
+ QList < GenTime > snaps;
+ QList < GenTime > markers = baseClip()->snapMarkers();
+ GenTime pos;
+ double framepos;
+
+ for (int i = 0; i < markers.size(); i++) {
+ pos = markers.at(i) - cropStart();
+ if (pos > GenTime()) {
+ if (pos > duration()) break;
+ else snaps.append(pos + startPos());
+ }
+ }
+ return snaps;
+}
+
void ClipItem::slotPrepareAudioThumb(double pixelForOneFrame, QPainterPath path, int startpixel, int endpixel) {
int channels = 2;
if (framePixelWidth == pixelForOneFrame && audioThumbCachePic.contains(startCache))
continue;
if (audioThumbCachePic[startCache].isNull() || framePixelWidth != pixelForOneFrame) {
- audioThumbCachePic[startCache] = QPixmap(100, re.height());
- audioThumbCachePic[startCache].fill(QColor(200, 200, 200, 127));
+ audioThumbCachePic[startCache] = QPixmap(100, (int)(re.height()));
+ audioThumbCachePic[startCache].fill(QColor(200, 200, 200, 0));
}
bool fullAreaDraw = pixelForOneFrame < 10;
QMap<int, QPainterPath > positiveChannelPaths;
for (int samples = 0;samples <= 100;samples++) {
double frame = (double)(samples + startCache - 0) / pixelForOneFrame;
- int sample = (frame - (int)(frame)) * 20 ;// AUDIO_FRAME_SIZE
+ 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()->audioFrameChache[(int)frame];
}
}
+ if (m_clipType != AV) pixpainter.setBrush(QBrush(QColor(200, 200, 100)));
+ else {
+ pixpainter.setPen(QPen(QColor(0, 0, 0)));
+ pixpainter.setBrush(QBrush(QColor(60, 60, 60)));
+ }
for (int i = 0;i < channels;i++) {
if (fullAreaDraw) {
//pixpainter.fillPath(positiveChannelPaths[i].united(negativeChannelPaths[i]),QBrush(Qt::SolidPattern));//or singleif looks better
- pixpainter.setBrush(QBrush(QColor(200, 200, 100, 200)));
pixpainter.drawPath(positiveChannelPaths[i].united(negativeChannelPaths[i]));//or singleif looks better
} else
pixpainter.drawPath(positiveChannelPaths[i]);
//}
}
-int ClipItem::fadeIn() const {
- return m_startFade;
-}
-int ClipItem::fadeOut() const {
- return m_endFade;
-}
void ClipItem::setFadeIn(int pos, double scale) {
int oldIn = m_startFade;
if (pos < 0) pos = 0;
- if (pos > m_cropDuration.frames(m_fps)) pos = m_cropDuration.frames(m_fps) / 2;
+ if (pos > m_cropDuration.frames(m_fps)) pos = (int)(m_cropDuration.frames(m_fps) / 2);
m_startFade = pos;
if (oldIn > pos) update(rect().x(), rect().y(), oldIn * scale, rect().height());
else update(rect().x(), rect().y(), pos * scale, rect().height());
void ClipItem::setFadeOut(int pos, double scale) {
int oldOut = m_endFade;
if (pos < 0) pos = 0;
- if (pos > m_cropDuration.frames(m_fps)) pos = m_cropDuration.frames(m_fps) / 2;
+ if (pos > m_cropDuration.frames(m_fps)) pos = (int)(m_cropDuration.frames(m_fps) / 2);
m_endFade = pos;
if (oldOut > pos) update(rect().x() + rect().width() - pos * scale, rect().y(), pos * scale, rect().height());
else update(rect().x() + rect().width() - oldOut * scale, rect().y(), oldOut * scale, rect().height());
}
-
// virtual
void ClipItem::mousePressEvent(QGraphicsSceneMouseEvent * event) {
/*m_resizeMode = operationMode(event->pos());
update();
}
-void ClipItem::moveTo(int x, double scale, double offset, int newTrack) {
- double origX = rect().x();
- double origY = rect().y();
- bool success = true;
- if (x < 0) return;
- setRect(x * scale, origY + offset, rect().width(), rect().height());
- QList <QGraphicsItem *> collisionList = collidingItems(Qt::IntersectsItemBoundingRect);
- if (collisionList.size() == 0) m_track = newTrack;
- for (int i = 0; i < collisionList.size(); ++i) {
- QGraphicsItem *item = collisionList.at(i);
- if (item->type() == 70000) {
- if (offset == 0) {
- QRectF other = ((QGraphicsRectItem *)item)->rect();
- if (x < m_startPos.frames(m_fps)) {
- kDebug() << "COLLISION, MOVING TO------";
- m_startPos = ((ClipItem *)item)->endPos() + GenTime(1, m_fps);
- origX = m_startPos.frames(m_fps) * scale;
- } else {
- kDebug() << "COLLISION, MOVING TO+++";
- m_startPos = ((ClipItem *)item)->startPos() - m_cropDuration;
- origX = m_startPos.frames(m_fps) * scale;
- }
- }
- setRect(origX, origY, rect().width(), rect().height());
- offset = 0;
- origX = rect().x();
- success = false;
- break;
- }
- }
- if (success) {
- m_track = newTrack;
- m_startPos = GenTime(x, m_fps);
- }
- /* QList <QGraphicsItem *> childrenList = QGraphicsItem::children();
- for (int i = 0; i < childrenList.size(); ++i) {
- childrenList.at(i)->moveBy(rect().x() - origX , offset);
- }*/
-}
-
void ClipItem::resizeStart(int posx, double scale) {
- GenTime durationDiff = GenTime(posx, m_fps) - m_startPos;
- if (durationDiff == GenTime()) return;
- //kDebug() << "-- RESCALE: CROP=" << m_cropStart << ", DIFF = " << durationDiff;
- if (m_cropStart + durationDiff < GenTime()) {
- durationDiff = GenTime() - m_cropStart;
- } else if (durationDiff >= m_cropDuration) {
- durationDiff = m_cropDuration - GenTime(3, m_fps);
- }
- m_startPos += durationDiff;
- m_cropStart += durationDiff;
- m_cropDuration = m_cropDuration - durationDiff;
- setRect(m_startPos.frames(m_fps) * scale, rect().y(), m_cropDuration.frames(m_fps) * scale, rect().height());
- QList <QGraphicsItem *> collisionList = collidingItems(Qt::IntersectsItemBoundingRect);
- for (int i = 0; i < collisionList.size(); ++i) {
- QGraphicsItem *item = collisionList.at(i);
- if (item->type() == 70000) {
- GenTime diff = ((ClipItem *)item)->endPos() + GenTime(1, m_fps) - m_startPos;
- setRect((m_startPos + diff).frames(m_fps) * scale, rect().y(), (m_cropDuration - diff).frames(m_fps) * scale, rect().height());
- m_startPos += diff;
- m_cropStart += diff;
- m_cropDuration = m_cropDuration - diff;
- break;
- }
- }
+ AbstractClipItem::resizeStart(posx, scale);
if (m_hasThumbs) startThumbTimer->start(100);
}
void ClipItem::resizeEnd(int posx, double scale) {
- GenTime durationDiff = GenTime(posx, m_fps) - endPos();
- if (durationDiff == GenTime()) return;
- //kDebug() << "-- RESCALE: CROP=" << m_cropStart << ", DIFF = " << durationDiff;
- if (m_cropDuration + durationDiff <= GenTime()) {
- durationDiff = GenTime() - (m_cropDuration - GenTime(3, m_fps));
- } else if (m_cropDuration + durationDiff >= m_maxDuration) {
- durationDiff = m_maxDuration - m_cropDuration;
- }
- m_cropDuration += durationDiff;
- setRect(m_startPos.frames(m_fps) * scale, rect().y(), m_cropDuration.frames(m_fps) * scale, rect().height());
- QList <QGraphicsItem *> collisionList = collidingItems(Qt::IntersectsItemBoundingRect);
- for (int i = 0; i < collisionList.size(); ++i) {
- QGraphicsItem *item = collisionList.at(i);
- if (item->type() == 70000) {
- GenTime diff = ((ClipItem *)item)->startPos() - GenTime(1, m_fps) - startPos();
- m_cropDuration = diff;
- setRect(m_startPos.frames(m_fps) * scale, rect().y(), m_cropDuration.frames(m_fps) * scale, rect().height());
- break;
- }
- }
+ AbstractClipItem::resizeEnd(posx, scale);
if (m_hasThumbs) endThumbTimer->start(100);
}
void ClipItem::mouseMoveEvent(QGraphicsSceneMouseEvent * event) {
}
-int ClipItem::track() {
- return m_track;
-}
-
-void ClipItem::setTrack(int track) {
- m_track = track;
-}
-
int ClipItem::effectsCounter() {
return m_effectsCounter++;
}
update(boundingRect());
}
-QMap <QString, QString> ClipItem::addEffect(QDomElement effect) {
+QMap <QString, QString> ClipItem::addEffect(QDomElement effect, bool animate) {
QMap <QString, QString> effectParams;
+ /*QDomDocument doc;
+ doc.appendChild(doc.importNode(effect, true));
+ kDebug() << "/////// CLIP ADD EFFECT: "<< doc.toString();*/
m_effectList.append(effect);
effectParams["tag"] = effect.attribute("tag");
effectParams["kdenlive_ix"] = effect.attribute("kdenlive_ix");
effectParams[e.attribute("name")] = QString::number(effectParams[e.attribute("name")].toDouble() / e.attribute("factor").toDouble());
}
}
- flashClip();
+ if (animate) flashClip();
update(boundingRect());
return effectParams;
}
QDomNodeList params = effect.elementsByTagName("parameter");
for (int i = 0; i < params.count(); i++) {
QDomElement e = params.item(i).toElement();
- if (e.attribute("name").contains(";")) {
+ if (e.attribute("namedesc").contains(";")) {
QString format = e.attribute("format");
QStringList separators = format.split("%d", QString::SkipEmptyParts);
QStringList values = e.attribute("value").split(QRegExp("[,:;x]"));
doc.setContent(effects, true);
QDomElement e = doc.documentElement();
CustomTrackView *view = (CustomTrackView *) scene()->views()[0];
- if (view) view->slotAddEffect(e, m_startPos, m_track);
+ if (view) view->slotAddEffect(e, m_startPos, track());
}
//virtual
void ClipItem::dragLeaveEvent(QGraphicsSceneDragDropEvent *event) {
Q_UNUSED(event);
}
-
+void ClipItem::addTransition(Transition* t) {
+ m_transitionsList.append(t);
+ CustomTrackView *view = (CustomTrackView *) scene()->views()[0];
+ QDomDocument doc;
+ QDomElement e = doc.documentElement();
+ //if (view) view->slotAddTransition(this, t->toXML() , t->startPos(), track());
+}
// virtual
/*
void CustomTrackView::mousePressEvent ( QMouseEvent * event )
projects / kdenlive / blobdiff