Fix Coverity #980683

[kdenlive] / src / keyframehelper.cpp

diff --git a/src/keyframehelper.cpp b/src/keyframehelper.cpp
index a1c9af932c5ccace7e1e12b300d23268d687ce70..d67bd29f9b3649860a8ede54ab7f8b9247f39fb2 100644 (file)
--- a/src/keyframehelper.cpp
+++ b/src/keyframehelper.cpp
@@ -33,15 +33,20 @@
 const int margin = 5;
 const int cursorWidth = 6;
 
+#define SEEK_INACTIVE (-1)
+
 KeyframeHelper::KeyframeHelper(QWidget *parent) :
-        QWidget(parent),
-        m_geom(NULL),
-        m_position(0),
-        m_scale(0),
-        m_movingKeyframe(false),
-        m_lineHeight(9),
-        m_drag(false),
-        m_hoverKeyframe(-1)
+        QWidget(parent)
+       , frameLength(1)
+        , m_geom(NULL)
+        , m_position(0)
+        , m_scale(0)
+        , m_movingKeyframe(false)
+       , m_movingItem()
+        , m_lineHeight(9)
+        , m_drag(false)
+        , m_hoverKeyframe(-1)
+        , m_seekPosition(SEEK_INACTIVE)
 {
     setFont(KGlobalSettings::toolBarFont());
     setMouseTracking(true);
@@ -97,10 +102,13 @@ void KeyframeHelper::mousePressEvent(QMouseEvent * event)
         }
     }
     if (event->y() >= m_lineHeight && event->y() < height()) {
-        m_drag = true;
-        m_position = xPos / m_scale;
-        emit positionChanged(m_position);
-        update();
+       int seekRequest = xPos / m_scale; 
+       m_drag = true;
+       if (seekRequest != m_position) {
+           m_seekPosition = seekRequest;
+           emit requestSeek(m_seekPosition);
+           update();
+       }
     }
 }
 
@@ -167,11 +175,11 @@ void KeyframeHelper::mouseMoveEvent(QMouseEvent * event)
         update();
         return;
     }
-    m_position = xPos / m_scale;
-    m_position = qMax(0, m_position);
-    m_position = qMin(frameLength, m_position);
+    m_seekPosition = (int) (xPos / m_scale);
+    m_seekPosition = qMax(0, m_seekPosition);
+    m_seekPosition = qMin(frameLength, m_seekPosition);
     m_hoverKeyframe = -2;
-    emit positionChanged(m_position);
+    emit requestSeek(m_seekPosition);
     update();
 }
 
@@ -221,7 +229,7 @@ void KeyframeHelper::wheelEvent(QWheelEvent * e)
         ++m_position;
     m_position = qMax(0, m_position);
     m_position = qMin(frameLength, m_position);
-    emit positionChanged(m_position);
+    emit requestSeek(m_position);
     update();
     /*    int delta = 1;
         if (e->modifiers() == Qt::ControlModifier) delta = m_timecode.fps();
@@ -286,9 +294,12 @@ void KeyframeHelper::paintEvent(QPaintEvent *e)
     p.setPen(palette().dark().color());
     p.drawLine(margin, m_lineHeight, width() - margin - 1, m_lineHeight);
     p.drawLine(margin, m_lineHeight - 3, margin, m_lineHeight + 3);
-    p.drawLine(width() - margin - 1, m_lineHeight - 3, width() - margin - 1, m_lineHeight + 3);
+    p.drawLine(width() - margin, m_lineHeight - 3, width() - margin, m_lineHeight + 3);
 
     // draw pointer
+    if (m_seekPosition != SEEK_INACTIVE) {
+       p.fillRect(margin + m_seekPosition * m_scale - 1, 0, 3, height(), palette().dark());
+    }
     QPolygon pa(3);
     const int cursor = margin + m_position * m_scale;
     pa.setPoints(3, cursor - cursorWidth, 16, cursor + cursorWidth, 16, cursor, 10);
@@ -307,6 +318,9 @@ int KeyframeHelper::value() const
 void KeyframeHelper::setValue(const int pos)
 {
     if (pos == m_position || m_geom == NULL) return;
+    if (pos == m_seekPosition) {
+       m_seekPosition = SEEK_INACTIVE;
+    }
     m_position = pos;
     update();
 }
@@ -314,11 +328,7 @@ void KeyframeHelper::setValue(const int pos)
 void KeyframeHelper::setKeyGeometry(Mlt::Geometry *geom, const int length)
 {
     m_geom = geom;
-    frameLength = length;
-    while (!m_extraGeometries.isEmpty()) {
-        Mlt::Geometry *geom = m_extraGeometries.takeFirst();
-        delete geom;
-    }
+    frameLength = qMax(1, length);
     update();
 }