X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftransitionsettings.cpp;h=b21203bf2847c99af953374ae48ac501e5bfba9f;hb=c24658bd34221d735f0641c924b890e1a6be7101;hp=e7984f19d16bef67f80522e3fff315762d1fa6db;hpb=706d22f3a96b9dd1fa19e84e58ec4aaf3d9d67bc;p=kdenlive

diff --git a/src/transitionsettings.cpp b/src/transitionsettings.cpp
index e7984f19..b21203bf 100644
--- a/src/transitionsettings.cpp
+++ b/src/transitionsettings.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
-                          effecstackedit.h  -  description
+                          effecstackedit.cpp  -  description
                              -------------------
     begin                : Mar 15 2008
     copyright            : (C) 2008 by Marco Gittler
@@ -23,13 +23,15 @@
 #include "effectstackedit.h"
 #include "kdenlivesettings.h"
 #include "mainwindow.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);
@@ -38,7 +40,9 @@ TransitionSettings::TransitionSettings(Monitor *monitor, QWidget* parent) :
     vbox1->setSpacing(0);
     vbox1->addWidget(m_effectEdit);
     frame->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
-    connect(m_effectEdit, SIGNAL(seekTimeline(int)), this, SIGNAL(seekTimeline(int)));
+    connect(m_effectEdit, SIGNAL(seekTimeline(int)), this, SLOT(slotSeekTimeline(int)));
+    connect(m_effectEdit, SIGNAL(importClipKeyframes()), this, SIGNAL(importClipKeyframes()));
+    
     setEnabled(false);
 
     QList<QStringList> transitionsList;
@@ -46,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);
@@ -57,16 +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&)), this , SLOT(slotUpdateEffectParams(const QDomElement&, const QDomElement&)));
-    connect(monitor, SIGNAL(renderPosition(int)), this, SLOT(slotRenderPos(int)));
+    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;
@@ -87,13 +90,13 @@ void TransitionSettings::updateTrackList()
     int limit = 1;
     if (m_usedTransition)
         limit = m_usedTransition->track() + 1;
-    kDebug() << "/ / TRANS TRK: " << limit;
+    //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) + ")",
+        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);
@@ -105,22 +108,36 @@ void TransitionSettings::updateTrackList()
 void TransitionSettings::slotTransitionChanged(bool reinit, bool updateCurrent)
 {
     QDomElement e = m_usedTransition->toXML().cloneNode().toElement();
-    int start = m_usedTransition->startPos().frames(KdenliveSettings::project_fps());
-    int end = m_usedTransition->endPos().frames(KdenliveSettings::project_fps());
     if (reinit) {
         // Reset the transition parameters to the default one
+        disconnect(m_effectEdit->monitor(), SIGNAL(renderPosition(int)), this, SLOT(slotRenderPos(int)));
         QDomElement newTransition = MainWindow::transitions.getEffectByName(transitionList->currentText()).cloneNode().toElement();
         slotUpdateEffectParams(e, newTransition);
-        m_effectEdit->transferParamDesc(newTransition, start, start, end, false);
+        m_effectEdit->transferParamDesc(newTransition, m_usedTransition->info(), false);
+        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, start, start, end, false);
+        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(), start, start, end, 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());
 }
 
 void TransitionSettings::slotTransitionTrackChanged()
@@ -141,11 +158,12 @@ 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);
     m_autoTrackTransition = nextTrack;
+    disconnect(m_effectEdit->monitor(), SIGNAL(renderPosition(int)), this, SLOT(slotRenderPos(int)));
     if (t == m_usedTransition) {
         if (t == NULL) return;
         if (update) {
@@ -180,12 +198,16 @@ void TransitionSettings::slotTransitionItemSelected(Transition* t, int nextTrack
             slotTransitionChanged(false, false);
             transitionList->blockSignals(false);
         }
+        if (m_effectEdit->needsMonitorEffectScene()) {
+            connect(m_effectEdit->monitor(), SIGNAL(renderPosition(int)), this, SLOT(slotRenderPos(int)));
+        }
     } else {
         // null transition selected
         m_usedTransition = NULL;
-        m_effectEdit->transferParamDesc(QDomElement(), 0, 0, 0, false);
+        ItemInfo info;
+        m_effectEdit->transferParamDesc(QDomElement(), info, false);
+        m_effectEdit->monitor()->slotShowEffectScene(false);
     }
-
 }
 
 void TransitionSettings::slotUpdateEffectParams(const QDomElement &oldparam, const QDomElement &param)
@@ -203,13 +225,42 @@ void TransitionSettings::raiseWindow(QWidget* dock)
 {
     if (dock && m_usedTransition)
         dock->raise();
-
 }
 
 void TransitionSettings::slotRenderPos(int pos)
 {
-    if (m_usedTransition)
+    if (m_usedTransition) {
         m_effectEdit->slotSyncEffectsPos(pos - m_usedTransition->startPos().frames(KdenliveSettings::project_fps()));
+        if (isEnabled()) slotCheckMonitorPosition(pos);
+    }
+}
+
+void TransitionSettings::slotSeekTimeline(int pos)
+{
+    if (m_usedTransition)
+        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);
+        }
+    }
+    else {
+        m_effectEdit->monitor()->slotShowEffectScene(false);
+    }
+}
+
+void TransitionSettings::setKeyframes(const QString &data, int maximum)
+{
+    m_effectEdit->setKeyframes(data, maximum);
 }
 
 #include "transitionsettings.moc"