Commit 735d395d authored by Vincent PINON's avatar Vincent PINON

fix messed clips properties

parent b011271c
......@@ -642,7 +642,9 @@ void MainWindow::slotConnectMonitors()
connect(m_projectMonitor->render, SIGNAL(replyGetImage(QString,QString,int,int)), m_projectList, SLOT(slotReplyGetImage(QString,QString,int,int)));
connect(m_projectMonitor->render, SIGNAL(replyGetImage(QString,QImage)), m_projectList, SLOT(slotReplyGetImage(QString,QImage)));
connect(m_projectMonitor->render, SIGNAL(replyGetFileProperties(QString,Mlt::Producer*,stringMap,stringMap,bool)), m_projectList, SLOT(slotReplyGetFileProperties(QString,Mlt::Producer*,stringMap,stringMap,bool)));
connect(m_projectMonitor->render, SIGNAL(replyGetFileProperties(QString,Mlt::Producer*,stringMap,stringMap,bool)), m_projectList, SLOT(slotReplyGetFileProperties(QString,Mlt::Producer*,stringMap,stringMap,bool)), Qt::DirectConnection);
//DirectConnection was necessary not to mess the analyze queue, but the monitor thread shouldn't show any UI widget (profile dialog), so adding an AutoConnection in between?
connect(m_projectList, SIGNAL(firstClip(ProjectItem*)), m_projectList, SLOT(adjustProjectProfileToItem(ProjectItem*)));
connect(m_projectMonitor->render, SIGNAL(removeInvalidClip(QString,bool)), m_projectList, SLOT(slotRemoveInvalidClip(QString,bool)));
......
......@@ -2297,14 +2297,7 @@ void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Produce
static_cast <FolderProjectItem *>(item->parent())->switchIcon();
} else if (KdenliveSettings::checkfirstprojectclip() && m_listView->topLevelItemCount() == 1 && m_refreshed && m_allClipsProcessed) {
// this is the first clip loaded in project, check if we want to adjust project settings to the clip
//TODO: KF5 fix threading issue causing crash
/*updatedProfile = adjustProjectProfileToItem(item);
if (updatedProfile == false) {
emit clipSelected(item->referencedClip());
}*/
}
if (updatedProfile == false) {
// emit clipSelected(item->referencedClip());
emit firstClip(item);
}
} else {
int max = m_doc->clipManager()->clipsCount();
......
......@@ -381,6 +381,7 @@ private slots:
signals:
void clipSelected(DocClipBase *, const QPoint &zone = QPoint(), bool forceUpdate = false);
void receivedClipDuration(const QString &);
void firstClip(ProjectItem *);
void projectModified();
void loadingIsOver();
void displayMessage(const QString&, int progress, MessageType type = DefaultMessage);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment