Cleanup monitor ruler update on seeking

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 529e6304ee53e0ef8d253c22f2fdf365b7c77419..ccf1511da87afc7cce60e85ae81cd0b7bd792763 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -175,7 +175,6 @@ Monitor::Monitor(Kdenlive::MONITORID id, MonitorManager *manager, QString profil
     layout->addWidget(m_ruler);
     
     connect(m_audioSlider, SIGNAL(valueChanged(int)), this, SLOT(slotSetVolume(int)));
-    connect(m_ruler, SIGNAL(seekRenderer(int)), this, SLOT(slotSeek(int)));
     connect(render, SIGNAL(durationChanged(int)), this, SLOT(adjustRulerSize(int)));
     connect(render, SIGNAL(rendererStopped(int)), this, SLOT(rendererStopped(int)));
     connect(render, SIGNAL(rendererPosition(int)), this, SLOT(seekCursor(int)));
@@ -710,7 +709,6 @@ void Monitor::slotForwardOneFrame(int diff)
 
 void Monitor::seekCursor(int pos)
 {
-    //slotActivateMonitor();
     if (m_ruler->slotNewValue(pos)) {
         checkOverlay();
         m_timePos->setValue(pos);

diff --git a/src/smallruler.cpp b/src/smallruler.cpp
index 0b0ac1d62c237e46c271c4f43cbd502a84c2bf59..79683d047113a63db5bcf7eb4ae8b725bf0c0855 100644 (file)
--- a/src/smallruler.cpp
+++ b/src/smallruler.cpp
@@ -38,6 +38,7 @@ SmallRuler::SmallRuler(MonitorManager *manager, Render *render, QWidget *parent)
         ,m_maxval(25)
         ,m_manager(manager)
        ,m_render(render)
+       ,m_lastSeekPosition(SEEK_INACTIVE)
 {
     m_zoneStart = 10;
     m_zoneEnd = 60;
@@ -128,7 +129,9 @@ void SmallRuler::mousePressEvent(QMouseEvent * event)
         updatePixmap();
 
     } else {
-       emit seekRenderer((int) pos);
+       m_render->seekToFrame(pos);
+       m_lastSeekPosition = pos;
+       update();
     }
 }
 
@@ -138,7 +141,8 @@ void SmallRuler::mouseMoveEvent(QMouseEvent * event)
 {
     const int pos = event->x() / m_scale;
     if (event->buttons() & Qt::LeftButton) {
-        emit seekRenderer((int) pos);
+       m_render->seekToFrame(pos);
+       m_lastSeekPosition = pos;
        update();
     }
     else {
@@ -154,9 +158,13 @@ void SmallRuler::mouseMoveEvent(QMouseEvent * event)
 
 bool SmallRuler::slotNewValue(int value)
 {
-    /*if (value == m_cursorFramePosition) return false;
+    if (m_render->requestedSeekPosition != SEEK_INACTIVE) {
+       m_lastSeekPosition = m_render->requestedSeekPosition;
+       if (value == m_lastSeekPosition) m_lastSeekPosition = SEEK_INACTIVE;
+    }
+    if (value == m_cursorFramePosition) return false;
     m_cursorFramePosition = value;
-    int oldPos = m_cursorPosition;
+    /*int oldPos = m_cursorPosition;
     m_cursorPosition = value * m_scale;
     const int offset = 6;
     const int x = qMin(oldPos, m_cursorPosition);
@@ -177,6 +185,7 @@ void SmallRuler::updatePixmap()
 {
     m_pixmap = QPixmap(width(), height());
     m_pixmap.fill(palette().window().color());
+    m_lastSeekPosition = SEEK_INACTIVE;
     QPainter p(&m_pixmap);
     double f, fend;
 
@@ -219,7 +228,7 @@ void SmallRuler::paintEvent(QPaintEvent *e)
     p.setClipRect(r);
     p.drawPixmap(QPointF(), m_pixmap);
 
-    int cursorPos = m_render->seekFramePosition() * m_scale;
+    int cursorPos = m_cursorFramePosition * m_scale;
     // draw pointer
     QPolygon pa(3);
     pa.setPoints(3, cursorPos - 6, 10, cursorPos + 6, 10, cursorPos/*+0*/, 4);
@@ -228,9 +237,8 @@ void SmallRuler::paintEvent(QPaintEvent *e)
     p.drawPolygon(pa);
 
     // Draw seeking pointer
-    if (m_render->requestedSeekPosition != SEEK_INACTIVE) {
-       int seekPos = m_render->requestedSeekPosition * m_scale - 1;
-       p.fillRect(seekPos, 0, 3, height(), palette().highlight());
+    if (m_lastSeekPosition != SEEK_INACTIVE && m_lastSeekPosition != m_cursorFramePosition) {
+       p.fillRect(m_lastSeekPosition * m_scale - 1, 0, 3, height(), palette().highlight());
     }
 }
 

diff --git a/src/smallruler.h b/src/smallruler.h
index c37aa3e85f924d3a2f0ef277966b290324cc0888..b715ef00d3418156d0713372c0930797778a2276 100644 (file)
--- a/src/smallruler.h
+++ b/src/smallruler.h
@@ -61,13 +61,13 @@ private:
     QPixmap m_pixmap;
     MonitorManager *m_manager;
     Render *m_render;
+    int m_lastSeekPosition;
     void updatePixmap();
 
 public slots:
     bool slotNewValue(int value);
 
 signals:
-    void seekRenderer(int);
     void zoneChanged(QPoint);
 };