X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftransitionsettings.cpp;h=6d87559b27700b064b6f36c23e5d9a33aa8a6285;hb=d49a300ddcb728d616a8c72c52f095551cc7100f;hp=b5f6257cc930f1ac0fe1358c771e2c5ce5e4c41c;hpb=ecef07220acdeb49fd3228d4ca62aab1eec034b0;p=kdenlive

diff --git a/src/transitionsettings.cpp b/src/transitionsettings.cpp
index b5f6257c..6d87559b 100644
--- a/src/transitionsettings.cpp
+++ b/src/transitionsettings.cpp
@@ -26,14 +26,14 @@
 
 #include <KDebug>
 
-TransitionSettings::TransitionSettings(QWidget* parent) :
+TransitionSettings::TransitionSettings(Monitor *monitor, QWidget* parent) :
         QWidget(parent),
         m_usedTransition(NULL),
         m_autoTrackTransition(0)
 {
     setupUi(this);
     QVBoxLayout *vbox1 = new QVBoxLayout(frame);
-    m_effectEdit = new EffectStackEdit(frame);
+    m_effectEdit = new EffectStackEdit(monitor, frame);
     vbox1->setContentsMargins(0, 0, 0, 0);
     vbox1->setSpacing(0);
     vbox1->addWidget(m_effectEdit);
@@ -62,9 +62,8 @@ TransitionSettings::TransitionSettings(QWidget* parent) :
 
     connect(transitionList, SIGNAL(activated(int)), this, SLOT(slotTransitionChanged()));
     connect(transitionTrack, SIGNAL(activated(int)), this, SLOT(slotTransitionTrackChanged()));
-
-    connect(this, SIGNAL(transferParamDesc(const QDomElement&, int , int)), m_effectEdit , SLOT(transferParamDesc(const QDomElement&, int , int)));
     connect(m_effectEdit, SIGNAL(parameterChanged(const QDomElement&, const QDomElement&)), this , SLOT(slotUpdateEffectParams(const QDomElement&, const QDomElement&)));
+    connect(monitor, SIGNAL(renderPosition(int)), this, SLOT(slotRenderPos(int)));
 }
 
 void TransitionSettings::updateProjectFormat(MltVideoProfile profile, Timecode t, const QList <TrackInfo> info)
@@ -74,6 +73,11 @@ void TransitionSettings::updateProjectFormat(MltVideoProfile profile, Timecode t
     updateTrackList();
 }
 
+void TransitionSettings::updateTimecodeFormat()
+{
+    m_effectEdit->updateTimecodeFormat();
+}
+
 void TransitionSettings::updateTrackList()
 {
     transitionTrack->blockSignals(true);
@@ -81,13 +85,16 @@ void TransitionSettings::updateTrackList()
     transitionTrack->clear();
     transitionTrack->addItem(i18n("Auto"), -1);
     int limit = 1;
-    if (m_usedTransition) limit = m_usedTransition->track() + 1;
+    if (m_usedTransition)
+        limit = m_usedTransition->track() + 1;
     kDebug() << "/ / TRANS TRK: " << limit;
+    KIcon videoIcon("kdenlive-show-video");
+    KIcon audioIcon("kdenlive-show-audio");
     for (int i = limit; i < m_tracks.count(); i++) {
         int ix = m_tracks.count() - i - 1;
-        if (!m_tracks.at(ix).trackName.isEmpty())
-            transitionTrack->addItem(m_tracks.at(ix).trackName + '(' + QString::number(i) + ')', m_tracks.count() - i);
-        else transitionTrack->addItem(QString::number(i), m_tracks.count() - i);
+        transitionTrack->addItem(m_tracks.at(ix).type == VIDEOTRACK ? videoIcon : audioIcon,
+                                 m_tracks.at(ix).trackName.isEmpty() ? QString::number(i) : m_tracks.at(ix).trackName + " (" + QString::number(i) + ")",
+                                 m_tracks.count() - i);
     }
     transitionTrack->addItem(i18n("Black"), 0);
     transitionTrack->setCurrentIndex(transitionTrack->findData(current));
@@ -102,15 +109,16 @@ void TransitionSettings::slotTransitionChanged(bool reinit, bool updateCurrent)
         // Reset the transition parameters to the default one
         QDomElement newTransition = MainWindow::transitions.getEffectByName(transitionList->currentText()).cloneNode().toElement();
         slotUpdateEffectParams(e, newTransition);
-        emit transferParamDesc(newTransition, m_usedTransition->startPos().frames(KdenliveSettings::project_fps()), m_usedTransition->endPos().frames(KdenliveSettings::project_fps()));
+        m_effectEdit->transferParamDesc(newTransition, m_usedTransition->info(), false);
     } else if (!updateCurrent) {
         // Transition changed, update parameters dialog
         //slotUpdateEffectParams(e, e);
-        m_effectEdit->transferParamDesc(e, m_usedTransition->startPos().frames(KdenliveSettings::project_fps()), m_usedTransition->endPos().frames(KdenliveSettings::project_fps()));
+        m_effectEdit->transferParamDesc(e, m_usedTransition->info(), false);
     } else {
         // Same transition, we just want to update the parameters value
         slotUpdateEffectParams(e, e);
-        if (m_usedTransition->hasGeometry()) emit transferParamDesc(m_usedTransition->toXML(), m_usedTransition->startPos().frames(KdenliveSettings::project_fps()), m_usedTransition->endPos().frames(KdenliveSettings::project_fps()));
+        if (m_usedTransition->hasGeometry())
+            m_effectEdit->transferParamDesc(m_usedTransition->toXML(), m_usedTransition->info(), false);
     }
 }
 
