Various fixes to improve general stability in Qt 4.5.2

[kdenlive] / src / clipmanager.cpp

diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp
index 2437fdade9d3de9f298c32f16af7cc2983cb2685..baafa500eb769f2f8a59f81da54b753ec2c264c6 100644 (file)
--- a/src/clipmanager.cpp
+++ b/src/clipmanager.cpp
@@ -226,21 +226,21 @@ void ClipManager::clearUnusedProducers()
     }
 }
 
-void ClipManager::resetProducersList(QList <Mlt::Producer *> prods)
+void ClipManager::resetProducersList(const QList <Mlt::Producer *> prods)
 {
     for (int i = 0; i < m_clipList.count(); i++) {
         if (m_clipList.at(i)->numReferences() > 0) {
-            m_clipList.at(i)->deleteProducers();
+            m_clipList.at(i)->clearProducers();
         }
     }
     QString id;
     for (int i = 0; i < prods.count(); i++) {
         id = prods.at(i)->get("id");
+        kDebug() << "// // // REPLACE CLIP: " << id;
         if (id.contains('_')) id = id.section('_', 0, 0);
         DocClipBase *clip = getClipById(id);
         if (clip) {
             clip->setProducer(prods.at(i));
-            kDebug() << "// // // REPLACE CLIP: " << id;
         }
     }
     emit checkAllClips();
@@ -277,10 +277,9 @@ void ClipManager::slotAddClipList(const KUrl::List urls, const QString group, co
                     prod.setAttribute("type", (int) TEXT);
                     prod.setAttribute("resource", file.path());
                     prod.setAttribute("xmldata", txtdoc.toString());
-                    GenTime outPos(txtdoc.documentElement().attribute("out").toDouble() / 1000.0);
                     prod.setAttribute("transparency", 1);
                     prod.setAttribute("in", 0);
-                    int out = (int) outPos.frames(m_doc->fps());
+                    int out = txtdoc.documentElement().attribute("out").toInt();
                     if (out > 0) prod.setAttribute("out", out);
                 } else txtfile.close();
             }