X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipmanager.cpp;h=5a7109699f50893d5661bd0d0309baaf9e433789;hb=6f8f092f36ef2a23f4d4cf44f75a48f219fcecc6;hp=3b6f6b4f17225f0e81b4268d66e97ca1b5a19ac0;hpb=c24cb03154eece4a1213da57b6aa160100614f28;p=kdenlive

diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp
index 3b6f6b4f..5a710969 100644
--- a/src/clipmanager.cpp
+++ b/src/clipmanager.cpp
@@ -138,7 +138,7 @@ QMap <QString, QString> ClipManager::documentFolderList() const
 void ClipManager::addClip(DocClipBase *clip)
 {
     m_clipList.append(clip);
-    if (clip->clipType() == IMAGE || clip->clipType() == AUDIO) {
+    if (clip->clipType() == IMAGE || clip->clipType() == AUDIO || (clip->clipType() == TEXT && !clip->fileURL().isEmpty())) {
         // listen for file change
         m_fileWatcher.addFile(clip->fileURL().path());
     }
@@ -148,20 +148,25 @@ void ClipManager::addClip(DocClipBase *clip)
     if (!gid.isEmpty() && gid.toInt() >= m_folderIdCounter) m_folderIdCounter = gid.toInt() + 1;
 }
 
-void ClipManager::slotDeleteClip(const QString &clipId)
+void ClipManager::slotDeleteClips(QStringList ids)
 {
-    DocClipBase *clip = getClipById(clipId);
-    if (clip) {
-        AddClipCommand *command = new AddClipCommand(m_doc, clip->toXML(), clipId, false);
-        m_doc->commandStack()->push(command);
+    QUndoCommand *delClips = new QUndoCommand();
+    delClips->setText(i18np("Delete clip", "Delete clips", ids.size()));
+
+    for (int i = 0; i < ids.size(); i++) {
+        DocClipBase *clip = getClipById(ids.at(i));
+        if (clip) {
+            new AddClipCommand(m_doc, clip->toXML(), ids.at(i), false, delClips);
+        }
     }
+    m_doc->commandStack()->push(delClips);
 }
 
 void ClipManager::deleteClip(const QString &clipId)
 {
     for (int i = 0; i < m_clipList.count(); i++) {
         if (m_clipList.at(i)->getId() == clipId) {
-            if (m_clipList.at(i)->clipType() == IMAGE || m_clipList.at(i)->clipType() == AUDIO) {
+            if (m_clipList.at(i)->clipType() == IMAGE || m_clipList.at(i)->clipType() == AUDIO || (m_clipList.at(i)->clipType() == TEXT && !m_clipList.at(i)->fileURL().isEmpty())) {
                 // listen for file change
                 m_fileWatcher.removeFile(m_clipList.at(i)->fileURL().path());
             }
@@ -189,17 +194,18 @@ DocClipBase *ClipManager::getClipById(QString clipId)
     return NULL;
 }
 
-DocClipBase *ClipManager::getClipByResource(QString resource)
+const QList <DocClipBase *> ClipManager::getClipByResource(QString resource)
 {
+    QList <DocClipBase *> list;
     QString clipResource;
     for (int i = 0; i < m_clipList.count(); i++) {
         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);
+            list.append(m_clipList.at(i));
         }
     }
-    return NULL;
+    return list;
 }
 
 void ClipManager::updatePreviewSettings()
@@ -226,21 +232,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();
@@ -281,6 +287,7 @@ void ClipManager::slotAddClipList(const KUrl::List urls, const QString group, co
                     prod.setAttribute("in", 0);
                     int out = txtdoc.documentElement().attribute("out").toInt();
                     if (out > 0) prod.setAttribute("out", out);
+                    else prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1);
                 } else txtfile.close();
             }
             new AddClipCommand(m_doc, doc.documentElement(), QString::number(id), true, addClips);
@@ -321,6 +328,7 @@ void ClipManager::slotAddClipFile(const KUrl url, const QString group, const QSt
             prod.setAttribute("in", 0);
             int out = (int) outPos.frames(m_doc->fps());
             if (out > 0) prod.setAttribute("out", out);
+            else prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1);
         } else txtfile.close();
     }
     AddClipCommand *command = new AddClipCommand(m_doc, doc.documentElement(), QString::number(id), true);
@@ -398,14 +406,13 @@ void ClipManager::slotAddTextClipFile(const QString titleName, int out, const QS
     m_doc->commandStack()->push(command);
 }
 
-void ClipManager::slotAddTextTemplateClip(QString titleName, const QString imagePath, const KUrl path, const QString group, const QString &groupId)
+void ClipManager::slotAddTextTemplateClip(QString titleName, 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());
+    prod.setAttribute("resource", path.path());
     uint id = m_clipIdCounter++;
     prod.setAttribute("id", QString::number(id));
     if (!group.isEmpty()) {
@@ -415,7 +422,18 @@ void ClipManager::slotAddTextTemplateClip(QString titleName, const QString image
     prod.setAttribute("type", (int) TEXT);
     prod.setAttribute("transparency", "1");
     prod.setAttribute("in", "0");
-    prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1);
+
+    int out = 0;
+    QDomDocument titledoc;
+    QFile txtfile(path.path());
+    if (txtfile.open(QIODevice::ReadOnly) && titledoc.setContent(&txtfile)) {
+        txtfile.close();
+        out = titledoc.documentElement().attribute("out").toInt();
+    } else txtfile.close();
+
+    if (out == 0) out = m_doc->getFramePos(KdenliveSettings::image_duration()) - 1;
+    prod.setAttribute("out", out);
+
     AddClipCommand *command = new AddClipCommand(m_doc, doc.documentElement(), QString::number(id), true);
     m_doc->commandStack()->push(command);
 }
@@ -496,7 +514,16 @@ QDomElement ClipManager::groupsXml() const
 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
+    const QList <DocClipBase *> list = getClipByResource(path);
+    for (int i = 0; i < list.count(); i++) {
+        DocClipBase *clip = list.at(i);
+        if (clip != NULL) emit reloadClip(clip->getId());
+    }
+}
+
+int ClipManager::clipsCount() const
+{
+    return m_clipList.count();
+}
+
+