X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftransitionsettings.cpp;h=4a641b1042cf87e8a1c5b12c823eb73e6cdde1ab;hb=5bcb9b7ead3d053cb2b0498d84a2622626bf7f14;hp=312cf60d73cf6d7d6d744dc463e48fdaeb201c7c;hpb=71e41ad0c197e2e2eb033dff7800427f64d3428f;p=kdenlive

diff --git a/src/transitionsettings.cpp b/src/transitionsettings.cpp
index 312cf60d..4a641b10 100644
--- a/src/transitionsettings.cpp
+++ b/src/transitionsettings.cpp
@@ -23,15 +23,15 @@
 #include "effectstackedit.h"
 #include "kdenlivesettings.h"
 #include "mainwindow.h"
-#include "monitoreditwidget.h"
+#include "widgets/monitoreditwidget.h"
 #include "monitorscene.h"
 
 #include <KDebug>
 
 TransitionSettings::TransitionSettings(Monitor *monitor, QWidget* parent) :
-        QWidget(parent),
-        m_usedTransition(NULL),
-        m_autoTrackTransition(0)
+    QWidget(parent),
+    m_usedTransition(NULL),
+    m_autoTrackTransition(0)
 {
     setupUi(this);
     QVBoxLayout *vbox1 = new QVBoxLayout(frame);
@@ -50,7 +50,7 @@ TransitionSettings::TransitionSettings(Monitor *monitor, QWidget* parent) :
     QStringList transitionInfo;
     int ix = 0;
 
-    for (; ix < max; ix++) {
+    for (; ix < max; ++ix) {
         transitionInfo = MainWindow::transitions.effectIdInfo(ix);
         transitionInfo << QString::number(ix);
         transitionsList.append(transitionInfo);
@@ -61,15 +61,15 @@ TransitionSettings::TransitionSettings(Monitor *monitor, QWidget* parent) :
         if (!data.isEmpty()) data.removeLast();
         transitionList->addItem(value.at(0), data);
         transitionList->setItemData(ix, MainWindow::transitions.getInfoFromIndex(value.last().toInt()), Qt::ToolTipRole);
-        ix++;
+        ++ix;
     }
 
     connect(transitionList, SIGNAL(activated(int)), this, SLOT(slotTransitionChanged()));
     connect(transitionTrack, SIGNAL(activated(int)), this, SLOT(slotTransitionTrackChanged()));
-    connect(m_effectEdit, SIGNAL(parameterChanged(const QDomElement, const QDomElement, int)), this , SLOT(slotUpdateEffectParams(const QDomElement, const QDomElement)));
+    connect(m_effectEdit, SIGNAL(parameterChanged(QDomElement,QDomElement,int)), this , SLOT(slotUpdateEffectParams(QDomElement,QDomElement)));
 }
 
-void TransitionSettings::updateProjectFormat(MltVideoProfile profile, Timecode t, const QList <TrackInfo> info)
+void TransitionSettings::updateProjectFormat(const MltVideoProfile &profile, const Timecode &t, const QList<TrackInfo> &info)
 {
     m_effectEdit->updateProjectFormat(profile, t);
     m_tracks = info;
@@ -93,7 +93,7 @@ void TransitionSettings::updateTrackList()
     //kDebug() << "/ / TRANS TRK: " << limit;
     KIcon videoIcon("kdenlive-show-video");
     KIcon audioIcon("kdenlive-show-audio");
-    for (int i = limit; i < m_tracks.count(); i++) {
+    for (int i = limit; i < m_tracks.count(); ++i) {
         int ix = m_tracks.count() - i - 1;
         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) + ')',
@@ -114,17 +114,28 @@ void TransitionSettings::slotTransitionChanged(bool reinit, bool updateCurrent)
         QDomElement newTransition = MainWindow::transitions.getEffectByName(transitionList->currentText()).cloneNode().toElement();
         slotUpdateEffectParams(e, newTransition);
         m_effectEdit->transferParamDesc(newTransition, m_usedTransition->info(), false);
-	if (m_effectEdit->needsMonitorEffectScene())
-	    connect(m_effectEdit->monitor(), SIGNAL(renderPosition(int)), this, SLOT(slotRenderPos(int)));
+        if (m_effectEdit->needsMonitorEffectScene())
+            connect(m_effectEdit->monitor(), SIGNAL(renderPosition(int)), this, SLOT(slotRenderPos(int)));
     } else if (!updateCurrent) {
         // Transition changed, update parameters dialog
         //slotUpdateEffectParams(e, e);
         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())
-            m_effectEdit->transferParamDesc(m_usedTransition->toXML(), m_usedTransition->info(), false);
+        int ix = transitionList->findData(m_usedTransition->transitionInfo(), Qt::UserRole, Qt::MatchExactly);
+        if (ix != transitionList->currentIndex()) {
+            // Transition type changed, reload params
+            transitionList->blockSignals(true);
+            transitionList->setCurrentIndex(ix);
+            transitionList->blockSignals(false);
+            m_effectEdit->transferParamDesc(e, m_usedTransition->info(), false);
+        } else {
+            slotUpdateEffectParams(e, e);
+            if (m_usedTransition->hasGeometry())
+                m_effectEdit->transferParamDesc(m_usedTransition->toXML(), m_usedTransition->info(), false);
+        }
+        if (m_effectEdit->needsMonitorEffectScene())
+            connect(m_effectEdit->monitor(), SIGNAL(renderPosition(int)), this, SLOT(slotRenderPos(int)));
     }
     slotCheckMonitorPosition(m_effectEdit->monitor()->render->seekFramePosition());
 }
@@ -147,7 +158,7 @@ void TransitionSettings::slotTransitionTrackChanged()
     m_effectEdit->updateParameter("transition_btrack", QString::number(ix));
 }
 
-void TransitionSettings::slotTransitionItemSelected(Transition* t, int nextTrack, QPoint p, bool update)
+void TransitionSettings::slotTransitionItemSelected(Transition* t, int nextTrack, const QPoint &p, bool update)
 {
     setEnabled(t != NULL);
     m_effectEdit->setFrameSize(p);
@@ -188,17 +199,18 @@ void TransitionSettings::slotTransitionItemSelected(Transition* t, int nextTrack
             transitionList->blockSignals(false);
         }
         if (m_effectEdit->needsMonitorEffectScene()) {
-	    connect(m_effectEdit->monitor(), SIGNAL(renderPosition(int)), this, SLOT(slotRenderPos(int)));
-	}
+            connect(m_effectEdit->monitor(), SIGNAL(renderPosition(int)), this, SLOT(slotRenderPos(int)));
+        }
     } else {
         // null transition selected
         m_usedTransition = NULL;
         ItemInfo info;
         m_effectEdit->transferParamDesc(QDomElement(), info, false);
+        m_effectEdit->monitor()->slotShowEffectScene(false);
     }
 }
 
-void TransitionSettings::slotUpdateEffectParams(const QDomElement oldparam, const QDomElement param)
+void TransitionSettings::slotUpdateEffectParams(const QDomElement &oldparam, const QDomElement &param)
 {
     if (m_usedTransition) {
         m_usedTransition->setTransitionParameters(param);
@@ -219,36 +231,36 @@ void TransitionSettings::slotRenderPos(int pos)
 {
     if (m_usedTransition) {
         m_effectEdit->slotSyncEffectsPos(pos - m_usedTransition->startPos().frames(KdenliveSettings::project_fps()));
-	if (isEnabled()) slotCheckMonitorPosition(pos);
+        if (isEnabled()) slotCheckMonitorPosition(pos);
     }
 }
 
 void TransitionSettings::slotSeekTimeline(int pos)
 {
     if (m_usedTransition)
-	emit seekTimeline(m_usedTransition->startPos().frames(KdenliveSettings::project_fps()) + pos);
+        emit seekTimeline(m_usedTransition->startPos().frames(KdenliveSettings::project_fps()) + pos);
 }
 
 void TransitionSettings::slotCheckMonitorPosition(int renderPos)
 {
     if (!isEnabled()) return;
     if (m_effectEdit->needsMonitorEffectScene()) {
-	if (renderPos >= m_usedTransition->startPos().frames(KdenliveSettings::project_fps()) && renderPos <= m_usedTransition->endPos().frames(KdenliveSettings::project_fps())) {
-	    if (!m_effectEdit->monitor()->effectSceneDisplayed()) {
-		m_effectEdit->monitor()->slotShowEffectScene(true);
-	    }
-	} else {
-	    m_effectEdit->monitor()->slotShowEffectScene(false);
-	}
+        if (renderPos >= m_usedTransition->startPos().frames(KdenliveSettings::project_fps()) && renderPos < m_usedTransition->endPos().frames(KdenliveSettings::project_fps())) {
+            if (!m_effectEdit->monitor()->effectSceneDisplayed()) {
+                m_effectEdit->monitor()->slotShowEffectScene(true);
+            }
+        } else {
+            m_effectEdit->monitor()->slotShowEffectScene(false);
+        }
     }
     else {
-	m_effectEdit->monitor()->slotShowEffectScene(false);
+        m_effectEdit->monitor()->slotShowEffectScene(false);
     }
 }
 
-void TransitionSettings::setKeyframes(const QString data)
+void TransitionSettings::setKeyframes(const QString &data, int maximum)
 {
-    m_effectEdit->setKeyframes(data);
+    m_effectEdit->setKeyframes(data, maximum);
 }
 
 #include "transitionsettings.moc"