Fix setting image duration when dropping multiple files.

mltframework · Sep 30, 2014 · 2755f27 · 2755f27
1 parent 3701096
commit 2755f27
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -1938,8 +1938,8 @@ class AppendTask : public QRunnable
                 QString service(p.get("mlt_service"));
                 if (service == "pixbuf" || service == "qimage") {
                     p.set("ttl", 1);
-                    p.set("length", qRound(MLT.profile().fps() * 4.0));
-                    p.set("out", p.get_length() - 1);
+                    p.set("length", qRound(MLT.profile().fps() * 600));
+                    p.set("out", qRound(MLT.profile().fps() * Settings.imageDuration()) - 1);
                 }
                 MAIN.undoStack()->push(new Playlist::AppendCommand(*model, MLT.saveXML("string", &p)));
             }

diff --git a/src/mltcontroller.cpp b/src/mltcontroller.cpp
@@ -172,7 +172,7 @@ int Controller::open(const QString &url)
         const char *service = m_producer->get("mlt_service");
         if (service && (!strcmp(service, "pixbuf") || !strcmp(service, "qimage"))) {
             m_producer->set("length", qRound(profile().fps() * 600));
-            m_producer->set("out", profile().fps() * Settings.imageDuration() - 1);
+            m_producer->set("out", qRound(profile().fps() * Settings.imageDuration()) - 1);
         }
     }
     else {

diff --git a/src/widgets/imageproducerwidget.cpp b/src/widgets/imageproducerwidget.cpp
@@ -185,7 +185,7 @@ void ImageProducerWidget::on_sequenceCheckBox_clicked(bool checked)
     else {
         m_producer->set("resource", m_producer->get("shotcut_resource"));
         m_producer->set("length", qRound(MLT.profile().fps() * 600));
-        ui->durationSpinBox->setValue(MLT.profile().fps() * Settings.imageDuration());
+        ui->durationSpinBox->setValue(qRound(MLT.profile().fps() * Settings.imageDuration()));
     }
     Mlt::Producer* p = producer(MLT.profile());
     p->pass_list(*m_producer, "force_aspect_ratio, shotcut_aspect_num, shotcut_aspect_den, "