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 b3c42c2aa7ee4a7d8625cf5b60194dc38aae9709..baafa500eb769f2f8a59f81da54b753ec2c264c6 100644 (file)
--- a/src/clipmanager.cpp
+++ b/src/clipmanager.cpp
@@ -35,17 +35,20 @@
 #include <QGraphicsItemGroup>
 
 ClipManager::ClipManager(KdenliveDoc *doc) :
-        m_audioThumbsQueue(QList <QString> ()),
+        QObject(),
+        m_audioThumbsQueue(),
         m_doc(doc),
         m_audioThumbsEnabled(false),
-        m_generatingAudioId(QString())
+        m_generatingAudioId()
 {
     m_clipIdCounter = 1;
     m_folderIdCounter = 1;
+    connect(&m_fileWatcher, SIGNAL(dirty(const QString &)), this, SLOT(slotClipModified(const QString &)));
 }
 
 ClipManager::~ClipManager()
 {
+    kDebug() << "\n\n 2222222222222222222222222  CLOSE CM 22222222222";
     qDeleteAll(m_clipList);
 }
 
@@ -135,6 +138,10 @@ QMap <QString, QString> ClipManager::documentFolderList() const
 void ClipManager::addClip(DocClipBase *clip)
 {
     m_clipList.append(clip);
+    if (clip->clipType() == IMAGE || clip->clipType() == AUDIO) {
+        // listen for file change
+        m_fileWatcher.addFile(clip->fileURL().path());
+    }
     const QString id = clip->getId();
     if (id.toInt() >= m_clipIdCounter) m_clipIdCounter = id.toInt() + 1;
     const QString gid = clip->getProperty("groupid");
@@ -143,12 +150,10 @@ void ClipManager::addClip(DocClipBase *clip)
 
 void ClipManager::slotDeleteClip(const QString &clipId)
 {
-    for (int i = 0; i < m_clipList.count(); i++) {
-        if (m_clipList.at(i)->getId() == clipId) {
-            AddClipCommand *command = new AddClipCommand(m_doc, m_clipList.at(i)->toXML(), clipId, false);
-            m_doc->commandStack()->push(command);
-            break;
-        }
+    DocClipBase *clip = getClipById(clipId);
+    if (clip) {
+        AddClipCommand *command = new AddClipCommand(m_doc, clip->toXML(), clipId, false);
+        m_doc->commandStack()->push(command);
     }
 }
 
@@ -156,9 +161,11 @@ void ClipManager::deleteClip(const QString &clipId)
 {
     for (int i = 0; i < m_clipList.count(); i++) {
         if (m_clipList.at(i)->getId() == clipId) {
-            DocClipBase *clip = m_clipList.takeAt(i);
-            delete clip;
-            clip = NULL;
+            if (m_clipList.at(i)->clipType() == IMAGE || m_clipList.at(i)->clipType() == AUDIO) {
+                // listen for file change
+                m_fileWatcher.removeFile(m_clipList.at(i)->fileURL().path());
+            }
+            delete m_clipList.takeAt(i);
             break;
         }
     }
@@ -184,8 +191,11 @@ DocClipBase *ClipManager::getClipById(QString clipId)
 
 DocClipBase *ClipManager::getClipByResource(QString resource)
 {
+    QString clipResource;
     for (int i = 0; i < m_clipList.count(); i++) {
-        if (m_clipList.at(i)->getProperty("resource") == resource) {
+        clipResource = m_clipList.at(i)->getProperty("resource");
+        if (clipResource.isEmpty()) clipResource = m_clipList.at(i)->getProperty("colour");
+        if (clipResource == resource) {
             return m_clipList.at(i);
         }
     }
@@ -209,23 +219,31 @@ void ClipManager::updatePreviewSettings()
     }
 }
 
-void ClipManager::resetProducersList(QList <Mlt::Producer *> prods)
+void ClipManager::clearUnusedProducers()
+{
+    for (int i = 0; i < m_clipList.count(); i++) {
+        if (m_clipList.at(i)->numReferences() == 0) m_clipList.at(i)->deleteProducers();
+    }
+}
+
+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();
 }
 
 void ClipManager::slotAddClipList(const KUrl::List urls, const QString group, const QString &groupId)
@@ -248,8 +266,22 @@ void ClipManager::slotAddClipList(const KUrl::List urls, const QString group, co
             KMimeType::Ptr type = KMimeType::findByUrl(file);
             if (type->name().startsWith("image/")) {
                 prod.setAttribute("type", (int) IMAGE);
-                prod.setAttribute("in", "0");
+                prod.setAttribute("in", 0);
                 prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1);
+            } else if (type->name() == "application/x-kdenlivetitle") {
+                // opening a title file
+                QDomDocument txtdoc("titledocument");
+                QFile txtfile(file.path());
+                if (txtfile.open(QIODevice::ReadOnly) && txtdoc.setContent(&txtfile)) {
+                    txtfile.close();
+                    prod.setAttribute("type", (int) TEXT);
+                    prod.setAttribute("resource", file.path());
+                    prod.setAttribute("xmldata", txtdoc.toString());
+                    prod.setAttribute("transparency", 1);
+                    prod.setAttribute("in", 0);
+                    int out = txtdoc.documentElement().attribute("out").toInt();
+                    if (out > 0) prod.setAttribute("out", out);
+                } else txtfile.close();
             }
             new AddClipCommand(m_doc, doc.documentElement(), QString::number(id), true, addClips);
         }
@@ -275,6 +307,21 @@ void ClipManager::slotAddClipFile(const KUrl url, const QString group, const QSt
         prod.setAttribute("type", (int) IMAGE);
         prod.setAttribute("in", "0");
         prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1);
+    } else if (type->name() == "application/x-kdenlivetitle") {
+        // opening a title file
+        QDomDocument txtdoc("titledocument");
+        QFile txtfile(url.path());
+        if (txtfile.open(QIODevice::ReadOnly) && txtdoc.setContent(&txtfile)) {
+            txtfile.close();
+            prod.setAttribute("type", (int) TEXT);
+            prod.setAttribute("resource", QString());
+            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());
+            if (out > 0) prod.setAttribute("out", out);
+        } else txtfile.close();
     }
     AddClipCommand *command = new AddClipCommand(m_doc, doc.documentElement(), QString::number(id), true);
     m_doc->commandStack()->push(command);
