X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fabstractclipitem.cpp;h=a616219cf4e9d6e71909129e419f5e82d16e7aa8;hb=86e06b615e11677bf2b1e83d1f46754946006e41;hp=865edd1294911c7452faff3cd88fc15dc822488a;hpb=5e07370d2e189d73d43bb7dc9be562a8cbc2720f;p=kdenlive

diff --git a/src/abstractclipitem.cpp b/src/abstractclipitem.cpp
index 865edd12..a616219c 100644
--- a/src/abstractclipitem.cpp
+++ b/src/abstractclipitem.cpp
@@ -122,7 +122,7 @@ GenTime AbstractClipItem::cropDuration() const
     return m_info.cropDuration;
 }
 
-void AbstractClipItem::setCropStart(GenTime pos)
+void AbstractClipItem::setCropStart(const GenTime &pos)
 {
     m_info.cropStart = pos;
 }
@@ -261,7 +261,7 @@ GenTime AbstractClipItem::maxDuration() const
     return m_maxDuration;
 }
 
-void AbstractClipItem::drawKeyFrames(QPainter *painter, const QTransform transformation, bool limitedKeyFrames)
+void AbstractClipItem::drawKeyFrames(QPainter *painter, const QTransform &transformation, bool limitedKeyFrames)
 {
     if (m_keyframes.count() < 1)
         return;
@@ -279,7 +279,7 @@ void AbstractClipItem::drawKeyFrames(QPainter *painter, const QTransform transfo
         x2 = br.right();
         if (limitedKeyFrames) {
             QMap<int, int>::const_iterator end = m_keyframes.constEnd();
-            end--;
+            --end;
             x2 = x1 + maxw * (end.key() - start);
             x1 += maxw * (m_keyframes.constBegin().key() - start);
         }
@@ -357,11 +357,9 @@ int AbstractClipItem::mouseOverKeyFrames(QPointF pos, double maxOffset)
     double maxh = br.height() / 100.0 * m_keyframeFactor;
     if (m_keyframes.count() > 0) {
         QMap<int, int>::const_iterator i = m_keyframes.constBegin();
-        double x1;
-        double y1;
         while (i != m_keyframes.constEnd()) {
-            x1 = br.x() + maxw * (i.key() - cropStart().frames(m_fps));
-            y1 = br.bottom() - (i.value() - m_keyframeOffset) * maxh;
+            double x1 = br.x() + maxw * (i.key() - cropStart().frames(m_fps));
+            double y1 = br.bottom() - (i.value() - m_keyframeOffset) * maxh;
             if (qAbs(pos.x() - x1) < maxOffset && qAbs(pos.y() - y1) < 10) {
                 setToolTip('[' + QString::number((GenTime(i.key(), m_fps) - cropStart()).seconds(), 'f', 2) + i18n("seconds") + ", " + QString::number(i.value(), 'f', 1) + ']');
                 return i.key();
@@ -449,6 +447,21 @@ int AbstractClipItem::keyFrameNumber() const
     return m_keyframes.count();
 }
 
+int AbstractClipItem::checkForSingleKeyframe()
+{
+    // Check if we have only one keyframe
+    if (!m_keyframes.isEmpty() && m_keyframes.count() == 1) {
+	int min = (int) cropStart().frames(m_fps);
+	int max = (int)(cropStart() + cropDuration()).frames(m_fps) - 1;
+	if (m_keyframes.contains(min)) {
+	    // Add keyframe at end of clip to allow inserting a new keframe in between
+	    m_keyframes[max] = m_keyframes.value(min);
+	    return m_keyframes.value(min);
+	}
+    }
+    return -1;
+}
+
 int AbstractClipItem::addKeyFrame(const GenTime &pos, const double value)
 {
     QRectF br = sceneBoundingRect();
@@ -532,3 +545,5 @@ bool AbstractClipItem::isMainSelectedClip()
     return m_isMainSelectedClip;
 }
 
+
+#include "abstractclipitem.moc"