[Kdenlive-svn] [kdenlive] src: Simplify connection.

[Till T. <ro...@tt...>]

Git commit 41dbfc84a2482e74cf19026b611baae0b4ec704b by Till Theato.
Committed on 13/05/2014 at 19:11.
Pushed by theato into branch 'master'.

Simplify connection.

M  +2    -0    src/customtrackview.cpp
M  +0    -1    src/mainwindow.cpp
M  +1    -1    src/monitor/monitormanager.h
M  +0    -10   src/trackview.cpp
M  +0    -2    src/trackview.h

http://commits.kde.org/kdenlive/41dbfc84a2482e74cf19026b611baae0b4ec704b

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index b4098ab..b5eedba 100644
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -220,6 +220,8 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen
     connect(effectStack, SIGNAL(refreshEffectStack(ClipItem*)), SLOT(slotRefreshEffects(ClipItem*)));
     connect(effectStack, SIGNAL(seekTimeline(int)), SLOT(seekCursorPos(int)));
     connect(effectStack, SIGNAL(importClipKeyframes(GraphicsRectItem)), SLOT(slotImportClipKeyframes(GraphicsRectItem)));
+
+    connect(pCore->monitorManager()->projectMonitor(), SIGNAL(renderPosition(int)), SLOT(setCursorPos(int)));
 }
 
 CustomTrackView::~CustomTrackView()
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index cfd3780..427e315 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -2111,7 +2111,6 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *newDoc, Kden
 
     connect(trackView->projectView(), SIGNAL(importKeyframes(GraphicsRectItem,QString,int)), this, SLOT(slotProcessImportKeyframes(GraphicsRectItem,QString,int)));
 
-    connect(m_projectMonitor, SIGNAL(renderPosition(int)), trackView, SLOT(moveCursorPos(int)));
     connect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), trackView, SLOT(slotSetZone(QPoint)));
     connect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), newDoc, SLOT(setModified()));
     connect(m_clipMonitor, SIGNAL(zoneUpdated(QPoint)), newDoc, SLOT(setModified()));
diff --git a/src/monitor/monitormanager.h b/src/monitor/monitormanager.h
index 63fc521..2a0747d 100644
--- a/src/monitor/monitormanager.h
+++ b/src/monitor/monitormanager.h
@@ -55,7 +55,7 @@ public:
     Monitor *projectMonitor();
 
 public slots:
-    /** @brief Sets current document for later reference. */
+    /** @brief Connects to current document. */
     void setDocument(KdenliveDoc *doc);
     /** @brief Activates a monitor.
      * @param name name of the monitor to activate */
diff --git a/src/trackview.cpp b/src/trackview.cpp
index 20c448a..390434e 100644
--- a/src/trackview.cpp
+++ b/src/trackview.cpp
@@ -473,16 +473,6 @@ void TrackView::slotDeleteClip(const QString &clipId)
     m_trackview->deleteClip(clipId);
 }
 
-void TrackView::setCursorPos(int pos)
-{
-    m_trackview->setCursorPos(pos);
-}
-
-void TrackView::moveCursorPos(int pos)
-{
-    m_trackview->setCursorPos(pos);
-}
-
 void TrackView::slotChangeZoom(int horizontal, int vertical)
 {
     m_ruler->setPixelPerMark(horizontal);
diff --git a/src/trackview.h b/src/trackview.h
index 755b8e1..326fea6 100644
--- a/src/trackview.h
+++ b/src/trackview.h
@@ -119,8 +119,6 @@ private:
     void adjustparameterValue(QDomNodeList clipeffectparams, const QString &paramname, const QString &paramvalue);
 
 private slots:
-    void setCursorPos(int pos);
-    void moveCursorPos(int pos);
     /** @brief Rebuilds the track headers */
     void slotRebuildTrackHeaders();
     /** @brief The tracks count or a track name changed, rebuild and notify */