Fix slideshow clip ending after 15000 frames and not possible to set image, color...

svn path=/trunk/kdenlive/; revision=4719

diff --git a/src/renderer.cpp b/src/renderer.cpp
index 07c2e98cea472828661ed3ec5ef02edfffdc1224..ce99e4c85d5c2ef8f20965b89cea7e5de0aedba9 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -676,6 +676,11 @@ void Render::getFileProperties(const QDomElement xml, const QString &clipId, int
         if (aindex != 0) producer->set("audio_index", aindex);
     }
 
+    // setup length here as otherwise default length (currently 15000 frames in MLT) will be taken although outpoint is larger
+    if (xml.attribute("type").toInt() == COLOR || xml.attribute("type").toInt() == TEXT
+        || xml.attribute("type").toInt() == IMAGE || xml.attribute("type").toInt() == SLIDESHOW)
+        producer->set("length", xml.attribute("out").toInt() - xml.attribute("in").toInt() + 1);
+
     if (xml.hasAttribute("out")) producer->set_in_and_out(xml.attribute("in").toInt(), xml.attribute("out").toInt());
 
     char *tmp = decodedString(clipId);

diff --git a/src/slideshowclip.h b/src/slideshowclip.h
index a40546b365a019a20bb4868766f17d7c2a86f082..2bd70acb8f830f437e61a9da8c230e89f79af2e9 100644 (file)
--- a/src/slideshowclip.h
+++ b/src/slideshowclip.h
@@ -55,7 +55,7 @@ private slots:
     void slotUpdateDurationFormat(int ix);
     void slotGenerateThumbs();
     void slotSetPixmap(const KFileItem &fileItem, const QPixmap &pix);
-    /** @brief Display correct widget depenging on user choice (mimetype or pattern method. */
+    /** @brief Display correct widget depenging on user choice (mimetype or pattern method). */
     void slotMethodChanged(bool active);
 
 private: