From: Till T. <ro...@tt...> - 2014-05-13 19:45:10
|
Git commit 738437eeefc38b72a898fb5312a6dad6b45cb635 by Till Theato. Committed on 13/05/2014 at 19:42. Pushed by theato into branch 'master'. Move another connect. M +1 -0 src/customtrackview.cpp M +0 -1 src/mainwindow.cpp http://commits.kde.org/kdenlive/738437eeefc38b72a898fb5312a6dad6b45cb635 diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index b5eedba..6e6c303 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -222,6 +222,7 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen connect(effectStack, SIGNAL(importClipKeyframes(GraphicsRectItem)), SLOT(slotImportClipKeyframes(GraphicsRectItem))); connect(pCore->monitorManager()->projectMonitor(), SIGNAL(renderPosition(int)), SLOT(setCursorPos(int))); + connect(pCore->monitorManager()->projectMonitor()->render, SIGNAL(infoProcessingFinished()), SLOT(slotInfoProcessingFinished()), Qt::DirectConnection); } CustomTrackView::~CustomTrackView() diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 427e315..7a88d29 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -2107,7 +2107,6 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *newDoc, Kden connect(trackView, SIGNAL(configTrack(int)), this, SLOT(slotConfigTrack(int))); connect(trackView, SIGNAL(updateTracksInfo()), this, SLOT(slotUpdateTrackInfo())); connect(trackView, SIGNAL(mousePosition(int)), this, SLOT(slotUpdateMousePosition(int))); - connect(m_projectMonitor->render, SIGNAL(infoProcessingFinished()), trackView->projectView(), SLOT(slotInfoProcessingFinished()), Qt::DirectConnection); connect(trackView->projectView(), SIGNAL(importKeyframes(GraphicsRectItem,QString,int)), this, SLOT(slotProcessImportKeyframes(GraphicsRectItem,QString,int))); |