start work on automatic transitions

[kdenlive] / src / effectstackedit.cpp

diff --git a/src/effectstackedit.cpp b/src/effectstackedit.cpp
index 82d45e782786317b97dbfde5d5c53c686ea2aa53..9beab1c13bc982662d9bef3c7b4d26a843e82798 100644 (file)
--- a/src/effectstackedit.cpp
+++ b/src/effectstackedit.cpp
@@ -81,7 +81,7 @@ void EffectStackEdit::transferParamDesc(const QDomElement& d, int in, int out) {
 
     QDomDocument doc;
     doc.appendChild(doc.importNode(params, true));
-    kDebug() << "IMPORTED TRANS: " << doc.toString();
+    //kDebug() << "IMPORTED TRANS: " << doc.toString();
     QDomNodeList namenode = params.elementsByTagName("parameter");
     QDomElement e = params.toElement();
     const int minFrame = e.attribute("start").toInt();
@@ -376,8 +376,16 @@ void EffectStackEdit::collectAllParameters() {
             int pos = m_timecode.getFrameCount(line->text(), KdenliveSettings::project_fps());
             if (params.attribute("id") == "fadein") {
                 pos += m_in;
+                if (pos > m_out) {
+                    pos = m_out;
+                    line->setText(m_timecode.getTimecodeFromFrames(pos));
+                }
             } else if (params.attribute("id") == "fadeout") {
                 pos = m_out - (pos - m_in);
+                if (pos > m_out - m_in) {
+                    pos = m_out - m_in;
+                    line->setText(m_timecode.getTimecodeFromFrames(pos));
+                }
             }
             setValue = QString::number(pos);
         } else if (type == "wipe") {