fix seeking issue

svn path=/branches/KDE4/; revision=1832

diff --git a/src/customruler.cpp b/src/customruler.cpp
index 478abcfc67d8ead6cd992e3620bd24bdbaf484d0..901622bb0bbb562eefa858cf4ef64e45f7a79fa3 100644 (file)
--- a/src/customruler.cpp
+++ b/src/customruler.cpp
@@ -92,7 +92,6 @@ void CustomRuler::mousePressEvent ( QMouseEvent * event )
 {
   int pos = event->x();
   slotMoveCursor( pos, true );
-  kDebug()<<pos;
 }
 
 // virtual

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 8c19cb8a0f7e183516826bab800f656a654a6b33..be6354d9227ecd78612cf11bc98ebc9eb14fb6b9 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -325,7 +325,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //chang
     m_activeDocument->setProducers(m_projectList->producersList());
     m_activeDocument->setRenderer(NULL);
   }
-  connect(trackView, SIGNAL(cursorMoved(int)), m_projectMonitor, SLOT(slotSeek(int)));
+  connect(trackView, SIGNAL(cursorMoved()), m_projectMonitor, SLOT(activateMonitor()));
   connect(trackView, SIGNAL(mousePosition(int)), this, SLOT(slotUpdateMousePosition(int)));
   connect(m_projectMonitor, SIGNAL(renderPosition(int)), trackView, SLOT(moveCursorPos(int)));
   m_projectList->setDocument(doc);

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 3d70ff0153a0a15facfca0476341ec8dd47c9c8a..563c6557290575dea49e90d4f5569f27264b46df 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -78,6 +78,11 @@ void Monitor::wheelEvent ( QWheelEvent * event )
   else slotRewindOneFrame();
 }
 
+void Monitor::activateMonitor()
+{
+  if (!m_isActive) m_monitorManager->activateMonitor(m_name);
+}
+
 void Monitor::slotSeek(int pos)
 {
   if (!m_isActive) m_monitorManager->activateMonitor(m_name);

diff --git a/src/monitor.h b/src/monitor.h
index d2694d6e29c0d632f5e5f9ae903ea7df797e8826..bc4df3c1fa065b95ec7251c4d2379117f5687044 100644 (file)
--- a/src/monitor.h
+++ b/src/monitor.h
@@ -72,6 +72,7 @@ class Monitor : public QWidget
     void slotSeek(int pos);
     void stop();
     void start();
+    void activateMonitor();
 
   signals:
     void renderPosition(int);

diff --git a/src/trackview.cpp b/src/trackview.cpp
index 2425e236c68efe5525d0c5a74da44916e7db4b70..20b4277c54a1890f61d7c3dc452cc6d0c77dea4d 100644 (file)
--- a/src/trackview.cpp
+++ b/src/trackview.cpp
@@ -123,7 +123,7 @@ void TrackView::parseDocument(QDomDocument doc)
 
 void TrackView::setCursorPos(int pos)
 {
-  emit cursorMoved(pos);
+  emit cursorMoved();
   m_trackview->setCursorPos(pos * m_scale);
 }
 

diff --git a/src/trackview.h b/src/trackview.h
index 8944bee4907634b2e7785f242ab4ad3229636786..c230f83db035d122ee4d5b4044759a1ae3d641f9 100644 (file)
--- a/src/trackview.h
+++ b/src/trackview.h
@@ -100,7 +100,7 @@ class TrackView : public QWidget
 
   signals:
     void mousePosition(int);
-    void cursorMoved(int);
+    void cursorMoved();
 };
 
 #endif