First steps for downloadable rendering profiles

[kdenlive] / src / clipitem.cpp

diff --git a/src/clipitem.cpp b/src/clipitem.cpp
index 1b493385ae4661d36d449d56581480c230129950..98e9b3c76b359a01fb3299b501eab927e30b6979 100644 (file)
--- a/src/clipitem.cpp
+++ b/src/clipitem.cpp
@@ -40,13 +40,17 @@
 #include "kthumb.h"
 
 
-ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, bool generateThumbs)
-        : AbstractClipItem(info, QRectF(), fps), m_clip(clip), m_resizeMode(NONE), m_grabPoint(0), m_maxTrack(0), m_hasThumbs(false), startThumbTimer(NULL), endThumbTimer(NULL), audioThumbWasDrawn(false), m_opacity(1.0), m_timeLine(0), m_startThumbRequested(false), m_endThumbRequested(false), m_startFade(0), m_endFade(0), m_hover(false), m_selectedEffect(-1), m_speed(1.0), framePixelWidth(0), m_startPix(QPixmap()), m_endPix(QPixmap()) {
+ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, double fps, double speed, bool generateThumbs)
+        : AbstractClipItem(info, QRectF(), fps), m_clip(clip), m_resizeMode(NONE), m_grabPoint(0), m_maxTrack(0), m_hasThumbs(false), startThumbTimer(NULL), endThumbTimer(NULL), audioThumbWasDrawn(false), m_opacity(1.0), m_timeLine(0), m_startThumbRequested(false), m_endThumbRequested(false), m_startFade(0), m_endFade(0), m_hover(false), m_selectedEffect(-1), m_speed(speed), framePixelWidth(0), m_startPix(QPixmap()), m_endPix(QPixmap()) {
     setZValue(1);
     setRect(0, 0, (info.endPos - info.startPos).frames(fps) - 0.02, (double)(KdenliveSettings::trackheight() - 2));
     setPos(info.startPos.frames(fps), (double)(info.track * KdenliveSettings::trackheight()) + 1);
 
-    m_clipName = clip->name();
+    if (m_speed == 1.0) m_clipName = clip->name();
+    else {
+        m_clipName = clip->name() + " - " + QString::number(m_speed * 100, 'f', 0) + "%";
+        m_cropDuration = m_cropDuration * m_speed;
+    }
     m_producer = clip->getId();
     m_clipType = clip->clipType();
     m_cropStart = info.cropStart;
@@ -108,12 +112,12 @@ ClipItem::~ClipItem() {
 }
 
 ClipItem *ClipItem::clone(ItemInfo info) const {
-    ClipItem *duplicate = new ClipItem(m_clip, info, m_fps);
+    ClipItem *duplicate = new ClipItem(m_clip, info, m_fps, m_speed);
     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.clone());
-    duplicate->setSpeed(m_speed);
+    //duplicate->setSpeed(m_speed);
     return duplicate;
 }
 