@@ -329,13 +376,13 @@ void ClipManager::slotAddSlideshowClipFile(const QString name, const QString pat
 
 
 
-void ClipManager::slotAddTextClipFile(const QString titleName, const QString imagePath, const QString xml, const QString group, const QString &groupId)
+void ClipManager::slotAddTextClipFile(const QString titleName, int out, const QString xml, const QString group, const QString &groupId)
 {
     QDomDocument doc;
     QDomElement prod = doc.createElement("producer");
     doc.appendChild(prod);
-    prod.setAttribute("resource", imagePath);
-    prod.setAttribute("titlename", titleName);
+    //prod.setAttribute("resource", imagePath);
+    prod.setAttribute("name", titleName);
     prod.setAttribute("xmldata", xml);
     uint id = m_clipIdCounter++;
     prod.setAttribute("id", QString::number(id));
@@ -346,6 +393,28 @@ void ClipManager::slotAddTextClipFile(const QString titleName, const QString ima
     prod.setAttribute("type", (int) TEXT);
     prod.setAttribute("transparency", "1");
     prod.setAttribute("in", "0");
+    prod.setAttribute("out", out);
+    AddClipCommand *command = new AddClipCommand(m_doc, doc.documentElement(), QString::number(id), true);
+    m_doc->commandStack()->push(command);
+}
+
+void ClipManager::slotAddTextTemplateClip(QString titleName, const QString imagePath, const KUrl path, const QString group, const QString &groupId)
+{
+    QDomDocument doc;
+    QDomElement prod = doc.createElement("producer");
+    doc.appendChild(prod);
+    prod.setAttribute("resource", imagePath);
+    prod.setAttribute("name", titleName);
+    prod.setAttribute("xmltemplate", path.path());
+    uint id = m_clipIdCounter++;
+    prod.setAttribute("id", QString::number(id));
+    if (!group.isEmpty()) {
+        prod.setAttribute("groupname", group);
+        prod.setAttribute("groupid", groupId);
+    }
+    prod.setAttribute("type", (int) TEXT);
+    prod.setAttribute("transparency", "1");
+    prod.setAttribute("in", "0");
     prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1);
     AddClipCommand *command = new AddClipCommand(m_doc, doc.documentElement(), QString::number(id), true);
     m_doc->commandStack()->push(command);
@@ -422,3 +491,12 @@ QDomElement ClipManager::groupsXml() const
     }
     return doc.documentElement();
 }
+
+
+void ClipManager::slotClipModified(const QString &path)
+{
+    //kDebug()<<"// CLIP: "<<path<<" WAS MODIFIED";
+    DocClipBase *clip = getClipByResource(path);
+    if (clip == NULL) return;
+    emit reloadClip(clip->getId());
+}
\ No newline at end of file