X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Feffectstackview.cpp;h=9a5911cb1b22b1473f1102600845a60010209890;hb=290b7e5faddb8a6e13c6bb40eea01b6008760f29;hp=c0866ae86b6e4f0f608b1b3626a750500f02b3cf;hpb=4d977c75ae916f227b7d090b4918f74c3e3ef44e;p=kdenlive diff --git a/src/effectstackview.cpp b/src/effectstackview.cpp index c0866ae8..9a5911cb 100644 --- a/src/effectstackview.cpp +++ b/src/effectstackview.cpp @@ -92,9 +92,11 @@ EffectStackView::EffectStackView(Monitor *monitor, QWidget *parent) : connect(m_ui.checkAll, SIGNAL(stateChanged(int)), this, SLOT(slotCheckAll(int))); connect(m_ui.buttonShowComments, SIGNAL(clicked()), this, SLOT(slotShowComments())); connect(m_effectedit, SIGNAL(parameterChanged(const QDomElement &, const QDomElement &)), this , SLOT(slotUpdateEffectParams(const QDomElement &, const QDomElement &))); + connect(m_effectedit, SIGNAL(startFilterJob(QString,QString,QString,QString,QString,QString)), this , SLOT(slotStartFilterJob(QString,QString,QString,QString,QString,QString))); connect(m_effectedit, SIGNAL(seekTimeline(int)), this , SLOT(slotSeekTimeline(int))); connect(m_effectedit, SIGNAL(displayMessage(const QString&, int)), this, SIGNAL(displayMessage(const QString&, int))); connect(m_effectedit, SIGNAL(checkMonitorPosition(int)), this, SLOT(slotCheckMonitorPosition(int))); + connect(monitor, SIGNAL(renderPosition(int)), this, SLOT(slotRenderPos(int))); connect(this, SIGNAL(showComments(bool)), m_effectedit, SIGNAL(showComments(bool))); m_effectLists["audio"] = &MainWindow::audioEffects; @@ -431,6 +433,7 @@ void EffectStackView::clear() ItemInfo info; m_effectedit->transferParamDesc(QDomElement(), info); //m_ui.region_url->clear(); + m_clipref = NULL; m_ui.buttonShowComments->setEnabled(false); m_ui.labelComment->setText(QString()); m_ui.effectlist->blockSignals(false); @@ -527,4 +530,10 @@ void EffectStackView::slotShowComments() emit showComments(m_ui.buttonShowComments->isChecked()); } +void EffectStackView::slotStartFilterJob(const QString&filterName, const QString&filterParams, const QString&finalFilterName, const QString&consumer, const QString&consumerParams, const QString&properties) +{ + if (!m_clipref) return; + emit startFilterJob(m_clipref->info(), m_clipref->clipProducer(), filterName, filterParams, finalFilterName, consumer, consumerParams, properties); +} + #include "effectstackview.moc"