@@ -123,13 +131,12 @@ void TransitionSettings::slotTransitionTrackChanged()
         ix = transitionTrack->itemData(transitionTrack->currentIndex()).toInt();
         m_usedTransition->setForcedTrack(true, ix);
         m_effectEdit->updateParameter("force_track", "1");
-        emit transitionUpdated(m_usedTransition, oldxml);
     } else {
         ix = m_autoTrackTransition;
         m_usedTransition->setForcedTrack(false, ix);
         m_effectEdit->updateParameter("force_track", "0");
-        emit transitionUpdated(m_usedTransition, oldxml);
     }
+    emit transitionUpdated(m_usedTransition, oldxml);
     m_effectEdit->updateParameter("transition_btrack", QString::number(ix));
 }
 
@@ -160,8 +167,10 @@ void TransitionSettings::slotTransitionItemSelected(Transition* t, int nextTrack
         transitionTrack->blockSignals(true);
         m_usedTransition = t;
         updateTrackList();
-        if (!t->forcedTrack()) transitionTrack->setCurrentIndex(0);
-        else transitionTrack->setCurrentIndex(transitionTrack->findData(t->transitionEndTrack()));
+        if (!t->forcedTrack())
+            transitionTrack->setCurrentIndex(0);
+        else
+            transitionTrack->setCurrentIndex(transitionTrack->findData(t->transitionEndTrack()));
         transitionTrack->blockSignals(false);
         int ix = transitionList->findData(t->transitionInfo(), Qt::UserRole, Qt::MatchExactly);
         if (ix != -1) {
@@ -173,7 +182,8 @@ void TransitionSettings::slotTransitionItemSelected(Transition* t, int nextTrack
     } else {
         // null transition selected
         m_usedTransition = NULL;
-        m_effectEdit->transferParamDesc(QDomElement(), 0, 0);
+        ItemInfo info;
+        m_effectEdit->transferParamDesc(QDomElement(), info, false);
     }
 
 }
@@ -185,9 +195,8 @@ void TransitionSettings::slotUpdateEffectParams(const QDomElement &oldparam, con
         m_usedTransition->update();
     }
     //oldparam must be also first given to Transition and then return the toXML()
-    if (oldparam != param) {
+    if (oldparam != param)
         emit transitionUpdated(m_usedTransition, oldparam);
-    }
 }
 
 void TransitionSettings::raiseWindow(QWidget* dock)
@@ -197,3 +206,10 @@ void TransitionSettings::raiseWindow(QWidget* dock)
 
 }
 
+void TransitionSettings::slotRenderPos(int pos)
+{
+    if (m_usedTransition)
+        m_effectEdit->slotSyncEffectsPos(pos - m_usedTransition->startPos().frames(KdenliveSettings::project_fps()));
+}
+
+#include "transitionsettings.moc"