@@ -462,7 +466,9 @@ DocClipBase *ClipItem::baseClip() const {
 }
 
 QDomElement ClipItem::xml() const {
-    return m_clip->toXML();
+    QDomElement xml = m_clip->toXML();
+    if (m_speed != 1.0) xml.setAttribute("speed", m_speed);
+    return xml;
 }
 
 int ClipItem::clipType() const {
@@ -473,6 +479,10 @@ QString ClipItem::clipName() const {
     return m_clipName;
 }
 
+void ClipItem::setClipName(const QString &name) {
+    m_clipName = name;
+}
+
 const QString &ClipItem::clipProducer() const {
     return m_producer;
 }
@@ -729,6 +739,8 @@ void ClipItem::paint(QPainter *painter,
 
 
 OPERATIONTYPE ClipItem::operationMode(QPointF pos) {
+    if (isItemLocked()) return NONE;
+
     if (isSelected()) {
         m_editedKeyframe = mouseOverKeyFrames(pos);
         if (m_editedKeyframe != -1) return KEYFRAME;
@@ -929,6 +941,7 @@ void ClipItem::mouseReleaseEvent(QGraphicsSceneMouseEvent * event) {
 //virtual
 void ClipItem::hoverEnterEvent(QGraphicsSceneHoverEvent *e) {
     //if (e->pos().x() < 20) m_hover = true;
+    if (isItemLocked()) return;
     m_hover = true;
     QRectF r = boundingRect();
     double width = 35 / projectScene()->scale();
@@ -940,6 +953,7 @@ void ClipItem::hoverEnterEvent(QGraphicsSceneHoverEvent *e) {
 
 //virtual
 void ClipItem::hoverLeaveEvent(QGraphicsSceneHoverEvent *) {
+    if (isItemLocked()) return;
     m_hover = false;
     QRectF r = boundingRect();
     double width = 35 / projectScene()->scale();
@@ -955,10 +969,12 @@ void ClipItem::resizeStart(int posx, double speed) {
     if (posx == startPos().frames(m_fps)) return;
     const int previous = cropStart().frames(m_fps);
     AbstractClipItem::resizeStart(posx, m_speed);
-    checkEffectsKeyframesPos(previous, cropStart().frames(m_fps), true);
-    if (m_hasThumbs && KdenliveSettings::videothumbnails()) {
-        /*connect(m_clip->thumbProducer(), SIGNAL(thumbReady(int, QPixmap)), this, SLOT(slotThumbReady(int, QPixmap)));*/
-        startThumbTimer->start(100);
+    if ((int) cropStart().frames(m_fps) != previous) {
+        checkEffectsKeyframesPos(previous, cropStart().frames(m_fps), true);
+        if (m_hasThumbs && KdenliveSettings::videothumbnails()) {
+            /*connect(m_clip->thumbProducer(), SIGNAL(thumbReady(int, QPixmap)), this, SLOT(slotThumbReady(int, QPixmap)));*/
+            startThumbTimer->start(150);
+        }
     }
 }
 
@@ -969,10 +985,12 @@ void ClipItem::resizeEnd(int posx, double speed, bool updateKeyFrames) {
     //kDebug() << "// NEW POS: " << posx << ", OLD END: " << endPos().frames(m_fps);
     const int previous = (cropStart() + duration()).frames(m_fps);
     AbstractClipItem::resizeEnd(posx, m_speed);
-    if (updateKeyFrames) checkEffectsKeyframesPos(previous, (cropStart() + duration()).frames(m_fps), false);
-    if (m_hasThumbs && KdenliveSettings::videothumbnails()) {
-        /*connect(m_clip->thumbProducer(), SIGNAL(thumbReady(int, QPixmap)), this, SLOT(slotThumbReady(int, QPixmap)));*/
-        endThumbTimer->start(100);
+    if ((int)(cropStart() + duration()).frames(m_fps) != previous) {
+        if (updateKeyFrames) checkEffectsKeyframesPos(previous, (cropStart() + duration()).frames(m_fps), false);
+        if (m_hasThumbs && KdenliveSettings::videothumbnails()) {
+            /*connect(m_clip->thumbProducer(), SIGNAL(thumbReady(int, QPixmap)), this, SLOT(slotThumbReady(int, QPixmap)));*/
+            endThumbTimer->start(150);
+        }
     }
 }
 
@@ -1042,7 +1060,7 @@ QVariant ClipItem::itemChange(GraphicsItemChange change, const QVariant &value)
                         return pos();
                     }
                     if (forwardMove) {
-                        offset = qMax(offset, (int)(newPos.x() - (static_cast < AbstractClipItem* >(items.at(i))->startPos() - m_cropDuration).frames(m_fps)));
+                        offset = qMax(offset, (int)(newPos.x() - (static_cast < AbstractClipItem* >(items.at(i))->startPos() - cropDuration()).frames(m_fps)));
                     } else {
                         offset = qMax(offset, (int)((static_cast < AbstractClipItem* >(items.at(i))->endPos().frames(m_fps)) - newPos.x()));
                     }
@@ -1058,7 +1076,10 @@ QVariant ClipItem::itemChange(GraphicsItemChange change, const QVariant &value)
                         QList<QGraphicsItem*> subitems = scene()->items(sceneShape, Qt::IntersectsItemShape);
                         subitems.removeAll(this);
                         for (int j = 0; j < subitems.count(); j++) {
-                            if (subitems.at(j)->type() == type()) return pos();
+                            if (subitems.at(j)->type() == type()) {
+                                m_startPos = GenTime((int) pos().x(), m_fps);
+                                return pos();
+                            }
                         }
                     }
 
@@ -1250,7 +1271,10 @@ void ClipItem::deleteEffect(QString index) {
                 needRepaint = true;
             }
             m_effectList.removeAt(i);
-        } else if (ix.toInt() > index.toInt()) m_effectList[i].setAttribute("kdenlive_ix", ix.toInt() - 1);
+            i--;
+        } else if (ix.toInt() > index.toInt()) {
+            m_effectList[i].setAttribute("kdenlive_ix", ix.toInt() - 1);
+        }
     }
     m_effectNames = m_effectList.effectNames().join(" / ");
     if (needRepaint) update(boundingRect());
@@ -1296,7 +1320,8 @@ void ClipItem::dropEvent(QGraphicsSceneDragDropEvent * event) {
 
 //virtual
 void ClipItem::dragEnterEvent(QGraphicsSceneDragDropEvent *event) {
-    event->setAccepted(event->mimeData()->hasFormat("kdenlive/effectslist"));
+    if (isItemLocked()) event->setAccepted(false);
+    else event->setAccepted(event->mimeData()->hasFormat("kdenlive/effectslist"));
 }
 
 void ClipItem::dragLeaveEvent(QGraphicsSceneDragDropEvent *event) {